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

2016-03-24 Thread Ole Reifschneider 
commit: 40a666eeb8978886329cb335584cc880694fc975
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Mar 20 22:01:57 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Mar 25 00:55:46 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=40a666ee

gnome-base/gnome-control-center: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../gnome-control-center-3.20.0-optional.patch | 534 +
 ...0.ebuild => gnome-control-center-3.20.0.ebuild} |  23 +-
 .../gnome-control-center-.ebuild   |  20 +-
 3 files changed, 554 insertions(+), 23 deletions(-)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
new file mode 100644
index 000..0e7639d
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
@@ -0,0 +1,534 @@
+From d3a9941031fc69d343fb011af52f2462de269bff Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Signed-Off: Ole Reifschneider 
+---
+ 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/cc-panel-loader.c |   8 ++
+ 7 files changed, 187 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c2a779..0fd0025 100644
+--- a/configure.ac
 b/configure.ac
+@@ -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.3 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -140,14 +136,66 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ 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]),
++   [case "${enableval}" in
++   yes) WANT_ONLINE_ACCOUNTS=yes ;;
++   no) WANT_ONLINE_ACCOUNTS=no ;;
++   *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++   esac],
++   [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++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])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = 
"xtrue")
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
++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.3 >= $GRILO_REQUIRED_VERSION)
++
+ 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
+-  colord >= $COLORD_REQUIRED_VERSION
+-  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-  libsoup-2.4
+-  gnome-desktop-3.0 >=

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

2015-10-02 Thread Ole Reifschneider 
commit: e67a7340ca1321024b041bc09c5e0f62398fdf5e
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Fri Oct  2 09:53:54 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Oct  2 09:53:54 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e67a7340

gnome-base/gnome-control-center: Bump version to 3.18.0

Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42

 ...ontrol-center-3.18.0-keep-panels-optional.patch |  39 ++
 .../gnome-control-center-3.18.0-optional.patch | 537 +
 ...9.ebuild => gnome-control-center-3.18.0.ebuild} |  23 +-
 .../gnome-control-center-.ebuild   |  12 +-
 4 files changed, 590 insertions(+), 21 deletions(-)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
new file mode 100644
index 000..23141e4
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
@@ -0,0 +1,39 @@
+From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Mon, 11 May 2015 23:59:03 +0200
+Subject: [PATCH 1/3] Optional gotta be optional
+
+---
+ configure.ac | 16 
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..bc239de 100644
+--- a/configure.ac
 b/configure.ac
+@@ -508,22 +508,6 @@ else
+ AC_MSG_RESULT(no)
+ fi
+
+-case $host_os in
+-  linux*)
+-if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+-  # Nothing
+-  echo "USB-related panels disabled on S390"
+-else
+-  if test "x$have_networkmanager" != "xyes" -o \
+-  "x$have_bluetooth" != "xyes" -o \
+-  "x$enable_cups" != "xyes" -o \
+-  "x$have_wacom" != "xyes"; then
+-AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are 
not optional on Linux systems])
+- fi
+-fi
+-;;
+-esac
+-
+ AC_CONFIG_FILES([
+ Makefile
+ panels/Makefile
+--
+2.3.6
+

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
new file mode 100644
index 000..96b58f6
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
@@ -0,0 +1,537 @@
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue 
+---
+ 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/cc-panel-loader.c |   8 ++
+ 7 files changed, 186 insertions(+), 36 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe723d5..f882e23 100644
+--- a/configure.ac
 b/configure.ac
+@@ -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)
+-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

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

2015-05-10 Thread Gilles Dartiguelongue 
commit: 72663fd4382c7827a5663adeb1379dab5a3ef887
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Sun May 10 16:54:30 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 10 17:19:47 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=72663fd4

gnome-base/gnome-control-center: 3.14.5 → 3.16.1

 ...ntrol-center-3.16.0-make-wayland-optional.patch | 44 
 ...9.ebuild = gnome-control-center-3.16.1.ebuild} | 59 +++---
 .../gnome-control-center-.ebuild   | 48 ++
 3 files changed, 76 insertions(+), 75 deletions(-)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
