[PATCH 1/2] python-xdg: prevent infinite recursion in xdg.DesktopEntry.__cmp__().

[PATCH 1/2] python-xdg: prevent infinite recursion in xdg.DesktopEntry.__cmp__().

[Yann Dirson]

Delete cmp method which has been dropped from later releases.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 recipes/python/python-pyxdg/desktopentry-cmp.patch |   15 +++++++++++++++
 recipes/python/python-pyxdg_0.15.bb                |    4 +++-
 2 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 recipes/python/python-pyxdg/desktopentry-cmp.patch

diff --git a/recipes/python/python-pyxdg/desktopentry-cmp.patch b/recipes/python/python-pyxdg/desktopentry-cmp.patch
new file mode 100644
index 0000000..bb2905a
--- /dev/null
+++ b/recipes/python/python-pyxdg/desktopentry-cmp.patch
@@ -0,0 +1,15 @@
+This method definition causes an infinite recursion, and has been dropped
+from later releases.
+
+--- pyxdg-0.15/xdg/DesktopEntry.py.orig	2010-08-03 03:01:34.000000000 +0200
++++ pyxdg-0.15/xdg/DesktopEntry.py	2010-08-03 03:01:46.000000000 +0200
+@@ -29,9 +29,6 @@
+ 	def __str__(self):
+ 		return self.getName()
+ 
+-	def __cmp__(self, other):
+-		return cmp(self, other)
+-
+ 	def parse(self, file):
+ 		IniFile.parse(self, file, ["Desktop Entry", "KDE Desktop Entry"])
+ 
diff --git a/recipes/python/python-pyxdg_0.15.bb b/recipes/python/python-pyxdg_0.15.bb
index 018af50..67b6c97 100644
--- a/recipes/python/python-pyxdg_0.15.bb
+++ b/recipes/python/python-pyxdg_0.15.bb
@@ -1,9 +1,11 @@
 DESCRIPTION = "PyXDG is a python library to access freedesktop.org standards"
 SECTION = "devel/python"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.freedesktop.org/~lanius/pyxdg-${PV}.tar.gz"
+SRC_URI += "file://desktopentry-cmp.patch"
+
 S = "${WORKDIR}/pyxdg-${PV}"
 
 inherit distutils
-- 
1.7.1

Re: [PATCH 1/2] python-xdg: prevent infinite recursion in xdg.DesktopEntry.__cmp__().

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

Am Mittwoch, den 04.08.2010, 01:01 +0200 schrieb Yann Dirson:
> Delete cmp method which has been dropped from later releases.

Yann, thank you for your patch.

I would prefer if you could move the recipe to 0.19 [1]. I did `git grep
-i pyxdg` and found no traces that 0.15 is pinned anywhere.

Or is your patch for stable?

[…]


Thanks,

Paul


[1] http://freedesktop.org/wiki/Software/pyxdg

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/2] python-xdg: prevent infinite recursion in xdg.DesktopEntry.__cmp__().

[Yann Dirson]

On Wed, Aug 04, 2010 at 10:31:45AM +0200, Paul Menzel wrote:
> Am Mittwoch, den 04.08.2010, 01:01 +0200 schrieb Yann Dirson:
> > Delete cmp method which has been dropped from later releases.
> 
> Yann, thank you for your patch.
> 
> I would prefer if you could move the recipe to 0.19 [1]. I did `git grep
> -i pyxdg` and found no traces that 0.15 is pinned anywhere.
> 
> Or is your patch for stable?

It is most surely useful for stable, but since I won't be able to
process 0.19 right now, it is probably good for dev as well.

Best regards,
-- 
Yann

[PATCH 2/2] gnome-python-desktop: build a separate python-rsvg package.

[Yann Dirson]

That package has no dependency on gnome, and is useful of its own.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---
 recipes/gnome/gnome-python-desktop_2.30.0.bb |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/recipes/gnome/gnome-python-desktop_2.30.0.bb b/recipes/gnome/gnome-python-desktop_2.30.0.bb
index 8dd73fa..9c72ed4 100644
--- a/recipes/gnome/gnome-python-desktop_2.30.0.bb
+++ b/recipes/gnome/gnome-python-desktop_2.30.0.bb
@@ -1,6 +1,8 @@
 LICENSE = "GPL/LGPL"
 DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui"
 
+PR = "r1"
+
 inherit gnome distutils-base
 
 EXTRA_OECONF += " ac_cv_path_PYGOBJECT_CODEGEN=${STAGING_DATADIR}/pygobject/2.0/codegen/codegen.py \
@@ -26,5 +28,10 @@ do_configure_prepend() {
 
 FILES_${PN}-dev += "${datadir}/pygtk"
 
+PACKAGES =+ "python-rsvg"
+FILES_python-rsvg = " \
+	/usr/lib/python*/site-packages/gtk-2.0/rsvg.* \
+"
+
 SRC_URI[archive.md5sum] = "a6d448d46a6b3062ce7a1b6a9fddfb48"
 SRC_URI[archive.sha256sum] = "db997a3c81967d6dc7210dd83e06f18ac6417f804f672e42f15a1d68af371f49"
-- 
1.7.1