[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     3d31378518b25642ce0d497f0e764bb385918e79
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 22:26:51 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d313785

gnome-base/gnome-control-center: update patch for 3.14

---
 ... => gnome-control-center-3.14.0-optional.patch} | 200 ++++++++++++++++++---
 .../gnome-control-center-3.14.0.ebuild             |   2 +-
 .../gnome-control-center-9999.ebuild               |   2 +-
 3 files changed, 179 insertions(+), 25 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
similarity index 66%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
rename to gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
index 6662e0b..a161658 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
@@ -1,4 +1,4 @@
-From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Fri, 25 Apr 2014 22:17:24 +0200
 Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
@@ -14,24 +14,38 @@ complicated than ever to split it from the network panel.
 
 Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
 ---
- configure.ac                            | 146 ++++++++++++++++++++++++++------
- panels/Makefile.am                      |  10 ++-
+ configure.ac                            | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am                      |  10 +-
+ panels/background/Makefile.am           |   8 +-
+ panels/background/bg-pictures-source.c  |  20 ++++
  panels/user-accounts/um-realm-manager.c |   9 ++
- shell/Makefile.am                       |  10 ++-
+ shell/Makefile.am                       |  10 +-
  shell/cc-panel-loader.c                 |   8 ++
- 5 files changed, 153 insertions(+), 30 deletions(-)
+ 7 files changed, 186 insertions(+), 36 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 511f78d..f82108e 100644
+index fe723d5..f882e23 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+-                  goa-1.0 >= $GOA_REQUIRED_VERSION
+-                  grilo-0.2 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
  PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
 +
 +build_online_accounts=false
++background_online_accounts=
 +AC_ARG_ENABLE(goa,
 +       AC_HELP_STRING([--disable-goa],
 +               [disable online accounts management panel]),
@@ -45,6 +59,7 @@ index 511f78d..f82108e 100644
 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
 +       PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
 +       build_online_accounts=true
++       background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
 +fi
 +if test "x$build_online_accounts" = xtrue ; then
 +       AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
@@ -53,6 +68,10 @@ index 511f78d..f82108e 100644
 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
 +
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
++                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++                  $background_online_accounts)
++
  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
@@ -73,11 +92,12 @@ index 511f78d..f82108e 100644
 +       [WANT_COLOR=yes]) dnl Default value
 +
 +if test x$WANT_COLOR = xyes; then
++
 +       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-+               colord >= $COLORD_REQUIRED_VERSION
-+               colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+               libsoup-2.4
-+               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++                         colord >= $COLORD_REQUIRED_VERSION
++                         colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++                         libsoup-2.4
++                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 +       build_color=true
 +fi
 +if test "x$build_color" = xtrue ; then
@@ -90,7 +110,7 @@ index 511f78d..f82108e 100644
  PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
                    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
  PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +250,25 @@ fi
+@@ -206,8 +253,25 @@ fi
  AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
  
  # Check for gnome-bluetooth
@@ -118,7 +138,7 @@ index 511f78d..f82108e 100644
  if test "x$have_bluetooth" = xyes ; then
  	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
  fi
-@@ -292,15 +353,27 @@ case $host_os in
+@@ -292,15 +356,27 @@ case $host_os in
      if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
        have_wacom=no
      else
@@ -155,7 +175,7 @@ index 511f78d..f82108e 100644
      fi
      ;;
    *)
-@@ -310,16 +383,22 @@ esac
+@@ -310,16 +386,22 @@ esac
  AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
  
  # Kerberos kerberos support
@@ -187,7 +207,7 @@ index 511f78d..f82108e 100644
  AC_SUBST(KRB5_CFLAGS)
  AC_SUBST(KRB5_LIBS)
  
-@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then
+@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
  else
  	AC_MSG_NOTICE([   Bluetooth panel disabled])
  fi