new file mode 100644
index 000..38d4ccd
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
@@ -0,0 +1,44 @@
+From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider tranquil...@gentoo.org
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH] Make wayland support optional
+
+---
+ configure.ac | 21 +++--
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..6b34962 100644
+--- a/configure.ac
 b/configure.ac
+@@ -231,12 +231,21 @@ if test x$have_udev = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test x$have_udev = xyes])
+
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test x$have_wayland = xyes ; then
+-  if test x$have_udev != xyes ; then
+-  AC_MSG_ERROR([udev is required for Wayland support])
+-  fi
+-fi
++AC_ARG_ENABLE(
++  [wayland],
++  AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++  [],
++  enable_wayland=auto
++)
++
++AS_IF([test $enable_wayland != no],
++  [
++AS_IF([test x$have_udev = xno],
++  [AC_MSG_ERROR([udev is required for Wayland support])],
++  [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+
+ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager = 
$NETWORK_MANAGER_REQUIRED_VERSION
+   libnm-glib = $NETWORK_MANAGER_REQUIRED_VERSION
+--
+2.0.5
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-.ebuild 
b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
similarity index 70%
copy from gnome-base/gnome-control-center/gnome-control-center-.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
index 944a1e7..2ea4abf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes # gmodule is used, which uses dlopen
+GNOME2_LA_PUNT=yes
 
 inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION=GNOME's main interface to configure various aspects of the 
desktop
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/;
@@ -17,31 +14,24 @@ 
HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/;
 LICENSE=GPL-2+
 SLOT=2
 IUSE=+bluetooth +colord +cups +gnome-online-accounts +i18n 
input_devices_wacom kerberos v4l
-if [[ ${PV} =  ]]; then
-   KEYWORDS=
-else
-   KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-fi
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=.*
 
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
 # g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be 
in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg5.html
-#
+
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 
 # FIXME: modemmanager is not optional
 #networkmanager is not optional
 
 COMMON_DEPEND=
-   =dev-libs/glib-2.39.91:2
+   =dev-libs/glib-2.39.91:2[dbus]
=x11-libs/gdk-pixbuf-2.23.0:2
-   =x11-libs/gtk+-3.13:3
-   =gnome-base/gsettings-desktop-schemas-3.13.91
+   =x11-libs/gtk+-3.15:3
+   =gnome-base/gsettings-desktop-schemas-3.15.4
=gnome-base/gnome-desktop-3.11.3:3=
=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
 
@@ -60,6 +50,7 @@ COMMON_DEPEND=

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

2014-10-12 Thread Gilles Dartiguelongue 
commit: 3d31378518b25642ce0d497f0e764bb385918e79
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Oct 12 22:26:51 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Oct 12 23:19:09 2014 +
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-.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 tetrom...@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 e...@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)

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

2014-04-25 Thread Gilles Dartiguelongue 
commit: ac397260143baaf7e7bcf8e922f4342a696ea6b2
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Thu Apr 24 22:08:00 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Fri Apr 25 21:06:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac397260

gnome-base/gnome-control-center: 3.12.0 → 3.12.1

---
 ... = gnome-control-center-3.12.1-optional.patch} | 58 --
 ...0.ebuild = gnome-control-center-3.12.1.ebuild} |  2 +-
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
similarity index 87%
rename from 
gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
rename to 
gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
index f1a626e..6662e0b 100644
--- 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
@@ -1,11 +1,35 @@
+From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev tetrom...@gentoo.org
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue e...@gentoo.org
+---
+ configure.ac| 146 ++--
+ panels/Makefile.am  |  10 ++-
+ panels/user-accounts/um-realm-manager.c |   9 ++
+ shell/Makefile.am   |  10 ++-
+ shell/cc-panel-loader.c |   8 ++
+ 5 files changed, 153 insertions(+), 30 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index 4100481..f5f5d02 100644
+index 511f78d..f82108e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -140,13 +140,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi = 1.2
+@@ -139,14 +139,58 @@ 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(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 
goa-backend-1.0 = $GOA_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 
goa-backend-1.0 = $GOA_REQUIRED_VERSION)
 +
 +build_online_accounts=false
 +AC_ARG_ENABLE(goa,
@@ -66,7 +90,7 @@ index 4100481..f5f5d02 100644
  PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
polkit-gobject-1 = $POLKIT_REQUIRED_VERSION)
  PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +251,25 @@ fi
+@@ -206,8 +250,25 @@ fi
  AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
  
  # Check for gnome-bluetooth
@@ -85,7 +109,7 @@ index 4100481..f5f5d02 100644
 +
 +if test x$WANT_BLUETOOTH = xyes; then
 +   # Check for gnome-bluetooth
-+   PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 = 
3.9.3,
++   PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 = 
3.11.1,
 +   [have_bluetooth=yes], have_bluetooth=no)
 +   have_bluetooth=yes
 +fi
