Add tree-model fix from bug #148247

Package-Manager: portage-2.1.2_pre1-r3

5 files changed, 220 insertions, 5 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index 686e19306205..a8bf8234e05d 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.129 2006/09/26 20:04:36 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.130 2006/09/30 21:23:33 dang Exp $
+
+*pygtk-2.10.1-r1 (30 Sep 2006)
+
+  30 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/pygtk-2.10.1-tree-model.patch, +pygtk-2.10.1-r1.ebuild:
+  Add tree-model fix from bug #148247
 
   26 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   pygtk-2.8.6.ebuild:
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index e4248abf8ae2..45f9def1b85d 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pygtk-2.10.1-tree-model.patch 3735 RMD160 a1d41107c9ef92d3dbef5eb7ece9394331627221 SHA1 0bb3d3129e1ccb68db659054288ae344d1ed44f3 SHA256 280c3b53900695692f068bee3b2ddd144f1e3c1119bdb29e0de77fd05d7bfc73
+MD5 ed1b49aebce846c8ea100401097a4db0 files/pygtk-2.10.1-tree-model.patch 3735
+RMD160 a1d41107c9ef92d3dbef5eb7ece9394331627221 files/pygtk-2.10.1-tree-model.patch 3735
+SHA256 280c3b53900695692f068bee3b2ddd144f1e3c1119bdb29e0de77fd05d7bfc73 files/pygtk-2.10.1-tree-model.patch 3735
 DIST pygtk-0.6.11.tar.gz 401327 RMD160 3dcf7148509091d0d99d2f3bd4597c80a270c465 SHA1 d460dbbfc86f153db6c6440ac95a6915892be1d8 SHA256 21dbec8c8119e2c78a317c487dfd3c49fab06ce0e1d2cd226916e45cf3f19f9f
 DIST pygtk-2.10.1.tar.bz2 1884682 RMD160 71179c7256bad6319cabbd305581ae67139b66f1 SHA1 8955125d87bf856ed961bfcf8d2f758b0bf980d6 SHA256 e572d09029a6df4ae2a2c56973ccd85d45129db1a27619a95fae2e47dc36023c
 DIST pygtk-2.6.1.tar.bz2 729460 RMD160 75c88308bda1c9c245b8e1d618e61b8b62d84ddb SHA1 a34cedeaeb9e794c9d3a2ce2b35387382b985a3a SHA256 bc21e7df103bffb0fda1d629d6ebab155f95d422d2186c27d686f822267110ed
@@ -14,6 +21,10 @@ EBUILD pygtk-0.6.11.ebuild 590 RMD160 fefb7cab73fe394eac4f7a62a94bc54d19fb2fb0 S
 MD5 0320b3883c761bc3e567cc1f04a30e53 pygtk-0.6.11.ebuild 590
 RMD160 fefb7cab73fe394eac4f7a62a94bc54d19fb2fb0 pygtk-0.6.11.ebuild 590
 SHA256 5e13bb13ca60c61766e8ee720f2f53fcc4995f5ba116cf1ee19f0a5227a7c085 pygtk-0.6.11.ebuild 590
+EBUILD pygtk-2.10.1-r1.ebuild 2310 RMD160 635789d41af9ea65c933ffa7db7b8b950134b129 SHA1 081dcc8ecaabd3db2d8b0650cd6e4bfce0b936a7 SHA256 cbb0b9519960eeb2d5c3d06155c0f9eb5dd5672c1b518c2bb415efe45e0448cd
+MD5 f0173dad57c5249112f58d07f10151e5 pygtk-2.10.1-r1.ebuild 2310
+RMD160 635789d41af9ea65c933ffa7db7b8b950134b129 pygtk-2.10.1-r1.ebuild 2310
+SHA256 cbb0b9519960eeb2d5c3d06155c0f9eb5dd5672c1b518c2bb415efe45e0448cd pygtk-2.10.1-r1.ebuild 2310
 EBUILD pygtk-2.10.1.ebuild 2229 RMD160 a6fb583834e9b386ebacaa5f4ec2713e8fdd4567 SHA1 962b82d9eac011a83a8acc2801124abe7dc42b84 SHA256 e051afb62b624551d60e29acbd06f162ec047e69ce5198362d02ca14e140bc6b
 MD5 462731ba546485f8060c198253ab3113 pygtk-2.10.1.ebuild 2229
 RMD160 a6fb583834e9b386ebacaa5f4ec2713e8fdd4567 pygtk-2.10.1.ebuild 2229
