Fix building with GLIBC 2.10+ wrt #276281.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 48 insertions, 17 deletions

diff --git a/media-plugins/vdr-radio/ChangeLog b/media-plugins/vdr-radio/ChangeLog
index 2092a593261a..5c822d097a08 100644
--- a/media-plugins/vdr-radio/ChangeLog
+++ b/media-plugins/vdr-radio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-radio
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/ChangeLog,v 1.20 2008/04/28 10:59:19 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/ChangeLog,v 1.21 2009/08/08 19:50:34 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vdr-radio-0.2.4.ebuild, +files/vdr-radio-0.2.4-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276281.
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-radio-0.2.0.ebuild,
   vdr-radio-0.2.4.ebuild:
diff --git a/media-plugins/vdr-radio/Manifest b/media-plugins/vdr-radio/Manifest
index 4e46480c7757..df31b7751295 100644
--- a/media-plugins/vdr-radio/Manifest
+++ b/media-plugins/vdr-radio/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rc-addon.sh 394 RMD160 09eafe017ccf84a361025084be0c52ccb2d67445 SHA1 9e3ce4ce2c1632919beeed6b7081dd033f5527fc SHA256 be93c471b1720367ec420aa527cebba33adffcc4d5bc21a9b7a2bfb6fca33c2a
 AUX rc-addon.sh-0.2.0 478 RMD160 b0f7597cb943447f482af481f61e1bf1ee4d2008 SHA1 7e2519c97b216816b43bee81ed6399220a15cbbe SHA256 d9d44ffa204be83a934e51467b459ee57476814b98dd29820cae83cbe4876011
 AUX vdr-radio-0.2.0-vdr-1.5.1.diff 649 RMD160 3b1a734fe8b23fe03305c7469a1dc677d5c8911c SHA1 b6661439f6f2432ac505b11501340a2601240137 SHA256 adbf854ac01c08c2d2390a6b465f63258547a774d83f1d1b01d8cee124f1dab0
+AUX vdr-radio-0.2.4-glibc-2.10.patch 890 RMD160 924a837d6728217ad75927e5c47a6620f6af321f SHA1 962d1abcbcc0ebdb53b904fd3cd689e134df0896 SHA256 bd6fb247e1928c6365651605c20689642eadaca6fd4e7a05fbc4bbbec21e7780
 DIST vdr-radio-0.1.4.tgz 319047 RMD160 e46057791613f0a82fd38dfd8fa28e7d3619e850 SHA1 4c65d5b9151cfe3261e8b3c64b728b1e1894c5e0 SHA256 f3b5f0d51b7f4207ce2489aea5a2dc3714640b974629e11bf754f43cedbfe347
 DIST vdr-radio-0.2.0.tgz 324935 RMD160 9856326feeac382f015f396d14e7c9f5b8e0b4ae SHA1 c4d626bc1d9bb6369e8b579255822a0503b6d731 SHA256 ea5e50058f63f4e78c5f7225dd4d217c4cc0c219c133844711a535ea62783a44
 DIST vdr-radio-0.2.1.tgz 345243 RMD160 3b4621a1e76f424c55e9bd1d5a38fbe6db8d16fd SHA1 55389df03c8e0364cd3288463d6c4ea31fd8e8d0 SHA256 2e6f7c62ec43a194798f609e767471133427bfe2cca818c58feefaa644b499e5
@@ -15,13 +13,6 @@ EBUILD vdr-radio-0.2.0.ebuild 948 RMD160 9697b707b995bde4a1b96180857665747a10c94
 EBUILD vdr-radio-0.2.1.ebuild 904 RMD160 fb712b14b21aae4a0435fe36413b09becf7a20ef SHA1 3be7ea07060c062351b254e7d1e0ed8b6f681893 SHA256 00e2d78e2a9d731c16c7d1478cdb33753f47f64250dec861b2433f2e43ef6139
 EBUILD vdr-radio-0.2.2.ebuild 904 RMD160 3fcf3445ba5066f631ba2c4cef94794a7a86add8 SHA1 098e836f9001c0a48d0da00ddf429998a1f67861 SHA256 df02a76ba558d16c32d8e40853993fd540ae660b4dd0f543373f4777f327762b
 EBUILD vdr-radio-0.2.3.ebuild 973 RMD160 8b7e6adb6aeabda960dfa3cb4dee6eaf074f29e4 SHA1 0e991ae5e06a8b4220cf95c44f5b4953b5afc4e8 SHA256 97eb6ea9280b11894798e811d9effe58191db22f29afac1c7a3ef26f1717fd7c
