From 47f695cf1fe9b56219f2f4b5c9fc958876ae4a28 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 26 Apr 2009 22:36:49 +0000 Subject: Avoid re-linking to system's libgnomekbd, thanks to vapier, bug #265428. (Portage version: 2.2_rc31/cvs/Linux x86_64) --- gnome-base/libgnomekbd/ChangeLog | 7 ++++- .../files/libgnomekbd-2.22.0-system-relink.patch | 30 +++++++++++++++++++ gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild | 35 ++++++++++++++-------- gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild | 13 ++++++-- 4 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch (limited to 'gnome-base/libgnomekbd') diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog index 61f6bc73ac6a..f8267caab703 100644 --- a/gnome-base/libgnomekbd/ChangeLog +++ b/gnome-base/libgnomekbd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/libgnomekbd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.48 2009/04/12 20:47:06 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.49 2009/04/26 22:36:49 eva Exp $ + + 27 Apr 2009; Gilles Dartiguelongue + +files/libgnomekbd-2.22.0-system-relink.patch, libgnomekbd-2.22.0, + libgnomekbd-2.24.0: + Avoid re-linking to system's libgnomekbd, thanks to vapier, bug #265428. 12 Apr 2009; Friedrich Oslage libgnomekbd-2.24.0.ebuild: diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch new file mode 100644 index 000000000000..9d0e1f2aaca3 --- /dev/null +++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch @@ -0,0 +1,30 @@ +From f23aea30c608f73b5bfc0b60363757c7f783d772 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sun, 26 Apr 2009 21:57:27 +0200 +Subject: [PATCH] Avoid re-linking to system's libgnomekbd + + Fix suggested by vaiper on https://bugs.gentoo.org/show_bug.cgi?id=265428 +--- + libgnomekbd/Makefile.am | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am +index 65b77b7..6d2fa49 100644 +--- a/libgnomekbd/Makefile.am ++++ b/libgnomekbd/Makefile.am +@@ -33,9 +33,9 @@ libgnomekbd_la_LDFLAGS = $(common_LDFLAGS) + libgnomekbd_la_LIBADD = $(common_LIBADD) + + libgnomekbdui_la_LDFLAGS = $(common_LDFLAGS) +-libgnomekbdui_la_LIBADD = $(common_LIBADD) \ +- $(GTK_LIBS) \ +- libgnomekbd.la ++libgnomekbdui_la_LIBADD = libgnomekbd.la \ ++ $(common_LIBADD) \ ++ $(GTK_LIBS) + + libgnomekbd_la_SOURCES = \ + gkbd-desktop-config.c \ +-- +1.6.2.3 + diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild index e9030bfe2cf5..a02448f6f800 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.8 2008/11/13 19:14:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.9 2009/04/26 22:36:49 eva Exp $ -inherit gnome2 +EAPI="2" + +inherit autotools eutils gnome2 DESCRIPTION="Gnome keyboard configuration library" HOMEPAGE="http://www.gnome.org" @@ -13,18 +15,18 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND=">=dev-libs/glib-2.6 - >=sys-apps/dbus-0.92 - >=dev-libs/dbus-glib-0.34 - >=gnome-base/gconf-2.14 - >=x11-libs/gtk+-2.10.3 - >=gnome-base/libglade-2.6 - >=gnome-base/libgnome-2.16 - >=gnome-base/libgnomeui-2.16 - >=x11-libs/libxklavier-3.2 - !=sys-apps/dbus-0.92 + >=dev-libs/dbus-glib-0.34 + >=gnome-base/gconf-2.14 + >=x11-libs/gtk+-2.10.3 + >=gnome-base/libglade-2.6 + >=gnome-base/libgnome-2.16 + >=gnome-base/libgnomeui-2.16 + >=x11-libs/libxklavier-3.2 + !=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.19" DOCS="AUTHORS ChangeLog NEWS README" @@ -37,6 +39,13 @@ pkg_setup() { G2CONF="${G2CONF} --disable-tests" } +src_prepare() { + # Fix linking to system's library, bug #265428 + epatch "${FILESDIR}/${P}-system-relink.patch" + + eautomake +} + src_compile() { # FreeBSD doesn't like -j use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild index 896ebe21e036..b7d47751dfe2 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.7 2009/04/12 20:47:06 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.8 2009/04/26 22:36:49 eva Exp $ -inherit gnome2 +EAPI="2" + +inherit autotools eutils gnome2 DESCRIPTION="Gnome keyboard configuration library" HOMEPAGE="http://www.gnome.org" @@ -34,6 +36,13 @@ pkg_setup() { G2CONF="${G2CONF} --disable-tests" } +src_prepare() { + # Fix linking to system's library, bug #265428 + epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch" + + eautomake +} + src_compile() { # FreeBSD doesn't like -j use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" -- cgit v1.2.3-65-gdbad