Fixed compilation with python3 (bug #499760) and some undefined reference to gtkmedia (bug #500762)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

7 files changed, 107 insertions, 13 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 1ce230343621..533d864c33be 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.332 2014/02/18 06:51:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.333 2014/02/18 08:11:43 polynomial-c Exp $
+
+  18 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> pidgin-2.10.9.ebuild,
+  pidgin-2.10.9-r1.ebuild, +files/pidgin-2.10.9-fix-gtkmedia.patch,
+  +files/pidgin-2.10.9-python3_fix1.patch,
+  +files/pidgin-2.10.9-python3_fix2.patch:
+  Fixed compilation with python3 (bug #499760) and some undefined reference to
+  gtkmedia (bug #500762).
 
   18 Feb 2014; Pacho Ramos <pacho@gentoo.org> pidgin-2.10.9-r1.ebuild:
   Use subslots for net-libs/farsight2 dep (#479326)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6f70ca3b95f9..6fef41b18ddd 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -4,19 +4,32 @@ Hash: SHA256
 AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
 AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
 AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
+AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256 c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd WHIRLPOOL 3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
+AUX pidgin-2.10.9-python3_fix1.patch 758 SHA256 19f4d173f72158051d1550a5e942badb187dcd633086fbf8e575fda4ec9f6c37 SHA512 381a7b15203844239511f2cf26a6ff0d29b3191146a6868dd210dbfd7ed0d6a0196dd9e93842ca4841453109dcbf5e5ebd5b2e6c61cf451da27d0e30db3ddb07 WHIRLPOOL d2bc452f1029c93ca1433af7351246198d453610ebba0efb78e08f449cafc018742a069d8396d11075d95cfa76c04f5681e61acc9d8dfcac7ccf4236c6a26891
+AUX pidgin-2.10.9-python3_fix2.patch 839 SHA256 8ec9b02317746f842b484ee6bc07dd9fef7e3fc279ccb8e2ed5c31862673f71f SHA512 b2a5515249bd57117b88e47785c5a36a60fda2565421ea657948b468dbb0e5d654b7719f6a091fe348fd8cfe6e7201ccb5f4f8bdebb698973a8f88d248bf6613 WHIRLPOOL cef1dae3f7005931f4c017aec8c184cbd2e34d74e4f665eee5fbf4df267c91ab5b0b542d6fbbaf802808e2f0c5ad3e10c10d103a2474b614f29a4ec32ef0780a
 DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
 DIST pidgin-2.10.9.tar.bz2 10093423 SHA256 dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319 SHA512 5f85d072997bf0e8c668b5a7dc6c9791f7f1b03504eb7a875472186cc70b45e19c61573d84c002f9653570731ed2119e3eddfb66d7484cc1205d4b1ee696c63b WHIRLPOOL aa9862ebb8e45ad488049ea27960ddbaa80abe3a535acf09b496b917ae858d799db8f7cc0b1ab034bfabe4b8d3e730cd3d413c18f3552d677f3c563e7482c016
 DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
 EBUILD pidgin-2.10.7-r4.ebuild 7273 SHA256 f856b770a802370c3c9349cc95f5dfb4f79fa39b004535eed8a7866249565137 SHA512 13398dcf9afba20f15127e97fb7a831adf3a6b32095a50d277293924e76b6c1c845351b2dcf2ca8536a39dcf8b6ffa52892c84159460607c2632dca98cfb5809 WHIRLPOOL 2df2aa59c541c8b08fccf03cdd7c08223afb286630a6ce1773bd3744fc22e23527f9f9ffc1f153481843c149fdde901867b1765c215fbeea4e5182d13dfc9405
 EBUILD pidgin-2.10.7-r5.ebuild 7369 SHA256 f4599802d9aa6dfae5bb5cd037f7b7f2853fd992e81096a7d6649173af73f220 SHA512 ef144aae3c2d64db4f2a322c423f31859cfd9d11837d6af9b211d506756bbabd1438c3d5c81b93eb95dbb973afd4a8147fb0c1b9e4cfc42d254e16589c7aaddb WHIRLPOOL d05d44d77059c3181a197e3418470cc5b6361223b57412366c61f7ca598ac5265b2e1b0e7a3455f3c35f53873bb2b2782873d984e22b2347d1d9c32362ce4d44
-EBUILD pidgin-2.10.9-r1.ebuild 7373 SHA256 ecbdf369872daff0b4e153f1269cfb30cad3be24abf4ffe2ae2ec382ecff91a6 SHA512 34b1bc3cb5bf3459a14b1a99032d38b66d02966992bc7515cff8bb9ba02a98ba58af8212ca926c851b0a58505a916316f8637820358914a87a777d0c45f5345b WHIRLPOOL 2613bbbd65f870666e4fad047acd0493210b9f320eeed6001d07d80c1716467cf2499c533bef31c3c5b055e5a6b772f6f1880045c3eca7482d4ecbfed144a13a
-EBUILD pidgin-2.10.9.ebuild 7261 SHA256 88c3d66383c5e6d6f2f36fa9a2990eac3ac93315526f6798387ebe163c17bd85 SHA512 2ecaaf6b33f40db74e12feb8d6e9089ca1d76cfc43404dc5e4986adce4cc63c13904ec5103789bc20b56183f50dc64a8485876b89a94883c2b0062efc87ef24e WHIRLPOOL c4fb943969478ce5f63ed73ec6cc4dbc4cb39c1d9afeacf2c2b531d27a8bcb04fd1eef28bcc3c3c0c294820aeda32a71ec7966be32c6981eacf2b7e5f5a47a05
-MISC ChangeLog 47106 SHA256 399808a79d6047c3becbf2985febd618989d7b798d4f82d7c045d563d5b34ea2 SHA512 d40921ec0cd0d6a23b00421825d6b31883723925eb8fd0673ebe2d7d658c4583ad7c30ba80653174382c3bfa0f6eb55ad50bdfb54e861bc11cb93ee9dae4a3e1 WHIRLPOOL 3313b2743be61f01cc69f14dae3ebe3461208210056bd68ec27ba73b6190bd4f336ab2bd3651224ed5d76f1beda1471d7f4eb7971b6cb0a7c735626e9e752bdd
+EBUILD pidgin-2.10.9-r1.ebuild 7505 SHA256 cf6afd5433a55d76af4252cb8c754a2f82874301f71fb88e3ecf35dd231c250e SHA512 e25d6498de19fd5998345e0781f539c1bd8876c3b7acc9b0ab646483cb470598845045375f0edd947dd96cb0215cd33cc470dd2637c2a4f70cf5f35e911a3608 WHIRLPOOL 3d2a1ba425ba609cd5be49b869bce77530ca96e13bac61cb9b3cea34becae016c8e20daa56187b77fc44093d9c6a259b01db8c6082a410561b523b48fc7afd40
+EBUILD pidgin-2.10.9.ebuild 7396 SHA256 fb717289386d64285ca8b6c8c24dec8a7380adeb19fcd7d7fcfaf0797f663684 SHA512 d534d96ef96bedf2ff13ab3bd3e45737de615ddbefc55f807fed57163bc37f3dd0fd4fc6c5b275e48dc10a951d76ca7920541c5b840b5d9628b9cbf5225394f6 WHIRLPOOL e8a8ab4ee8b97033bb694e942cc9e786899bc1743a422fca93bae44b6032383c013ff5b2c125166215cfdc3f53460a6bee788d9c9c6775ebde1baf749748565d
+MISC ChangeLog 47449 SHA256 1743f16d61083be6b93a26fa636eef60281ebe6beceac51f1f5309e5c6e3eff7 SHA512 e3d393e075e69b5d720aa3525419e86126834e9f1223b87a6f368fde1fdae0468eb2e0e58af2dce235f4d1181672f96f81f9c840d13f5bd56da82b773d2a4636 WHIRLPOOL c5f1b8b18ec47810bb2b4ad0ce6d2db591800967e5d7f80d2535044aa0b60bf66ee6d8bc84d4bd95911779c0d7991250955256883ebdbfd95a3f518f7941c49f
 MISC metadata.xml 1469 SHA256 5ca9b28465b16f382131076f07b9da546c34979bd8b681e980684ba8df7aabb9 SHA512 30cbf602434bd058632099ed6545a62a9ed476b1cc98f46a5500c61a0c8deb2a2325f74c08cfb7ac486128c5979646308e3c9a1c292e2f0bc9832a413079ccce WHIRLPOOL 745038f3b97b3d3e5adbf7d98292f0effe00553ce5c53f888dde4d02cf73b80fd62901b19acad2d0988902dcbc9813f5953c6d13348f2bb7409bfeeda05ab6af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMDAt8ACgkQCaWpQKGI+9RrkQCfSdSL09owqahdavVdcDD6Hw2X
-1JIAnjsMAz/JbiUClk6x1uwYJo20pZa3
-=c+tF
+iQIcBAEBCAAGBQJTAxXAAAoJEPiazRVxLXTFwzUP/jUfJAkZCOsD/j0Y80sWvAEp
+xaKwpjvJgHRxOrrrmQ0jSS7/lqs39LlLU89SCrBeY6Uok4ld3jhka7zSsoJIWLJA
+UGBAaaKBB22hhybQYqsr5APawSbI8KtEEsS4ZOXcOwC2UPP32qRO8eDPguVI0UTf
+T7LNNHrX2484b6MpsVSrn008dAObZ6LKWVGnyBp2MxH+/xXWjzGsxnyE3JfgrOec
+Xxo9MKuG+n78BwvB5N2ccIsS8l9hQHmmLuuHLNdDpuz2i1sJL16BnD4XG658/Qfk
+iA89750z6Be3y4X6a4eWYhtjBz5YGJNoPRYC2h916yfGb4aYjlwRCkmPLt2PfAKU
++UMOVtAfdAY7T0eRAL7mrwa1jE7jyXx9Jelajv+b/FtYquMJxtSJSKToa784aRfw
+LdWCp8gcaMj2uqmm2s0VWNJ8HulsAkKdTy6y9gvlaoHeA3IQ6ppIMxziR3tt//kY
+3xA2mqmp1sHSeH+K+GMgufE4Qezhx/udHO9wWOTm1hy1zTlsiU5XPGUtRY812b3w
+fb0JHSosQs3ZesLnaZCs1EcISC3oZdvhLb0avyr/vRike7xNj/maIVAUFYr56PC0
+elzbmuZRFnEu6sISy46yNd1GyLvKkID4+jtbjesV1ZnXeW+NAnYtWFfZBZlsx2NH
+QRCO88O8fmkgCQ1psscz
+=Xe5a
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
new file mode 100644
index 000000000000..4cec32663808
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
@@ -0,0 +1,10 @@
+--- a/pidgin/Makefile.am	2014-02-02 22:29:20.000000000 +0100
++++ b/pidgin/Makefile.am	2014-02-14 19:35:24.347547795 +0100
+@@ -154,6 +154,7 @@
+ 	$(GSTREAMER_LIBS) \
+ 	$(XSS_LIBS) \
+ 	$(SM_LIBS) \
++	$(X11_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(GTKSPELL_LIBS) \
+ 	$(LIBXML_LIBS) \
diff --git a/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch b/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch
new file mode 100644
index 000000000000..67e94312f770
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch
@@ -0,0 +1,28 @@
+
+# HG changeset patch
+# User Ed Catmur <ed@catmur.co.uk>
+# Date 1392340585 18000
+# Node ID c8bb4edd63253b5b23006e8674c015c854075981
+# Parent  eeb82d3d33b1720024ee7aef9bdfba87bb1b163d
+Fix build of Finch against Python3.
+
+Fixes #15969.
+
+diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
+--- a/finch/libgnt/gntwm.c
++++ b/finch/libgnt/gntwm.c
+@@ -1281,7 +1281,12 @@
+ {
+ 	char *dir = g_path_get_dirname(path);
+ 	FILE *file = fopen(path, "r");
+-	PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
++	PyObject *pp = PySys_GetObject("path");
++#if PY_MAJOR_VERSION >= 3
++	PyObject *dirobj = PyUnicode_FromString(dir);
++#else
++	PyObject *dirobj = PyString_FromString(dir);
++#endif
+ 
+ 	PyList_Insert(pp, 0, dirobj);
+ 	Py_DECREF(dirobj);
+
diff --git a/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch b/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch
new file mode 100644
index 000000000000..06ccaef7175f
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch
@@ -0,0 +1,32 @@
+
+# HG changeset patch
+# User Elliott Sales de Andrade <qulogic@pidgin.im>
+# Date 1392341598 18000
+# Node ID 922e7abddb4dbc1a397aad9c1d3b6fd091c4e392
+# Parent  a591c0486b041e029075e12b446430cf32b27d24
+Fix call to Py_SetProgramName in Python3.
+
+Refs #15969.
+
+diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
+--- a/finch/libgnt/gntwm.c
++++ b/finch/libgnt/gntwm.c
+@@ -1577,7 +1577,17 @@
+ 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "run-python", run_python,
+ 				GNT_KEY_F3, NULL);
+ 	if (!Py_IsInitialized()) {
++#if PY_MAJOR_VERSION >= 3
++		wchar_t *name;
++		size_t len;
++		len = mbstowcs(NULL, "gnt", 0);
++		name = g_new(wchar_t, len + 1);
++		mbstowcs(name, "gnt", len + 1);
++		Py_SetProgramName(name);
++		g_free(name);
++#else
+ 		Py_SetProgramName("gnt");
++#endif
+ 		Py_Initialize();
+ 		started_python = TRUE;
+ 	}
+
diff --git a/net-im/pidgin/pidgin-2.10.9-r1.ebuild b/net-im/pidgin/pidgin-2.10.9-r1.ebuild
index df2f836851e6..1f3c18b654e6 100644
--- a/net-im/pidgin/pidgin-2.10.9-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.10.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.6 2014/02/18 06:51:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.7 2014/02/18 08:11:43 polynomial-c Exp $
 
 EAPI=5
 
@@ -138,8 +138,10 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${WORKDIR}/${PN}-eds-3.6.patch"
-
+		"${WORKDIR}/${PN}-eds-3.6.patch" \
+		"${FILESDIR}/${P}-fix-gtkmedia.patch" \
+		"${FILESDIR}/${P}-python3_fix1.patch" \
+		"${FILESDIR}/${P}-python3_fix2.patch"
 	epatch_user
 
 	eautoreconf
diff --git a/net-im/pidgin/pidgin-2.10.9.ebuild b/net-im/pidgin/pidgin-2.10.9.ebuild
index 76f3bd92f200..3e89af8715e6 100644
--- a/net-im/pidgin/pidgin-2.10.9.ebuild
+++ b/net-im/pidgin/pidgin-2.10.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9.ebuild,v 1.9 2014/02/16 12:05:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9.ebuild,v 1.10 2014/02/18 08:11:43 polynomial-c Exp $
 
 EAPI=5
 
@@ -136,8 +136,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
-
+	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
+		"${FILESDIR}/${P}-fix-gtkmedia.patch" \
+		"${FILESDIR}/${P}-python3_fix1.patch" \
+		"${FILESDIR}/${P}-python3_fix2.patch"
 	epatch_user
 
 	eautoreconf