@@ -199,7 +219,7 @@ index 511f78d..f82108e 100644
  if test "x$enable_cups" = "xyes"; then
  	AC_MSG_NOTICE([** CUPS (Printers panel)])
  else
-@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then
+@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
  else
  	AC_MSG_NOTICE([   Users panel webcam support disabled])
  fi
@@ -252,6 +272,140 @@ index 9961c25..0c54622 100644
 +endif
 +
  -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES =	\
+ 	$(BUILT_SOURCES)		\
+ 	cc-background-chooser-dialog.c	\
+ 	cc-background-chooser-dialog.h	\
+-	cc-background-grilo-miner.c	\
+-	cc-background-grilo-miner.h	\
+ 	cc-background-item.c		\
+ 	cc-background-item.h		\
+ 	cc-background-xml.c		\
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES =	\
+ 	bg-colors-source.c		\
+ 	bg-colors-source.h
+ 
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES +=	\
++	cc-background-grilo-miner.c	\
++	cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+ 
+ libbackground_la_SOURCES =		\
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index c165fa3..78ef4a5 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+ 
+ #include "bg-pictures-source.h"
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+ 
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+ 
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+   GCancellable *cancellable;
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   CcBackgroundGriloMiner *grl_miner;
++#endif
+ 
+   GnomeDesktopThumbnailFactory *thumb_factory;
+ 
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+       g_clear_object (&priv->cancellable);
+     }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   g_clear_object (&priv->grl_miner);
++#endif
+   g_clear_object (&priv->thumb_factory);
+ 
+   G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource     *bg_source,
+   gboolean needs_download;
+   gboolean retval = FALSE;
+   GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+   GrlMedia *media;
++#else
++  gpointer media = NULL;
++#endif
+ 
+   /* find png and jpeg files */
+   if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource     *bg_source,
+ 
+  read_file:
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+   if (media == NULL)
+     {
+       g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource     *bg_source,
+   return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+                             GFile            *file,
+@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+ 
+   return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+ gboolean
+ bg_pictures_source_add (BgPicturesSource     *bg_source,
+@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor      *monitor,
+     }
+ }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+   g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+   add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+ 
+   g_object_unref (dir);
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   priv->grl_miner = cc_background_grilo_miner_new ();
+   g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+   cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+   priv->thumb_factory =
+     gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
 diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
 index 0849160..58d50a6 100644
 --- a/panels/user-accounts/um-realm-manager.c
@@ -301,10 +455,10 @@ index 0849160..58d50a6 100644
  
  void
 diff --git a/shell/Makefile.am b/shell/Makefile.am
-index ad7a68f..cc968ac 100644
+index c0cb91a..0b820fd 100644
 --- a/shell/Makefile.am
 +++ b/shell/Makefile.am
-@@ -52,14 +52,12 @@ gnome_control_center_LDADD =						\
+@@ -55,14 +55,12 @@ gnome_control_center_LDADD =						\
  	$(top_builddir)/libgd/libgd.la					\
  	$(top_builddir)/panels/common/liblanguage.la			\
  	$(top_builddir)/panels/background/libbackground.la		\
@@ -319,7 +473,7 @@ index ad7a68f..cc968ac 100644
  	$(top_builddir)/panels/power/libpower.la			\
  	$(top_builddir)/panels/privacy/libprivacy.la			\
  	$(top_builddir)/panels/region/libregion.la			\
-@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
  gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
  endif
  
@@ -331,9 +485,9 @@ index ad7a68f..cc968ac 100644
 +gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
 +endif
 +
- AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
- 
  # Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
 diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
 index 26576dc..8a92f95 100644
 --- a/shell/cc-panel-loader.c
@@ -379,5 +533,5 @@ index 26576dc..8a92f95 100644
  #ifdef BUILD_PRINTERS
    PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
 -- 
-1.9.0
+2.1.2
 

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
index a4a4090..9ea3b80 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
@@ -127,7 +127,7 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 3291a22..944a1e7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -137,7 +137,7 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch