Add patch from en.ABCD fixing build with glibc 2.10. (bug #271843)

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

4 files changed, 68 insertions, 4 deletions

diff --git a/www-plugins/mplayerplug-in/ChangeLog b/www-plugins/mplayerplug-in/ChangeLog
index e5ebacf96412..84a165362ff1 100644
--- a/www-plugins/mplayerplug-in/ChangeLog
+++ b/www-plugins/mplayerplug-in/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/mplayerplug-in
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/ChangeLog,v 1.2 2009/05/29 21:04:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/ChangeLog,v 1.3 2009/05/31 00:47:07 dirtyepic Exp $
+
+  31 May 2009; Ryan Hill <dirtyepic@gentoo.org>
+  mplayerplug-in-3.55-r1.ebuild, +files/mplayerplug-in-3.55-glibc210.patch:
+  Add patch from en.ABCD fixing build with glibc 2.10. (bug #271843)
 
 *mplayerplug-in-3.55-r1 (29 May 2009)
 
diff --git a/www-plugins/mplayerplug-in/Manifest b/www-plugins/mplayerplug-in/Manifest
index 25db60f5319c..69a5aa50d1a6 100644
--- a/www-plugins/mplayerplug-in/Manifest
+++ b/www-plugins/mplayerplug-in/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mplayerplug-in-3.40-cflags.patch 662 RMD160 fd888c192db5c19209895d592e9b60be01e07c50 SHA1 6546337c488adb3f22e512e085aa2a80fe7fef20 SHA256 e08de6a6d285defc5644af50a692303fb83b8d14c62f7742764f6773eee5194b
 AUX mplayerplug-in-3.50-seamonkey.patch 678 RMD160 c0e78c924738cd262d2a69021f6861b76feddc56 SHA1 3617ad7aa47a8735f22bdd7fbab14e2c6ec877b8 SHA256 e691dcb0f50f7a0ea5bdc5a8fbb94f90067035c57831140026729179c91dca26
 AUX mplayerplug-in-3.55-gcc4.patch 425 RMD160 37faee824abbbdbd511b9c450d920751f64e025a SHA1 b7713da070a777ed34fef1f4d42ca5d36aa8b0e4 SHA256 33a9c591aaa157f37303019ec826e1bb31c35aa76e5c59279508888606b3fc5b
+AUX mplayerplug-in-3.55-glibc210.patch 1629 RMD160 466eb1aff2d801392827682c82eeb6a57e4a06b9 SHA1 9c33da733146876007b5308b0f9e192f33e9ef7b SHA256 f8fbce77904312fdfe8115a3d7154520f08a7fae1d3170b7dc2fdef63c38a6a2
 AUX mplayerplug-in-gcc4.patch 549 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 SHA1 aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e
 AUX mplayerplug-in-min-cache-size.patch 585 RMD160 b32024bb369e3a26b2a6ec77cf8d34ed9bfdb8cc SHA1 bcf9a7c67941ff05e51e438439f62f4dc63de651 SHA256 378de7645409c1b66aa1d7937ab16c438bdf8bd428d75c528611dc07d69c6885
 AUX mplayerplug-in-xulrunner-config-in.patch 5391 RMD160 c00f52dd9045ad6dd061fa4e70f2071eeaa090bb SHA1 25298e41a8650aa1048e03093c5e9af63910200d SHA256 b902acc83a6463a7b44c35c86f1f4b913d0d5c36d40487ab4fdb03d8e9c5118a
@@ -8,6 +12,13 @@ AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0a
 DIST mplayerplug-in-3.50.tar.gz 452730 RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 SHA1 54e5d7a3b33f503830183545f7bc278d37cb89d5 SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02
 DIST mplayerplug-in-3.55.tar.gz 281845 RMD160 e01224b14883a93211745be0a329a3f524f39d8c SHA1 69726d4e16523b1a39c284efee081c31b0ea7f7f SHA256 ba5affde4c5d5a89c8bf987ae9326daabbf8ea8279fccd589474e5157fc67b7e
 EBUILD mplayerplug-in-3.50.ebuild 2667 RMD160 d6cfab79d3adecdddc2bb3a907a9c3118b11e91b SHA1 c948efd16f2eebc8af70bb04952af0f923e4c357 SHA256 d8aa8ba7918e08480991ba430cd98d8bb89bbe73832c2b5c23b396b3c04e1135
-EBUILD mplayerplug-in-3.55-r1.ebuild 2857 RMD160 e0fd81cdbc943fc6113de459e2419271679e81cf SHA1 222086b3158647d06f077747aeed80296a02d0d9 SHA256 b8aaf64afcd12701505fe2e26ff9f909549a0ca346f068a0645fc70a99dd5a92
-MISC ChangeLog 19400 RMD160 d297823a7fd374546c66019c0ce2f5ddb3ff8e5a SHA1 ff928b289d3f145b3b73d1f39c6d06e0cc2f2226 SHA256 38635f47c2f2b0fdcbaf5f2138ddd5bdc9bdafce30be55e003289180cbaabba3
+EBUILD mplayerplug-in-3.55-r1.ebuild 2901 RMD160 5aaa959acb06de61a815620bb9632d1d9ce2dc55 SHA1 11e1a3c8408f69485eb256a70a6cd852efe4a76b SHA256 e83f2cae7608932dd71cea245f6cbb0215a81369e8c8069118ac9eb6360b3e75
+MISC ChangeLog 19596 RMD160 a2d514b0369964d4cf9de486be925b48bcd56139 SHA1 4b0b845ffe422a1aae624f1cf73cda4e9280dba1 SHA256 26dbac09fd152fec5179610edba31ea9684719ef6e8cab0facfd8ba2b2c4f7ac
 MISC metadata.xml 484 RMD160 10cb6522943293a3f18bd8ff4a4c741c5b8cd0ff SHA1 6b21b9c86fa0d3868a4c3cd7deadaf0330732a43 SHA256 05564b260deb500bf9c0ee6e9038ffdf3e6f84b4ed58b84331ea67e03dd997f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoh1CMACgkQiqiDRvmkBmLokACghsrVTrx28M0fjV5zfWBLOLtL
+auAAnitBw3FWG8LN6+mWX9lvd4ibQkI0
+=AGUm
+-----END PGP SIGNATURE-----
diff --git a/www-plugins/mplayerplug-in/files/mplayerplug-in-3.55-glibc210.patch b/www-plugins/mplayerplug-in/files/mplayerplug-in-3.55-glibc210.patch
new file mode 100644
index 000000000000..54a1a791bb73
--- /dev/null
+++ b/www-plugins/mplayerplug-in/files/mplayerplug-in-3.55-glibc210.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/show_bug.cgi?id=271843
+
+--- mplayerplug-in-3.55-orig/Source/plugin-list.cpp
++++ mplayerplug-in-3.55/Source/plugin-list.cpp
+@@ -132,9 +132,9 @@ void insert_area(Node * parent, char *ta
+ 
+ void find_area_tags(const char *smilbuffer, Node * parent)
+ {
+-    char *startarea;
+-    char *endvideo;
+-    char *start;
++    const char *startarea;
++    const char *endvideo;
++    const char *start;
+ 
+     int tagtime = 0;
+     char tagtarget[128];
+--- mplayerplug-in-3.55-orig/Source/plugin-setup.h
++++ mplayerplug-in-3.55/Source/plugin-setup.h
+@@ -174,7 +174,7 @@ char *getURLHostname(char *url);
+ char *getURLFilename(const char *url);
+ int isMms(char *url, int nomediacache);
+ void mmsToHttp(char *dest, char *src);
+-int sendCommand(nsPluginInstance * instance, char *command);
++int sendCommand(nsPluginInstance * instance, const char *command);
+ int URLcmp(const char *url1, const char *url2);
+ extern void remove_quotes(char *url);
+ void killmplayer(nsPluginInstance * instance);
+--- mplayerplug-in-3.55-orig/Source/plugin-support.cpp
++++ mplayerplug-in-3.55/Source/plugin-support.cpp
+@@ -109,7 +109,7 @@ char *getURLFilename(const char *url)
+ {
+ 
+     char *filename;
+-    char *tmp;
++    const char *tmp;
+     int len;
+ 
+     if (DEBUG > 1)
+@@ -454,7 +454,7 @@ void remove_quotes(char *url)
+ // in cleanup routines (like destroyCB and shut), when we know that
+ // the player thread is not running, it is safe to call without locking
+ 
+-int sendCommand(nsPluginInstance * instance, char *command)
++int sendCommand(nsPluginInstance * instance, const char *command)
+ {
+     int retval;
+     char buffer[1024];
diff --git a/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild b/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild
index bf1c49bdb69d..b7235d5bd56d 100644
--- a/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild
+++ b/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.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/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild,v 1.1 2009/05/29 21:04:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild,v 1.2 2009/05/31 00:47:07 dirtyepic Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -48,6 +48,7 @@ src_unpack() {
 	#epatch "${FILESDIR}/${PN}_xulrunner-1.9.patch"
 	#epatch "${FILESDIR}/${PN}-3.50-seamonkey.patch"
 	epatch "${FILESDIR}/${PN}-min-cache-size.patch"
+	epatch "${FILESDIR}"/${P}-glibc210.patch
 	eautoreconf
 }