Fixing compilation with glibc 2.10 , patch thanks to Thomas Beierlein <tb@forth-ev.de>

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 59 insertions, 4 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index 4b3f14e4c0c1..9a2b55029e64 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/svxlink
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.7 2009/07/07 22:54:42 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.8 2009/07/23 21:55:32 vostorga Exp $
+
+  23 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> svxlink-080730.ebuild,
+  +files/svxlink-080730-glibc210.patch:
+  Fixing compilation with glibc 2.10
+  Patch thanks to Thomas Beierlein <tb@forth-ev.de>
 
   07 Jul 2009; <vostorga@gentoo.org> +files/svxlink-080730-gcc44.patch,
   svxlink-080730.ebuild:
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index cbca3ddd476a..7ac86e17ff5a 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -1,10 +1,11 @@
 AUX svxlink-080730--as-needed.patch 381 RMD160 ec62feb75329b2dd881f022556995c23f038ccf3 SHA1 bc6a015d28cc29af87fd2d738a159323360ccba7 SHA256 0a84adf6f6d65e5b8bd07a0a7a70153dd8194edf6007a0e83700fc1152e527a4
 AUX svxlink-080730-gcc44.patch 2090 RMD160 9af468b43e8a0cbd349cfb39f3de12142e76a9f3 SHA1 f2706f12be051d242c0ab0b51c1514bb547ff9f1 SHA256 b5c221dd522a89daa421cb27e8056fd5ddf5c45618800536bf1b5764d21d148e
+AUX svxlink-080730-glibc210.patch 1638 RMD160 dfadd61566fdd59827a8807b8916c030ee0dcc7c SHA1 0b420723fd70c18a4461fa75f9a2912e3e9fa996 SHA256 3539a6cdbcef9f2fc33750d0b556e8d55a0383d62155d6e9c1795da15e3c57ab
 AUX svxlink-080730-spandsp-0.0.6_pre2.patch 705 RMD160 4598f710a750b03808fddb4ef8881f09506b94a4 SHA1 80ac24ded8c53da8a75b196db81341a9a1b00240 SHA256 c44f4554e505abbd37348d13b6ce0056372f5b42f089bf61c742ee79b0012a11
 AUX svxlink-fix-Makefile.diff 511 RMD160 e09f6f72bccff74c3b7fcd9c28a94c574f71612a SHA1 d9d0918e66ecfababd15ea468824553738eb6595 SHA256 3fad27f574fc9bff0b04dd5da7471fce43596b682a7aaa5ce7f76b5590f1c657
 DIST svxlink-080102.tar.gz 416383 RMD160 869fe904eb00514a02c54af6f060a4404630cc1f SHA1 f87b8557f3adf819dcfcaddd408c3e3ee192be6e SHA256 2701a486c2ec670c3e2bbdd5e4b0842b1b3ead3bbb8790688265ca2e51e04b07
 DIST svxlink-080730.tar.gz 484464 RMD160 1a65d361e200fda309a1ce11f88c39a8e37d535d SHA1 edd7318211d35894124aaa1e071a703041e3a4fd SHA256 68039508fa77ac3daf648bc26b99029c867068a03b43aab6650101c2fc2ef107
 EBUILD svxlink-080102-r1.ebuild 891 RMD160 b3882e75f7780260e69d32d8ec08e27e5ada055e SHA1 5d6b79136d4cad0842dba11ea93839665bc452ab SHA256 90a07bf2a95d83729c20a78948836a917563019a0689e413b1c16d028c94d001
