summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-04-26 22:36:49 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-04-26 22:36:49 +0000
commit47f695cf1fe9b56219f2f4b5c9fc958876ae4a28 (patch)
treebb36f52ff41714ff4c173ef8dee02b336940d456 /gnome-base/libgnomekbd/files
parentFix bugs: 221553, 226579, 241358, 244130 (diff)
downloadgentoo-2-47f695cf1fe9b56219f2f4b5c9fc958876ae4a28.tar.gz
gentoo-2-47f695cf1fe9b56219f2f4b5c9fc958876ae4a28.tar.bz2
gentoo-2-47f695cf1fe9b56219f2f4b5c9fc958876ae4a28.zip
Avoid re-linking to system's libgnomekbd, thanks to vapier, bug #265428.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/libgnomekbd/files')
-rw-r--r--gnome-base/libgnomekbd/files/libgnomekbd-2.22.0-system-relink.patch30
1 files changed, 30 insertions, 0 deletions
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 <eva@gentoo.org>
+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
+