summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-09-26 22:14:11 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-09-26 22:14:11 +0000
commit3ef24414c4643df73dd2076b4783f802d98a8efa (patch)
tree280a6992faf905ab7d0865683c614d03b6b0dc56 /gnome-extra
parentAdded ~arm keyword (diff)
downloadgentoo-2-3ef24414c4643df73dd2076b4783f802d98a8efa.tar.gz
gentoo-2-3ef24414c4643df73dd2076b4783f802d98a8efa.tar.bz2
gentoo-2-3ef24414c4643df73dd2076b4783f802d98a8efa.zip
Version bump. OOo parsing and xml fixes.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/libgsf/ChangeLog9
-rw-r--r--gnome-extra/libgsf/files/libgsf-1.14.19-missing-declaration.patch25
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.15.ebuild4
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.19.ebuild (renamed from gnome-extra/libgsf/libgsf-1.14.17.ebuild)5
4 files changed, 39 insertions, 4 deletions
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 962dcfc7eacc..044137b3daf2 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/libgsf
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.163 2010/09/11 18:28:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.164 2010/09/26 22:14:11 eva Exp $
+
+*libgsf-1.14.19 (26 Sep 2010)
+
+ 26 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> libgsf-1.14.15.ebuild,
+ -libgsf-1.14.17.ebuild, +libgsf-1.14.19.ebuild,
+ +files/libgsf-1.14.19-missing-declaration.patch:
+ Version bump. OOo parsing and xml fixes.
11 Sep 2010; Joseph Jezak <josejx@gentoo.org> libgsf-1.14.18.ebuild:
Marked ppc for bug #324077.
diff --git a/gnome-extra/libgsf/files/libgsf-1.14.19-missing-declaration.patch b/gnome-extra/libgsf/files/libgsf-1.14.19-missing-declaration.patch
new file mode 100644
index 000000000000..a79162d9f427
--- /dev/null
+++ b/gnome-extra/libgsf/files/libgsf-1.14.19-missing-declaration.patch
@@ -0,0 +1,25 @@
+From 99c64b99d6cafcccf3a88c8ab2a4283f7dd74376 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 27 Sep 2010 00:10:01 +0200
+Subject: [PATCH] Add missing definition of pygsfgnome_register_classes
+
+---
+ python/gsfgnomemodule.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/python/gsfgnomemodule.c b/python/gsfgnomemodule.c
+index 665a003..dbb2c46 100644
+--- a/python/gsfgnomemodule.c
++++ b/python/gsfgnomemodule.c
+@@ -27,6 +27,8 @@
+ extern PyMethodDef pygsfgnome_functions[];
+ extern DL_EXPORT(void) initgnome (void);
+
++extern void pygsfgnome_register_classes(PyObject *d);
++
+ DL_EXPORT(void)
+ initgnome (void)
+ {
+--
+1.7.3
+
diff --git a/gnome-extra/libgsf/libgsf-1.14.15.ebuild b/gnome-extra/libgsf/libgsf-1.14.15.ebuild
index 91ad9db1e5c4..2034caec1e62 100644
--- a/gnome-extra/libgsf/libgsf-1.14.15.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.15.ebuild,v 1.12 2010/07/20 04:35:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.15.ebuild,v 1.13 2010/09/26 22:14:11 eva Exp $
inherit eutils gnome2 python multilib
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="ppc64"
IUSE="bzip2 doc gnome python"
RDEPEND="
diff --git a/gnome-extra/libgsf/libgsf-1.14.17.ebuild b/gnome-extra/libgsf/libgsf-1.14.19.ebuild
index 41ba98f83750..1153398c027d 100644
--- a/gnome-extra/libgsf/libgsf-1.14.17.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.17.ebuild,v 1.4 2010/07/20 04:35:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.19.ebuild,v 1.1 2010/09/26 22:14:11 eva Exp $
EAPI="2"
GCONF_DEBUG="no"
@@ -67,6 +67,9 @@ src_prepare() {
# Fix useless variable in toplevel Makefile.am, bug #298813
epatch "${FILESDIR}/${PN}-1.14.16-automake-fixes.patch"
+ # Fix build with FEATURES="stricter"
+ epatch "${FILESDIR}/${PN}-1.14.19-missing-declaration.patch"
+
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf