Fix compilation with >=pygtk-2.9 with a patch from Octavio Ruiz, thanks. Bug #148725...

Package-Manager: portage-2.1.2-r11

diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index cd7aa9912e8506af7ba640ccdb287d41b33fccfd..922816be962dfdac37cb20565c18e6473f3ba8ea 100644 (file)
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/exo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.30 2007/02/13 20:49:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.31 2007/02/26 17:54:56 drac Exp $
+
+*exo-0.3.0-r2 (26 Feb 2007)
+
+  26 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  +files/exo-0.3.0-pygtk.patch, +exo-0.3.0-r2.ebuild:
+  Fix compilation with >=pygtk-2.9 with a patch from Octavio Ruiz, thanks.
+  Bug 148725.
 
   13 Feb 2007; Samuli Suominen <drac@gentoo.org> exo-0.3.2.ebuild:
   Stop using -Werror when USE debug is enabled for bug 166568.

diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index e7c4a98d0d72478bbff764bea160ec06d26c300f..c41cf9c2cde3da0dbfa46da54d770c9aaffbd467 100644 (file)
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -1,9 +1,17 @@
+AUX exo-0.3.0-pygtk.patch 1795 RMD160 b8d35950dabae2d14dc625f0e65e66c92287a1fc SHA1 c74aa70f6cfd9d8a7adb55622580382728bcdb2d SHA256 f0d55d3b9cd02f67e029f18f3340ad4a82d59beb991131376bb5a75f437dcb75
+MD5 949dca49c9101d6a4de7654dae3fe49e files/exo-0.3.0-pygtk.patch 1795
+RMD160 b8d35950dabae2d14dc625f0e65e66c92287a1fc files/exo-0.3.0-pygtk.patch 1795
+SHA256 f0d55d3b9cd02f67e029f18f3340ad4a82d59beb991131376bb5a75f437dcb75 files/exo-0.3.0-pygtk.patch 1795
 DIST exo-0.3.0.tar.bz2 387737 RMD160 328c28fa865a47fd7ce826d7ae27e3a3add61a76 SHA1 724715b157b6b4a664516459f6c3be10ae82cc4b SHA256 77f27ac51bb490018f553d01300950f4bc83cfe98c44114ea0a331a0606c3382
 DIST exo-0.3.2.tar.bz2 1121928 RMD160 5281645f63f2195420ba8ba501eeb7bc39170df8 SHA1 3a9f65c093d0a81e0a76bd2e8cbcde9805194f3c SHA256 632834506cf7768f9541286dbd90b9aa835bd3bb1ef1a022f2bcb99812945c3f
 EBUILD exo-0.3.0-r1.ebuild 629 RMD160 b711193d4c76825c04439bccc9d6182992d78deb SHA1 f792dd3561b06760c690064118b0f88afb1e7538 SHA256 52a18fdcf76249c0f2a97bb1c43ecc3ff74e71943c29f76e0f980f509e082608
 MD5 28e4ba8eac1873948f0c88b03fc0946a exo-0.3.0-r1.ebuild 629
 RMD160 b711193d4c76825c04439bccc9d6182992d78deb exo-0.3.0-r1.ebuild 629
 SHA256 52a18fdcf76249c0f2a97bb1c43ecc3ff74e71943c29f76e0f980f509e082608 exo-0.3.0-r1.ebuild 629
+EBUILD exo-0.3.0-r2.ebuild 667 RMD160 2036c833db0fefbcf72a332f0af09e1ffa4d98d5 SHA1 37d3d3aa7dff76943a733fafd9f281abba2cfa50 SHA256 1df7d0c9c527ef708186b6868557d5afa06832afdc68460f47df461caba94834
+MD5 ba22036d578c31b810d5239e1a66c4c5 exo-0.3.0-r2.ebuild 667
+RMD160 2036c833db0fefbcf72a332f0af09e1ffa4d98d5 exo-0.3.0-r2.ebuild 667
+SHA256 1df7d0c9c527ef708186b6868557d5afa06832afdc68460f47df461caba94834 exo-0.3.0-r2.ebuild 667
 EBUILD exo-0.3.0.ebuild 441 RMD160 b80f64f1bf481f4109338447d0c4e09058d9c0fc SHA1 e99e573362c75e2ada393857bd8f1d6cb8c09bdc SHA256 481e8e490192402f9ed952279bc3d159d502a455d90088d46fbaf0368eac764a
 MD5 2e58def89e8d2f6eb24ce9df1d4a7e97 exo-0.3.0.ebuild 441
 RMD160 b80f64f1bf481f4109338447d0c4e09058d9c0fc exo-0.3.0.ebuild 441
