1 |
tetromino 12/01/09 03:03:06 |
2 |
|
3 |
Added: gnome-shell-3.2.1-automagic-gnome-bluetooth.patch |
4 |
Log: |
5 |
Add lots of upstream patches: fix browser plugin on chromium and epiphany, fix some crashes, improve extension system stability, do not load disabled extensions at shell startup, do not allow message popups to steal mouse focus, have the message tray use a hot corner so that mouse events on bottom pixel row do not get blocked, and do not depend on nautilus's schemas or libgnome's gnome-open. Also, fix automagic gnome-bluetooth dependency (bug #398145, thanks to Ed Catmur for the patch). |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gnome-shell-3.2.1-automagic-gnome-bluetooth.patch |
16 |
=================================================================== |
17 |
From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001 |
18 |
From: root <admin@×××××××××.uk> |
19 |
Date: Sun, 8 Jan 2012 13:55:05 +0000 |
20 |
Subject: [PATCH] Fix automagic gnome-bluetooth dependency |
21 |
|
22 |
https://bugs.gentoo.org/show_bug.cgi?id=398145 |
23 |
|
24 |
Ed Catmur 2012-01-08 13:46:22 UTC |
25 |
libgnome-bluetooth-applet is a private library so they shouldn't be linking |
26 |
against it anyway. I tried to work out how to tell libtool to add it to rpath |
27 |
but got totally lost. |
28 |
|
29 |
I'll see if I can work out how to fix the automagic gnome-bluetooth dependency |
30 |
so I can at least merge USE=-bluetooth. |
31 |
--- |
32 |
configure.ac | 5 +++++ |
33 |
1 files changed, 5 insertions(+), 0 deletions(-) |
34 |
|
35 |
diff --git a/configure.ac b/configure.ac |
36 |
index 1c64122..a699838 100644 |
37 |
--- a/configure.ac |
38 |
+++ b/configure.ac |
39 |
@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) |
40 |
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) |
41 |
|
42 |
AC_MSG_CHECKING([for bluetooth support]) |
43 |
+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) |
44 |
+AS_IF([test "x$with_bluetooth" != "xno"], [ |
45 |
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
46 |
[BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` |
47 |
BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` |
48 |
@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
49 |
[AC_DEFINE([HAVE_BLUETOOTH],[0]) |
50 |
AC_SUBST([HAVE_BLUETOOTH],[0]) |
51 |
AC_MSG_RESULT([no])]) |
52 |
+], [AC_DEFINE([HAVE_BLUETOOTH],[0]) |
53 |
+ AC_SUBST([HAVE_BLUETOOTH],[0]) |
54 |
+ AC_MSG_RESULT([no])]) |
55 |
|
56 |
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) |
57 |
AC_SUBST(CALENDAR_SERVER_CFLAGS) |
58 |
-- |
59 |
1.7.8.2 |