@@ -38,10 +49,10 @@ EBUILD pygtk-2.8.6.ebuild 2680 RMD160 0420b1536a67f91e3c2f7a91a901970447636ef6 S
 MD5 85ee8e7d4f5624ec6245611d9a41c23f pygtk-2.8.6.ebuild 2680
 RMD160 0420b1536a67f91e3c2f7a91a901970447636ef6 pygtk-2.8.6.ebuild 2680
 SHA256 0ca29b0356b71bc414386b10d89cec9f282d066e88011a5a4532bdfcd92c0175 pygtk-2.8.6.ebuild 2680
-MISC ChangeLog 15770 RMD160 d4b8e01d1cb59c022d6e19d414a746eb724b01e3 SHA1 3bb7db09648bc7f716ba0b0df930f165066ee695 SHA256 03b38f29158cf11734673dc447cb32e5f5d406b3f7e90de2aa4f803691c2939d
-MD5 914a44a5adb96e5ab63ef0f7ae75f431 ChangeLog 15770
-RMD160 d4b8e01d1cb59c022d6e19d414a746eb724b01e3 ChangeLog 15770
-SHA256 03b38f29158cf11734673dc447cb32e5f5d406b3f7e90de2aa4f803691c2939d ChangeLog 15770
+MISC ChangeLog 15953 RMD160 84cb9dc0db6a09cbcd4eb0f90e69e2d4f0b36aeb SHA1 3662fc72c674aa820366e6650b534730aca98045 SHA256 0bfd9022c18e404e640050e1e8dbbd42b010bf4ae43c2f00fd1e8610b98fb6ac
+MD5 aa7226271fe7eaad8da053a3c285f785 ChangeLog 15953
+RMD160 84cb9dc0db6a09cbcd4eb0f90e69e2d4f0b36aeb ChangeLog 15953
+SHA256 0bfd9022c18e404e640050e1e8dbbd42b010bf4ae43c2f00fd1e8610b98fb6ac ChangeLog 15953
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
 MD5 72046b076a995f9b14882970d4e8b677 metadata.xml 934
 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 metadata.xml 934
@@ -55,6 +66,9 @@ SHA256 299e3fcdfddcc41c5847681de5ecb020648cfa07a638b71d412208353ff0213a files/di
 MD5 842de0372fce1eaf6c9b46233fe3f587 files/digest-pygtk-2.10.1 485
 RMD160 f4a41b3e993dd5f64415ba52332646d5dd9c7571 files/digest-pygtk-2.10.1 485
 SHA256 dfd15c2530e7d40fb0ace30eef09177edf3646981528f9a0b6f6c0fd48318b30 files/digest-pygtk-2.10.1 485
+MD5 842de0372fce1eaf6c9b46233fe3f587 files/digest-pygtk-2.10.1-r1 485
+RMD160 f4a41b3e993dd5f64415ba52332646d5dd9c7571 files/digest-pygtk-2.10.1-r1 485
+SHA256 dfd15c2530e7d40fb0ace30eef09177edf3646981528f9a0b6f6c0fd48318b30 files/digest-pygtk-2.10.1-r1 485
 MD5 e94544d17ff2def0be38bb2f17ba3b89 files/digest-pygtk-2.6.1 479
 RMD160 587411ebb1ec38a49e3a1585bf44db77c385c662 files/digest-pygtk-2.6.1 479
 SHA256 e168f28b34497691895cfc624460249494297d85d1b5f8caa6127bbd02dead3a files/digest-pygtk-2.6.1 479
@@ -70,3 +84,10 @@ SHA256 04639e95065633706f9d2f232249cf217051640e62fa29d8dc80972e6c5db190 files/di
 MD5 586072dad1d37a363bbcc2bfc42af557 files/digest-pygtk-2.8.6 479
 RMD160 71ff336209e299f679dc202319fd3aa038bdb7ea files/digest-pygtk-2.8.6 479
 SHA256 4bae4e78337b902815088c4bd6e0c48b933df10c5ee9d7b1638cce6b6b0e5869 files/digest-pygtk-2.8.6 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFHuBYomPajV0RnrERAv0bAJ462eTQb1BVGjLdhmdSzXNe/bx7AQCdFzVM
