[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-shell/files: gnome-shell-3.10.4-bluetooth-gold.patch gnome-shell-3.12-bluetooth-flag.patch gnome-shell-defaults.patch

[Gilles Dartiguelongue (eva)]

eva         14/04/27 16:59:22

  Modified:             gnome-shell-3.10.4-bluetooth-gold.patch
                        gnome-shell-defaults.patch
  Added:                gnome-shell-3.12-bluetooth-flag.patch
  Log:
  Version bump for Gnome 3.12.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)

Revision  Changes    Path
1.2                  gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch?r1=1.1&r2=1.2

Index: gnome-shell-3.10.4-bluetooth-gold.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-shell-3.10.4-bluetooth-gold.patch	15 Mar 2014 22:13:55 -0000	1.1
+++ gnome-shell-3.10.4-bluetooth-gold.patch	27 Apr 2014 16:59:22 -0000	1.2
@@ -1,7 +1,7 @@
-From 92ad0e5a9dca44249639d71a089bfd7159ee6f65 Mon Sep 17 00:00:00 2001
+From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@g.o>
 Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
+Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
  ld.gold
 
 For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
@@ -14,10 +14,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8041052..a4aefde 100644
+index f489a56..79838a3 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -301,7 +301,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
+@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
  libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
  
  libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)



1.2                  gnome-base/gnome-shell/files/gnome-shell-defaults.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-defaults.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-defaults.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-defaults.patch?r1=1.1&r2=1.2

Index: gnome-shell-defaults.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-shell-defaults.patch	23 Aug 2013 09:27:52 -0000	1.1
+++ gnome-shell-defaults.patch	27 Apr 2014 16:59:22 -0000	1.2
@@ -1,6 +1,17 @@
---- data/org.gnome.shell.gschema.xml.in.in~	2013-07-30 22:57:44.000000000 +0200
-+++ data/org.gnome.shell.gschema.xml.in.in	2013-08-23 11:19:00.002182266 +0200
-@@ -32,7 +32,7 @@
+From 4fd7696fc9f392a11b91fa3fc7fe14ac7734ee62 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@g.o>
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/3] Alter list of default applications
+
+---
+ data/org.gnome.shell.gschema.xml.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
+index dc27e47..e8de0ed 100644
+--- a/data/org.gnome.shell.gschema.xml.in.in
++++ b/data/org.gnome.shell.gschema.xml.in.in
+@@ -22,7 +22,7 @@
        </_description>
      </key>
      <key name="favorite-apps" type="as">
@@ -9,3 +20,6 @@
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
          The applications corresponding to these identifiers
+-- 
+1.8.5.1
+



1.1                  gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch?rev=1.1&content-type=text/plain

Index: gnome-shell-3.12-bluetooth-flag.patch
===================================================================
From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
Date: Thu, 28 Feb 2013 18:48:32 +0330
Subject: [PATCH 2/3] Make bluetooth support optional

https://bugs.gentoo.org/show_bug.cgi?id=398145

Ed Catmur 2012-01-08 13:46:22 UTC
libgnome-bluetooth-applet is a private library so they shouldn't be linking
against it anyway.  I tried to work out how to tell libtool to add it to rpath
but got totally lost.

I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
so I can at least merge USE=-bluetooth.
---
 configure.ac | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9a30e65..aa710f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
 ])
 AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
 
+AC_MSG_CHECKING([for bluetooth support])
+AC_ARG_WITH([bluetooth],
+	AS_HELP_STRING([--without-bluetooth],
+		[Build without gnome-bluetooth library (default: auto)]))
+AS_IF([test "x$with_bluetooth" != "xno"], [
 PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
-        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-	 AC_SUBST([HAVE_BLUETOOTH],[1])],
+	[AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+	 AC_SUBST([HAVE_BLUETOOTH],[1])
+	 AC_MSG_RESULT([yes])],
 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
-	 AC_SUBST([HAVE_BLUETOOTH],[0])])
+	 AC_SUBST([HAVE_BLUETOOTH],[0])
+	 AC_MSG_RESULT([no])])
+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
+	 AC_SUBST([HAVE_BLUETOOTH],[0])
+	 AC_MSG_RESULT([no])])
 
 PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
 AC_SUBST(CALENDAR_SERVER_CFLAGS)
-- 
1.9.0