@@ -12,10 +20,10 @@ EBUILD exo-0.3.2.ebuild 1519 RMD160 17bbe89c1418ddd86631fcfe51f990a5908b4baa SHA
 MD5 ce05dea5bae25ddb8da00f857f57ce5a exo-0.3.2.ebuild 1519
 RMD160 17bbe89c1418ddd86631fcfe51f990a5908b4baa exo-0.3.2.ebuild 1519
 SHA256 c595f07423dcaa46a96a3104a28971d6e60d6869199b25b37e35d30e4d0d2fa5 exo-0.3.2.ebuild 1519
-MISC ChangeLog 3927 RMD160 44cb7bc094318f35f40af59c16689dafe7d40889 SHA1 e1798faa3e99642408c8b3e1f1270349b05aea88 SHA256 87afdbea9b7880a162249ed6b3919f000a0ea4e4c3b5be93a52d9705d9f171d9
-MD5 93810c799182d73321c715d098875d70 ChangeLog 3927
-RMD160 44cb7bc094318f35f40af59c16689dafe7d40889 ChangeLog 3927
-SHA256 87afdbea9b7880a162249ed6b3919f000a0ea4e4c3b5be93a52d9705d9f171d9 ChangeLog 3927
+MISC ChangeLog 4149 RMD160 e940f79c8bcc4493331048673c71fd4e46691dce SHA1 54b7fa6644a55077f773ddafbba2d67482b15283 SHA256 6136930aac0d6215740af68772ebe83ab8e624cbb219d9e534759da21ef6075d
+MD5 945af1a68ae15a3af47d50f32726200d ChangeLog 4149
+RMD160 e940f79c8bcc4493331048673c71fd4e46691dce ChangeLog 4149
+SHA256 6136930aac0d6215740af68772ebe83ab8e624cbb219d9e534759da21ef6075d ChangeLog 4149
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -26,6 +34,9 @@ SHA256 696a9d0b76deeb2fd0e2497dfebd3d036e5588a89c078c3c244721d0328de530 files/di
 MD5 1f574583f282dbea845a028af3a1e207 files/digest-exo-0.3.0-r1 232
 RMD160 728368e45dd275fa7047e4cac947769ae6afe6cd files/digest-exo-0.3.0-r1 232
 SHA256 696a9d0b76deeb2fd0e2497dfebd3d036e5588a89c078c3c244721d0328de530 files/digest-exo-0.3.0-r1 232
+MD5 1f574583f282dbea845a028af3a1e207 files/digest-exo-0.3.0-r2 232
+RMD160 728368e45dd275fa7047e4cac947769ae6afe6cd files/digest-exo-0.3.0-r2 232
+SHA256 696a9d0b76deeb2fd0e2497dfebd3d036e5588a89c078c3c244721d0328de530 files/digest-exo-0.3.0-r2 232
 MD5 d860af72b7924df3ad92656d1378f550 files/digest-exo-0.3.2 235
 RMD160 58067c486b7d933164ee498e6eab6828fdd3a70e files/digest-exo-0.3.2 235
 SHA256 28c98ae51bf274d422bf5a5d7adf9e8c38afe253fcb5e5a348ede935cf4ab252 files/digest-exo-0.3.2 235

diff --git a/xfce-extra/exo/exo-0.3.0-r2.ebuild b/xfce-extra/exo/exo-0.3.0-r2.ebuild
new file mode 100644 (file)
index 0000000..c4f426b
--- /dev/null
+++ b/xfce-extra/exo/exo-0.3.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.0-r2.ebuild,v 1.1 2007/02/26 17:54:56 drac Exp $
+
+inherit eutils xfce42
+
+DESCRIPTION="Extension library for Xfce"
+HOMEPAGE="http://www.os-cillation.com/"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+       x11-libs/libICE
+       x11-libs/libSM
+       >=x11-libs/gtk+-2.4
+       >=xfce-base/libxfce4mcs-4.2.2-r1
+       >=xfce-base/libxfcegui4-4.2"
+DEPEND="${RDEPEND}
+       x11-libs/libX11
+       x11-libs/libXt"
+
+bzipped
+goodies
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-pygtk.patch
+}      