@@ -94,7 +118,7 @@ index 4100481..f5f5d02 100644
  if test x$have_bluetooth = xyes ; then
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth 
panel])
  fi
-@@ -292,15 +354,26 @@ case $host_os in
+@@ -292,15 +353,27 @@ case $host_os in
  if test $host_cpu = s390 -o $host_cpu = s390x; then
have_wacom=no
  else
@@ -103,8 +127,10 @@ index 4100481..f5f5d02 100644
 -xi = 1.2 x11 libwacom = $LIBWACOM_REQUIRED_VERSION
 -gnome-desktop-3.0 = $GNOME_DESKTOP_REQUIRED_VERSION
 -clutter-gtk-1.0
--clutter-1.0 = $CLUTTER_REQUIRED_VERSION, 
[have_wacom=yes], [have_wacom=no])
--  if test x${have_wacom} = xyes; then
+-clutter-1.0 = $CLUTTER_REQUIRED_VERSION)
+-  have_wacom=yes
+-  AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+-  AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
 +  AC_ARG_ENABLE(wacom,
 +AC_HELP_STRING([--disable-wacom],
 +   [disable wacom management panel]),
@@ -122,13 +148,14 @@ index 4100481..f5f5d02 100644
 +  gnome-desktop-3.0 = $GNOME_DESKTOP_REQUIRED_VERSION
 +

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

2014-04-20 Thread Gilles Dartiguelongue 
commit: 383e5745db099c5e42eb582b0437fbbe683c78ee
Author: Mike Auty ikelos AT gentoo DOT org
AuthorDate: Thu Apr 17 00:31:51 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=383e5745

gnome-base/gnome-control-center: 3.10.3 → 3.12.0

Bump gnome-control-center, rebasing the optional patch and updating the 
appropriate deps.

---
 .../gnome-control-center-3.12.0-optional.patch | 353 +
 .../gnome-control-center-3.12.0.ebuild | 162 ++
 2 files changed, 515 insertions(+)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
new file mode 100644
index 000..f1a626e
--- /dev/null
+++ 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
@@ -0,0 +1,353 @@
+diff --git a/configure.ac b/configure.ac
+index 4100481..f5f5d02 100644
+--- a/configure.ac
 b/configure.ac
+@@ -140,13 +140,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi = 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 
goa-backend-1.0 = $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++AC_ARG_ENABLE(goa,
++   AC_HELP_STRING([--disable-goa],
++   [disable online accounts management panel]),
++   [case ${enableval} in
++   yes) WANT_ONLINE_ACCOUNTS=yes ;;
++   no) WANT_ONLINE_ACCOUNTS=no ;;
++   *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++   esac],
++   [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++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
++fi
++if test x$build_online_accounts = xtrue ; then
++   AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online 
Accounts panel])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test x$build_online_accounts = 
xtrue)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
+ 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
+-  colord = $COLORD_REQUIRED_VERSION
+-  colord-gtk = $COLORD_GTK_REQUIRED_VERSION
+-  libsoup-2.4
+-  gnome-desktop-3.0 = $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_color=false
++AC_ARG_ENABLE(color,
++   AC_HELP_STRING([--disable-color],
++   [disable color management panel]),
++   [case ${enableval} in
++   yes) WANT_COLOR=yes ;;
++   no) WANT_COLOR=no ;;
++   *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++   esac],
++   [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)
++   build_color=true
++fi
++if test x$build_color = xtrue ; then
++   AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test x$build_color = xtrue)
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+   polkit-gobject-1 = $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +251,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+ 
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 = 3.11.1,
+-[have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++   AC_HELP_STRING([--disable-bluetooth],
++   [disable bluetooth management panel]),
++   [case ${enableval} in
++   yes) WANT_BLUETOOTH=yes ;;
++   no) WANT_BLUETOOTH=no ;;
++   *) AC_MSG_ERROR(bad value ${enableval} for 
--disable-bluetooth) ;;
++   esac],
++   [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++   # Check for gnome-bluetooth
++   PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 = 
3.9.3,
++   [have_bluetooth=yes], have_bluetooth=no)
++   have_bluetooth=yes
++fi
++
++
+ if test x$have_bluetooth = xyes ; then
+   AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth

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

