1 |
flameeyes 11/06/01 01:31:21 |
2 |
|
3 |
Added: libcanberra-0.28-underlinking.patch |
4 |
Log: |
5 |
Avoid underlinking the modules, fixes bug #367355. |
6 |
|
7 |
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: libcanberra-0.28-underlinking.patch |
16 |
=================================================================== |
17 |
From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001 |
18 |
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com> |
19 |
Date: Sun, 15 May 2011 15:02:34 +0200 |
20 |
Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as |
21 |
Gtk itself. |
22 |
MIME-Version: 1.0 |
23 |
Content-Type: text/plain; charset=UTF-8 |
24 |
Content-Transfer-Encoding: 8bit |
25 |
|
26 |
Both of the modules use the XFree/XGetWindowProperty functions which are |
27 |
exposed by libX11; without this change, the modules would be |
28 |
underlinked, which causes some link editors to refuse the link (including |
29 |
GNU gold). |
30 |
|
31 |
Signed-off-by: Diego Elio Pettenò <flameeyes@×××××.com> |
32 |
--- |
33 |
configure.ac | 4 ++-- |
34 |
1 files changed, 2 insertions(+), 2 deletions(-) |
35 |
|
36 |
diff --git a/configure.ac b/configure.ac |
37 |
index 98102cc..2aaa51f 100644 |
38 |
--- a/configure.ac |
39 |
+++ b/configure.ac |
40 |
@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk], |
41 |
|
42 |
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
43 |
if test "x${gtk}" != xno ; then |
44 |
- PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ], |
45 |
+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ], |
46 |
[ |
47 |
HAVE_GTK=1 |
48 |
AC_DEFINE([HAVE_GTK], 1, [Have GTK?]) |
49 |
@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3], |
50 |
[gtk3=auto]) |
51 |
|
52 |
if test "x${gtk3}" != xno ; then |
53 |
- PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ], |
54 |
+ PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ], |
55 |
[ |
56 |
HAVE_GTK3=1 |
57 |
AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?]) |
58 |
-- |
59 |
1.7.5.rc3 |