-EBUILD svxlink-080730.ebuild 1036 RMD160 229a52844624f8983743b8182920f11e64b815d6 SHA1 eb67e9301103437d78eae40b33d83da26af87733 SHA256 9d006ca96980978c2b9fb5a9330a0e6ad1ab5c82c9664141278de9382701879b
-MISC ChangeLog 1722 RMD160 5abad605662f58515b10b4c24b0138d8ae9f3589 SHA1 dcf5bc8e8cd9f006593a0cbf29e4b1328d899911 SHA256 0b2e0f074a16bda42c7c3a9f91e0ea41a0bc82d644e40066d5a7d586f22f9fc2
+EBUILD svxlink-080730.ebuild 1078 RMD160 c7818f33ee87ef79c90289118bc6727474635674 SHA1 af6bb464875ac748f02112d54694b07a4f23dd6e SHA256 b3a974ba6a02bcadd0300634a34359dc2da0593d938f7d51cb26d00aec7ccac9
+MISC ChangeLog 1928 RMD160 11a08b305b34c6c37b51cce03ce94a47d788d1a9 SHA1 73041d0aafd583cb4359c230910d199f89a2ab87 SHA256 8e98cf3801f083c94d238feec95d208300f0ab505b63c00eccf5e75cd033b8ea
 MISC metadata.xml 569 RMD160 754ed1324af1015713873dfe99b869472551f9af SHA1 cc1ad26d8b879ffd422e1d365cc9f02e653a311c SHA256 b8ddf42532511911fb36967cb6ccd670345bf004255259cb7e7ecfb35989011b
diff --git a/media-radio/svxlink/files/svxlink-080730-glibc210.patch b/media-radio/svxlink/files/svxlink-080730-glibc210.patch
new file mode 100644
index 000000000000..6fd63f4ce276
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-080730-glibc210.patch
@@ -0,0 +1,48 @@
+diff -NrU5 svxlink-080730.original/echolib/EchoLinkStationData.cpp svxlink-080730/echolib/EchoLinkStationData.cpp
+--- svxlink-080730.original/echolib/EchoLinkStationData.cpp	2009-07-23 21:51:06.000000000 -0600
++++ svxlink-080730/echolib/EchoLinkStationData.cpp	2009-07-23 21:53:31.000000000 -0600
+@@ -199,11 +199,11 @@
+     else
+     {
+       m_status = STAT_UNKNOWN;
+     }
+     
+-    char *space = strchr(end_desc, ' ');
++    const char *space = strchr(end_desc, ' ');
+     if (space != 0)
+     {
+       strncpy(str, space+1, 5);
+       str[5] = 0;
+       m_time = str;
+diff -NrU5 svxlink-080730.original/svxlink/remotetrx/remotetrx.cpp svxlink-080730/svxlink/remotetrx/remotetrx.cpp
+--- svxlink-080730.original/svxlink/remotetrx/remotetrx.cpp	2009-07-23 21:51:06.000000000 -0600
++++ svxlink-080730/svxlink/remotetrx/remotetrx.cpp	2009-07-23 22:02:04.000000000 -0600
+@@ -617,11 +617,11 @@
+ 	continue;
+       }
+     }
+ 
+     int write_len = 0;
+-    char *nl = strchr(ptr, '\n');
++    const char *nl = strchr(ptr, '\n');
+     if (nl != 0)
+     {
+       write_len = nl-ptr+1;
+       print_timestamp = true;
+     }
+diff -NrU5 svxlink-080730.original/svxlink/svxlink/svxlink.cpp svxlink-080730/svxlink/svxlink/svxlink.cpp
+--- svxlink-080730.original/svxlink/svxlink/svxlink.cpp	2009-07-23 21:51:06.000000000 -0600
++++ svxlink-080730/svxlink/svxlink/svxlink.cpp	2009-07-23 21:59:04.000000000 -0600
+@@ -607,11 +607,11 @@
+ 	continue;
+       }
+     }
+ 
+     int write_len = 0;
+-    char *nl = strchr(ptr, '\n');
++    const char *nl = strchr(ptr, '\n');
+     if (nl != 0)
+     {
+       write_len = nl-ptr+1;
+       print_timestamp = true;
+     }
diff --git a/media-radio/svxlink/svxlink-080730.ebuild b/media-radio/svxlink/svxlink-080730.ebuild
index 2d1ddef61c38..5d39a8c0d07c 100644
--- a/media-radio/svxlink/svxlink-080730.ebuild
+++ b/media-radio/svxlink/svxlink-080730.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.3 2009/07/07 22:54:42 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.4 2009/07/23 21:55:32 vostorga Exp $
 
 EAPI=1
 
@@ -31,6 +31,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}--as-needed.patch"
 	epatch "${FILESDIR}/${P}-spandsp-0.0.6_pre2.patch"
 	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}/${P}-glibc210.patch"
 }
 
 src_compile() {