2014-04-20 Thread Gilles Dartiguelongue 
commit: a31bb849caf844d3521e8d29c579e65a4ddb420f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 15:20:28 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a31bb849

gnome-base/gnome-control-center: QAed

* Cosmetic changes for dependencies.
* Lower gnome-bluetooth dependency per configure, not sure why it was
  3.11.3.
* Drop old patch revision.
* Fix keywords.
* Sync live ebuild.

---
 .../gnome-control-center-3.10.2-optional.patch | 384 -
 .../gnome-control-center-3.12.0.ebuild |  11 +-
 .../gnome-control-center-.ebuild   |  17 +-
 3 files changed, 14 insertions(+), 398 deletions(-)

diff --git 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
 
b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
deleted file mode 100644
index 0c4d111..000
--- 
a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 079e6b87816d96d73adaa5eeb2f8a1b620a0ae70 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev tetrom...@gentoo.org
-Date: Mon, 9 Dec 2013 23:23:13 +0100
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
-
-Dropped mm from this revision of the patch since it appears more
-complicated than ever to split it from the network panel.
-
-Signed-Off: Gilles Dartiguelongue e...@gentoo.org

- configure.ac| 140 ++--
- panels/Makefile.am  |  10 ++-
- panels/user-accounts/um-realm-manager.c |   9 ++
- shell/Makefile.am   |  10 ++-
- shell/cc-panel-loader.c |   8 ++
- 5 files changed, 149 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 19bebaf..8b4177a 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -136,14 +136,58 @@ 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(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 
goa-backend-1.0 = $GOA_REQUIRED_VERSION)
-+
-+build_online_accounts=false
-+AC_ARG_ENABLE(goa,
-+  AC_HELP_STRING([--disable-goa],
-+  [disable online accounts management panel]),
-+  [case ${enableval} in
-+  yes) WANT_ONLINE_ACCOUNTS=yes ;;
-+  no) WANT_ONLINE_ACCOUNTS=no ;;
-+  *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
-+  esac],
-+  [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
-+
-+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
-+fi
-+if test x$build_online_accounts = xtrue ; then
-+  AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online 
Accounts panel])
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test x$build_online_accounts = 
xtrue)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib = 0.9.1
-   gnome-settings-daemon = $GSD_REQUIRED_VERSION)
--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)
-+
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+  [disable color management panel]),
-+  [case ${enableval} in
-+  yes) WANT_COLOR=yes ;;
-+  no) WANT_COLOR=no ;;
-+  *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+  esac],
-+  [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)
-+  build_color=true
-+fi
-+if test x$build_color = xtrue ; then
-+  AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test x$build_color = xtrue)
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL,