[arch-commits] Commit in gnome-control-center/trunk (3 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Oct 15 23:07:04 UTC 2013
Date: Wednesday, October 16, 2013 @ 01:07:04
Author: heftig
Revision: 196642
3.10.1
Added:
gnome-control-center/trunk/buildfix.patch
Modified:
gnome-control-center/trunk/PKGBUILD
Deleted:
gnome-control-center/trunk/no-deprecated-upower.diff
---------------------------+
PKGBUILD | 16 +++++++---
buildfix.patch | 15 +++++++++
no-deprecated-upower.diff | 69 --------------------------------------------
3 files changed, 27 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-15 22:22:07 UTC (rev 196641)
+++ PKGBUILD 2013-10-15 23:07:04 UTC (rev 196642)
@@ -3,7 +3,7 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-control-center
-pkgver=3.10.0
+pkgver=3.10.1
pkgrel=1
pkgdesc="The Control Center for GNOME"
license=(GPL)
@@ -12,7 +12,7 @@
gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
gnome-color-manager smbclient modemmanager libgnomekbd)
-makedepends=(gnome-doc-utils intltool docbook-xsl)
+makedepends=(gnome-doc-utils intltool docbook-xsl gnome-common)
optdepends=('system-config-printer: Printer settings'
'gnome-user-share: Bluetooth and WebDAV file sharing'
'rygel: media sharing'
@@ -22,9 +22,17 @@
url="http://www.gnome.org"
install=gnome-control-center.install
options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ buildfix.patch)
+sha256sums=('fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe'
+ 'f58644e8735d3eb1e911ba2373e6c91cfde67b1ceaf54dca179b3a1c8db7466d')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../buildfix.patch
+ autoreconf -fi
+}
+
build() {
cd $pkgname-$pkgver
Added: buildfix.patch
===================================================================
--- buildfix.patch (rev 0)
+++ buildfix.patch 2013-10-15 23:07:04 UTC (rev 196642)
@@ -0,0 +1,15 @@
+diff -u -r gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am
+--- gnome-control-center-3.10.1/panels/background/Makefile.am 2013-10-11 13:19:22.000000000 +0200
++++ gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am 2013-10-16 00:59:02.966707377 +0200
+@@ -52,11 +52,6 @@
+ libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
+ endif
+
+-noinst_PROGRAMS = test-chooser-dialog
+-test_chooser_dialog_SOURCES = test-chooser-dialog.c
+-test_chooser_dialog_LDADD = libbackground-chooser.la
+-test_chooser_dialog_LDFLAGS = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+-
+ resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml)
+ cc-background-resources.c: background.gresource.xml $(resource_files)
+ $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $<
Deleted: no-deprecated-upower.diff
===================================================================
--- no-deprecated-upower.diff 2013-10-15 22:22:07 UTC (rev 196641)
+++ no-deprecated-upower.diff 2013-10-15 23:07:04 UTC (rev 196642)
@@ -1,69 +0,0 @@
-diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
-index d70496a..af71db9 100644
---- c/panels/power/cc-power-panel.c
-+++ i/panels/power/cc-power-panel.c
-@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
- GCancellable *cancellable;
- GtkBuilder *builder;
- UpClient *up_client;
-+ GDBusProxy *logind_proxy;
- GDBusProxy *screen_proxy;
- gboolean has_batteries;
-
-@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
- }
- g_clear_object (&priv->builder);
- g_clear_object (&priv->screen_proxy);
-+ g_clear_object (&priv->logind_proxy);
- g_clear_object (&priv->up_client);
- #ifdef HAVE_BLUETOOTH
- g_clear_object (&priv->bt_client);
-@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
- GtkWidget *dialog;
- GtkWidget *combo;
- GtkCellRenderer *cell;
-+ GVariant *result;
-
- /* The default values for these settings are unfortunate for us;
- * timeout == 0, action == suspend means 'do nothing' - just
-@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
- gtk_widget_set_margin_bottom (label, 6);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
-
-- if (up_client_get_can_hibernate (self->priv->up_client))
-+ value = 0;
-+ result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
-+ "CanHibernate",
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ NULL);
-+ if (result)
-+ {
-+ g_variant_get (result, "(s)", &s);
-+ if (g_strcmp0 (s, "yes") == 0)
-+ value = 1;
-+ g_variant_unref(result);
-+ }
-+
-+ if (value)
- {
- model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
- priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
-@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
- got_screen_proxy_cb,
- self);
-
-+ priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+ G_DBUS_PROXY_FLAGS_NONE,
-+ NULL,
-+ "org.freedesktop.login1",
-+ "/org/freedesktop/login1",
-+ "org.freedesktop.login1.Manager",
-+ NULL,
-+ &error);
-+
- priv->up_client = up_client_new ();
-
- priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
More information about the arch-commits
mailing list