+Pl/Ay7qePacgQZNiB3Bx5y0=
+=n4PO
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/digest-pygtk-2.10.1-r1 b/dev-python/pygtk/files/digest-pygtk-2.10.1-r1
new file mode 100644
index 000000000000..b273d4436923
--- /dev/null
+++ b/dev-python/pygtk/files/digest-pygtk-2.10.1-r1
@@ -0,0 +1,6 @@
+MD5 ddf27329c38f1be822c1606c6aa1fb0b pygtk-2.10.1.tar.bz2 1884682
+RMD160 71179c7256bad6319cabbd305581ae67139b66f1 pygtk-2.10.1.tar.bz2 1884682
+SHA256 e572d09029a6df4ae2a2c56973ccd85d45129db1a27619a95fae2e47dc36023c pygtk-2.10.1.tar.bz2 1884682
+MD5 b7c7f1aaaf24165d4cb2a5f4e2225d34 pygtk2reference.tbz2 604463
+RMD160 3d4d9c5d5616dc6876c3c01fafaeadc1d96ccade pygtk2reference.tbz2 604463
+SHA256 4f19595f2ecac6a7265e4f130efe7e4c8543afc6ad16429db0411be6e841849b pygtk2reference.tbz2 604463
diff --git a/dev-python/pygtk/files/pygtk-2.10.1-tree-model.patch b/dev-python/pygtk/files/pygtk-2.10.1-tree-model.patch
new file mode 100644
index 000000000000..80916927feb6
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.10.1-tree-model.patch
@@ -0,0 +1,95 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN pygtk-2.10.1.orig/gtk/gtkobject-support.c pygtk-2.10.1/gtk/gtkobject-support.c
+--- pygtk-2.10.1.orig/gtk/gtkobject-support.c	2006-07-05 09:12:16.000000000 -0400
++++ pygtk-2.10.1/gtk/gtkobject-support.c	2006-09-30 17:10:16.000000000 -0400
+@@ -120,3 +120,19 @@
+     return list;
+ }
+ 
++void
++pygtk_boxed_unref_shared(PyObject *boxed)
++{
++    PyGBoxed *pyboxed;
++    g_return_if_fail(boxed != NULL && PyObject_TypeCheck(boxed, &PyGBoxed_Type));
++    pyboxed = (PyGBoxed *) boxed;
++    if (pyboxed->ob_refcnt != 1) {
++        if (!pyboxed->free_on_dealloc) {
++            pyboxed->boxed = g_boxed_copy(pyboxed->gtype,
++                                          pyboxed->boxed);
++            pyboxed->free_on_dealloc = TRUE;
++        }
++    }
++    Py_DECREF(boxed);
++}
++
+diff --exclude-from=/home/dang/.diffrc -u -ruN pygtk-2.10.1.orig/gtk/gtktreeview.override pygtk-2.10.1/gtk/gtktreeview.override
+--- pygtk-2.10.1.orig/gtk/gtktreeview.override	2006-07-19 16:29:19.000000000 -0400
++++ pygtk-2.10.1/gtk/gtktreeview.override	2006-09-30 17:10:16.000000000 -0400
+@@ -579,6 +579,7 @@
+ }
+ %%
+ override gtk_tree_selection_selected_foreach
++
+ static void
+ pygtk_tree_selection_foreach_marshal(GtkTreeModel *model,
+                                      GtkTreePath *path,
+@@ -597,17 +598,17 @@
+     py_path = pygtk_tree_path_to_pyobject(path);
+     py_iter = pyg_boxed_new(GTK_TYPE_TREE_ITER, iter, FALSE, FALSE);
+     if (cunote->data)
+-        retobj = PyEval_CallFunction(cunote->func, "(NNNO)",
++        retobj = PyEval_CallFunction(cunote->func, "(NNOO)",
+                                      py_model, py_path, py_iter,
+                                      cunote->data);
+     else
+-        retobj = PyEval_CallFunction(cunote->func, "(NNN)",
++        retobj = PyEval_CallFunction(cunote->func, "(NNO)",
+                                      py_model, py_path, py_iter);
+ 
+     if (retobj == NULL) {
+         PyErr_Print();
+     }
+-
++    pygtk_boxed_unref_shared(py_iter);
+     Py_XDECREF(retobj);
+ 
+     pyg_gil_state_release(state);
+@@ -1124,13 +1125,14 @@
+     py_iter2 = pyg_boxed_new(GTK_TYPE_TREE_ITER, iter2,  FALSE, FALSE);
+ 
+     if (cunote->data) {
+-        retobj = PyEval_CallFunction(cunote->func, "(NNNO)", py_model,
++        retobj = PyEval_CallFunction(cunote->func, "(OONO)", py_model,
+                                      py_iter1, py_iter2, cunote->data);
+     } else {
+-        retobj = PyEval_CallFunction(cunote->func, "(NNN)", py_model,
++        retobj = PyEval_CallFunction(cunote->func, "(OON)", py_model,
+                                      py_iter1, py_iter2);
+     }
+-
++    pygtk_boxed_unref_shared(py_iter1);
++    pygtk_boxed_unref_shared(py_iter2);
+     if (retobj)
+         ret = PyInt_AsLong(retobj);
+     if (PyErr_Occurred()) {
+diff --exclude-from=/home/dang/.diffrc -u -ruN pygtk-2.10.1.orig/gtk/pygtkcellrenderer.c pygtk-2.10.1/gtk/pygtkcellrenderer.c
+--- pygtk-2.10.1.orig/gtk/pygtkcellrenderer.c	2005-01-09 12:35:02.000000000 -0500
++++ pygtk-2.10.1/gtk/pygtkcellrenderer.c	2006-09-30 17:10:16.000000000 -0400
+@@ -250,7 +250,7 @@
+     Py_DECREF(py_ret);
+ 
+ out:
+-    Py_DECREF(py_event);
++    pygtk_boxed_unref_shared(py_event);
+     Py_DECREF(py_widget);
+     Py_DECREF(py_background_area);
+     Py_DECREF(py_cell_area);
+diff --exclude-from=/home/dang/.diffrc -u -ruN pygtk-2.10.1.orig/gtk/pygtk-private.h pygtk-2.10.1/gtk/pygtk-private.h
+--- pygtk-2.10.1.orig/gtk/pygtk-private.h	2006-07-05 09:12:17.000000000 -0400
++++ pygtk-2.10.1/gtk/pygtk-private.h	2006-09-30 17:10:16.000000000 -0400
+@@ -70,4 +70,6 @@
+ #define PYGDK_TYPE_REGION (pygdk_region_get_type ())
+ #endif /* GDK_TYPE_REGION */
+ 
++void pygtk_boxed_unref_shared(PyObject *boxed);
++
+ #endif
diff --git a/dev-python/pygtk/pygtk-2.10.1-r1.ebuild b/dev-python/pygtk/pygtk-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..6e5a6b2c2a66
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.10.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.10.1-r1.ebuild,v 1.1 2006/09/30 21:23:33 dang Exp $
+
+inherit gnome.org python flag-o-matic eutils
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+SRC_URI="${SRC_URI}
+	doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opengl doc"
+
+RDEPEND=">=dev-lang/python-2.3.5
+	>=dev-libs/glib-2.8.0
+	>=x11-libs/pango-1.10.0
+	>=dev-libs/atk-1.8.0
+	>=x11-libs/gtk+-2.10.0
+	>=gnome-base/libglade-2.5.0
+	>=dev-python/pycairo-1.0.2
+	>=dev-python/pygobject-2.12.1
+	!arm? ( dev-python/numeric )
+	opengl?	(	virtual/opengl
+				dev-python/pyopengl
+				>=x11-libs/gtkglarea-1.99
+			)"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	if use doc; then
+		unpack pygtk2reference.tbz2
+	fi
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s /bin/true "${S}"/py-compile
+
+	cd "${S}"
+	# bug #148247
+	epatch "${FILESDIR}/${P}-tree-model.patch"
+}
+
+src_compile() {
+	use hppa && append-flags -ffunction-sections
+	econf $(use_enable doc docs) --enable-thread || die
+	# possible problems with parallel builds (#45776)
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+	rm examples/Makefile*
+	cp -r examples ${D}/usr/share/doc/${PF}/
+
+	if use doc; then
+		cd "${S}"/../
+		dodir /usr/share/gtk-doc/html
+		cp -pPR pygtk2reference	${D}/usr/share/gtk-doc/html/
+	fi
+}
+
+src_test() {
+	cd tests
+	make check-local
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/share/pygtk/2.0/codegen
+	python_mod_cleanup
+	rm -f ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+}