[arch-commits] Commit in gnome-control-center/trunk (2 files)

Jan Steffens heftig at nymeria.archlinux.org
Wed Jul 31 13:08:56 UTC 2013


    Date: Wednesday, July 31, 2013 @ 15:08:56
  Author: heftig
Revision: 191843

Remove dep on deprecated upower features

Added:
  gnome-control-center/trunk/no-deprecated-upower.diff
Modified:
  gnome-control-center/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   14 +++++++-
 no-deprecated-upower.diff |   69 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-31 09:40:22 UTC (rev 191842)
+++ PKGBUILD	2013-07-31 13:08:56 UTC (rev 191843)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-control-center
 pkgver=3.8.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
 arch=(i686 x86_64)
@@ -22,9 +22,16 @@
 url="http://www.gnome.org"
 install=gnome-control-center.install
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+        no-deprecated-upower.diff)
+sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55'
+            '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../no-deprecated-upower.diff
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -33,6 +40,7 @@
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 

Added: no-deprecated-upower.diff
===================================================================
--- no-deprecated-upower.diff	                        (rev 0)
+++ no-deprecated-upower.diff	2013-07-31 13:08:56 UTC (rev 191843)
@@ -0,0 +1,69 @@
+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