diff --git a/xfce-extra/exo/files/digest-exo-0.3.0-r2 b/xfce-extra/exo/files/digest-exo-0.3.0-r2
new file mode 100644 (file)
index 0000000..1fbbcd1
--- /dev/null
+++ b/xfce-extra/exo/files/digest-exo-0.3.0-r2
@@ -0,0 +1,3 @@
+MD5 ffcd73ec6b34f19c81afdc3f1a97377b exo-0.3.0.tar.bz2 387737
+RMD160 328c28fa865a47fd7ce826d7ae27e3a3add61a76 exo-0.3.0.tar.bz2 387737
+SHA256 77f27ac51bb490018f553d01300950f4bc83cfe98c44114ea0a331a0606c3382 exo-0.3.0.tar.bz2 387737

diff --git a/xfce-extra/exo/files/exo-0.3.0-pygtk.patch b/xfce-extra/exo/files/exo-0.3.0-pygtk.patch
new file mode 100644 (file)
index 0000000..b530bca
--- /dev/null
+++ b/xfce-extra/exo/files/exo-0.3.0-pygtk.patch
@@ -0,0 +1,68 @@
+diff -ur exo-0.3.0.orig/python/exo.override exo-0.3.0/python/exo.override
+--- exo-0.3.0.orig/python/exo.override 2005-03-02 08:47:40.000000000 -0600
++++ exo-0.3.0/python/exo.override      2007-01-08 09:44:17.000000000 -0600
+@@ -27,8 +27,13 @@
+ #include <pygtk/pygtk.h>
+ #include <exo/exo.h>
+ 
++#if !defined(pygtk_tree_path_from_pyobject)
+ extern GtkTreePath *pygtk_tree_path_from_pyobject (PyObject *object);
++#endif
++
++#if !defined(pygtk_tree_path_to_pyobject)
+ extern PyObject *pygtk_tree_path_to_pyobject (GtkTreePath *path);
++#endif
+ 
+ %%
+ modulename exo
+diff -ur exo-0.3.0.orig/python/exomodule.c exo-0.3.0/python/exomodule.c
+--- exo-0.3.0.orig/python/exomodule.c  2005-02-21 14:24:37.000000000 -0600
++++ exo-0.3.0/python/exomodule.c       2007-01-08 09:49:24.000000000 -0600
+@@ -34,21 +34,8 @@
+  * that are required for the IconView, so we have to duplicate
+  * them here.
+  */
+-PyObject*
+-pygtk_tree_path_to_pyobject (GtkTreePath *path)
+-{
+-  gint len, i, *indices;
+-  PyObject *ret;
+-
+-  len = gtk_tree_path_get_depth (path);
+-  indices = gtk_tree_path_get_indices (path);
+-
+-  ret = PyTuple_New (len);
+-  for (i = 0; i < len; i++)
+-    PyTuple_SetItem (ret, i, PyInt_FromLong (indices[i]));
+-  return ret;
+-}
+ 
++#if !defined(pygtk_tree_path_from_pyobject)  
+ GtkTreePath*
+ pygtk_tree_path_from_pyobject (PyObject *object)
+ {
+@@ -96,7 +83,24 @@
+   
+   return NULL;
+ }
++#endif
+ 
++#if !defined(pygtk_tree_path_to_pyobject)
++PyObject*
++pygtk_tree_path_to_pyobject (GtkTreePath *path)
++{
++  gint len, i, *indices;
++  PyObject *ret;
++
++  len = gtk_tree_path_get_depth (path);
++  indices = gtk_tree_path_get_indices (path);
++
++  ret = PyTuple_New (len);
++  for (i = 0; i < len; i++)
++    PyTuple_SetItem (ret, i, PyInt_FromLong (indices[i]));
++  return ret;
++}
++#endif
+ 
+ DL_EXPORT(void)
+ init_exo (void)