-EBUILD vdr-radio-0.2.4.ebuild 957 RMD160 2f420d1769d281df342b51321d37ef2f2e05a2a0 SHA1 91e801e12ddf11eb1e45957457eb9d48837ea7b8 SHA256 78fb38732ae57fffc3ff4685dfac6b0cc25f0c39dd6b3b6937b2de8644adba94
-MISC ChangeLog 3054 RMD160 e411770734ea4eb71d89caa4f6191bad36130033 SHA1 a4f1ef240f709aadba324b8a5124b8532221f34a SHA256 25e95aa7f94d272ce560ee25b82b8046442edf73b1c50235d09eac9639375e16
+EBUILD vdr-radio-0.2.4.ebuild 1068 RMD160 b91104836edb5b00bfb8ea20973c8316ae8f42c8 SHA1 4a69324de381d0f9a25ed6e12e5f29e8275a5c7c SHA256 073a4813a8f1e477316bc90137d8b9497f730f6977bf7ff3c86eb4896f8ea004
+MISC ChangeLog 3226 RMD160 70dbcca73833afb2e32913b66df2018d5dff74f7 SHA1 4e9c1f6e6129bfcd123642d38827c4d061dc1480 SHA256 aedca78a0e8c420ea1a1f71a550440a181cfb1ba466d5d3eacff307ce89fae7b
 MISC metadata.xml 428 RMD160 2f0f59ae115e31a0efcb04dbfc1c05ac60a7abfa SHA1 32d0501ff9bc224c9580bc52c475d46c95b16064 SHA256 56ee3adbf013425c4153b14937ea1fa08afe4ce37ec41d8f63ee4eb6b7aaea07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgVrg0ACgkQt2vP6XvVdOcuFQCfQQsspKVgHcxRNFE/eTzzeCbu
-5lgAoKzfKsNvLTQMdhW6dBWTx8aGsY9v
-=lOL8
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-radio/files/vdr-radio-0.2.4-glibc-2.10.patch b/media-plugins/vdr-radio/files/vdr-radio-0.2.4-glibc-2.10.patch
new file mode 100644
index 000000000000..7e80da9612da
--- /dev/null
+++ b/media-plugins/vdr-radio/files/vdr-radio-0.2.4-glibc-2.10.patch
@@ -0,0 +1,30 @@
+diff -ur radio-0.2.4.orig/radioepg.c radio-0.2.4/radioepg.c
+--- radio-0.2.4.orig/radioepg.c	2007-10-09 18:45:26.000000000 +0300
++++ radio-0.2.4/radioepg.c	2009-08-08 22:50:46.000000000 +0300
+@@ -12,7 +12,7 @@
+ int epg_premiere(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p;
++	const char *p;
+ 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], jahr[RT_MEL];
+ 	struct tm tm_store;
+ 
+@@ -143,7 +143,7 @@
+ int epg_kdg(const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p;
++	const char *p;
+ 	char artist[RT_MEL], titel[RT_MEL], album[RT_MEL], komp[RT_MEL];
+ 	struct tm tm_store;
+ 
+@@ -240,7 +240,7 @@
+ int epg_unitymedia(const char *epgtitle, const char *epgdescr, time_t epgstart, time_t epgend) 
+ {
+ 	int i;
+-	char *p1, *p2;
++	const char *p1, *p2;
+ 	char  titel[2*RT_MEL], artist[2*RT_MEL];
+ 	struct tm tm_store;
+ 
diff --git a/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild b/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild
index faf4b48355cd..85d6eae426a9 100644
--- a/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild
+++ b/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild,v 1.3 2008/04/28 10:59:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-radio/vdr-radio-0.2.4.ebuild,v 1.4 2009/08/08 19:50:34 ssuominen Exp $
 
 inherit vdr-plugin eutils
 
@@ -13,10 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.43"
+RDEPEND=">=media-video/vdr-1.3.43"
+DEPEND="${RDEPEND}"
 
 VDR_RCADDON_FILE="${FILESDIR}/rc-addon.sh-0.2.0"
 
+src_unpack() {
+	vdr-plugin_src_unpack
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
 src_install() {
 	vdr-plugin_src_install