[arch-commits] Commit in gnome-settings-daemon/repos (12 files)

Jan Steffens heftig at archlinux.org
Sun Mar 11 21:03:57 EDT 2012


    Date: Sunday, March 11, 2012 @ 21:03:57
  Author: heftig
Revision: 153049

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  gnome-settings-daemon/repos/gnome-unstable-i686/PKGBUILD
    (from rev 153048, gnome-settings-daemon/trunk/PKGBUILD)
  gnome-settings-daemon/repos/gnome-unstable-i686/gnome-settings-daemon.install
    (from rev 153048, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
  gnome-settings-daemon/repos/gnome-unstable-i686/systemd-fallback.patch
    (from rev 153048, gnome-settings-daemon/trunk/systemd-fallback.patch)
  gnome-settings-daemon/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 153048, gnome-settings-daemon/trunk/PKGBUILD)
  gnome-settings-daemon/repos/gnome-unstable-x86_64/gnome-settings-daemon.install
    (from rev 153048, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
  gnome-settings-daemon/repos/gnome-unstable-x86_64/systemd-fallback.patch
    (from rev 153048, gnome-settings-daemon/trunk/systemd-fallback.patch)
Deleted:
  gnome-settings-daemon/repos/gnome-unstable-i686/PKGBUILD
  gnome-settings-daemon/repos/gnome-unstable-i686/gnome-settings-daemon.install
  gnome-settings-daemon/repos/gnome-unstable-i686/systemd-fallback.patch
  gnome-settings-daemon/repos/gnome-unstable-x86_64/PKGBUILD
  gnome-settings-daemon/repos/gnome-unstable-x86_64/gnome-settings-daemon.install
  gnome-settings-daemon/repos/gnome-unstable-x86_64/systemd-fallback.patch

-----------------------------------------------------+
 gnome-unstable-i686/PKGBUILD                        |   84 ++--
 gnome-unstable-i686/gnome-settings-daemon.install   |   36 +-
 gnome-unstable-i686/systemd-fallback.patch          |  314 ++++++++----------
 gnome-unstable-x86_64/PKGBUILD                      |   84 ++--
 gnome-unstable-x86_64/gnome-settings-daemon.install |   36 +-
 gnome-unstable-x86_64/systemd-fallback.patch        |  314 ++++++++----------
 6 files changed, 428 insertions(+), 440 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-i686/PKGBUILD	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.3.92
-pkgrel=0
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse'
-         'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa'
-         'upower' 'libsystemd' 'libwacom' 'udev' 'colord')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        systemd-fallback.patch)
-sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
-            '29387c8176ec2f8c56060ea08865201ca9c7a27cb8ae5d93bdc4c3afe8e5516b')
-
-build() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../systemd-fallback.patch
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-settings-daemon/repos/gnome-unstable-i686/PKGBUILD (from rev 153048, gnome-settings-daemon/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-settings-daemon
+pkgver=3.3.92
+pkgrel=0.1
+pkgdesc="The GNOME Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse'
+         'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa'
+         'upower' 'libsystemd' 'libwacom' 'udev' 'colord')
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+groups=('gnome')
+replaces=(gnome-settings-daemon-pulse)
+conflicts=(gnome-settings-daemon-pulse)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        systemd-fallback.patch)
+sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
+
+build() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../systemd-fallback.patch
+  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
+      --enable-systemd
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: gnome-unstable-i686/gnome-settings-daemon.install
===================================================================
--- gnome-unstable-i686/gnome-settings-daemon.install	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-i686/gnome-settings-daemon.install	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnome-settings-daemon/repos/gnome-unstable-i686/gnome-settings-daemon.install (from rev 153048, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===================================================================
--- gnome-unstable-i686/gnome-settings-daemon.install	                        (rev 0)
+++ gnome-unstable-i686/gnome-settings-daemon.install	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: gnome-unstable-i686/systemd-fallback.patch
===================================================================
--- gnome-unstable-i686/systemd-fallback.patch	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-i686/systemd-fallback.patch	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,160 +0,0 @@
-diff -u -Nr gnome-settings-daemon-3.3.91/configure.ac gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac
---- gnome-settings-daemon-3.3.91/configure.ac	2012-03-05 19:13:16.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac	2012-03-10 16:20:31.417634553 +0100
-@@ -298,7 +298,7 @@
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c
---- gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c	2012-02-01 20:33:14.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c	2012-03-10 16:21:35.930442794 +0100
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
- 
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
- 
- typedef struct
-@@ -130,10 +131,9 @@
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
- 	GDBusProxy		*proxy_session;
- 	GCancellable		*cancellable;
--#endif
- 	gchar			*session_id;
- 	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@
-         return TRUE;
- }
- 
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
- 
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,35 +371,38 @@
- 	g_object_unref (proxy_manager);
- }
- 
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
- 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
- 
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
- 
--        sessions_changed (session);
--#else
--	session->priv->cancellable = g_cancellable_new ();
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
- 
--	/* connect to ConsoleKit */
--	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--				  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--				  NULL,
--				  CONSOLEKIT_NAME,
--				  CONSOLEKIT_MANAGER_PATH,
--				  CONSOLEKIT_MANAGER_INTERFACE,
--				  session->priv->cancellable,
--				  got_manager_proxy_cb,
--				  session);
-+                sessions_changed (session);
-+        } else
- #endif
-+        {
-+                session->priv->cancellable = g_cancellable_new ();
-+
-+                /* connect to ConsoleKit */
-+                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+                                          NULL,
-+                                          CONSOLEKIT_NAME,
-+                                          CONSOLEKIT_MANAGER_PATH,
-+                                          CONSOLEKIT_MANAGER_INTERFACE,
-+                                          session->priv->cancellable,
-+                                          got_manager_proxy_cb,
-+                                          session);
-+        }
- }
- 
- static void
-@@ -415,14 +418,15 @@
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
--        }
--#else
--	g_cancellable_cancel (session->priv->cancellable);
--
--	if (session->priv->proxy_session != NULL)
--		g_object_unref (session->priv->proxy_session);
--	g_object_unref (session->priv->cancellable);
-+        } else
- #endif
-+        {
-+                g_cancellable_cancel (session->priv->cancellable);
-+
-+                if (session->priv->proxy_session != NULL)
-+                        g_object_unref (session->priv->proxy_session);
-+                g_object_unref (session->priv->cancellable);
-+        }
- 
- 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
-diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c
---- gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c	2012-03-05 18:27:43.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c	2012-03-10 16:20:31.417634553 +0100
-@@ -2031,7 +2031,7 @@
-         g_object_unref (bus);
- }
- 
--#else
-+#endif
- 
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
- 
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,

Copied: gnome-settings-daemon/repos/gnome-unstable-i686/systemd-fallback.patch (from rev 153048, gnome-settings-daemon/trunk/systemd-fallback.patch)
===================================================================
--- gnome-unstable-i686/systemd-fallback.patch	                        (rev 0)
+++ gnome-unstable-i686/systemd-fallback.patch	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,154 @@
+commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
+Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+Date:   Mon Mar 12 01:52:54 2012 +0100
+
+    Fallback to CK if systemd is not available
+    
+    Be nice to distributions where systemd is optional. This will select
+    the code path at runtime depending on whether the system was booted
+    using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index 3b4789f..d522852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
+               [with_systemd=$enableval],
+               [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+-  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
++  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
+   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
+   SESSION_TRACKING=systemd
+ else
+diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
+index 5786300..83fe21e 100644
+--- a/gnome-settings-daemon/gnome-settings-session.c
++++ b/gnome-settings-daemon/gnome-settings-session.c
+@@ -30,6 +30,7 @@
+ #include "gnome-settings-session.h"
+ 
+ #ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
+ #include <systemd/sd-login.h>
+ 
+ typedef struct
+@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
+ {
+ #ifdef HAVE_SYSTEMD
+         GSource                   *sd_source;
+-#else
++#endif
+ 	GDBusProxy		*proxy_session;
+ 	GCancellable		*cancellable;
+-#endif
+ 	gchar			*session_id;
+ 	GnomeSettingsSessionState state;
+ };
+@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
+         return TRUE;
+ }
+ 
+-#else /* HAVE_SYSTEMD */
++#endif /* HAVE_SYSTEMD */
+ 
+ static void
+ gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
+@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
+ 	g_object_unref (proxy_manager);
+ }
+ 
+-#endif /* HAVE_SYSTEMD */
+-
+ static void
+ gnome_settings_session_init (GnomeSettingsSession *session)
+ {
+ 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
+ 
+ #ifdef HAVE_SYSTEMD
+-        sd_pid_get_session (getpid(), &session->priv->session_id);
++        session->priv->sd_source = NULL;
++
++        if (sd_booted () > 0) {
++                sd_pid_get_session (getpid(), &session->priv->session_id);
+ 
+-        session->priv->sd_source = sd_source_new ();
+-        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+-        g_source_attach (session->priv->sd_source, NULL);
++                session->priv->sd_source = sd_source_new ();
++                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
++                g_source_attach (session->priv->sd_source, NULL);
+ 
+-        sessions_changed (session);
+-#else
++                sessions_changed (session);
++                return;
++        }
++#endif
+ 	session->priv->cancellable = g_cancellable_new ();
+ 
+ 	/* connect to ConsoleKit */
+@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
+ 				  session->priv->cancellable,
+ 				  got_manager_proxy_cb,
+ 				  session);
+-#endif
+ }
+ 
+ static void
+@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
+         if (session->priv->sd_source != NULL) {
+                 g_source_destroy (session->priv->sd_source);
+                 g_source_unref (session->priv->sd_source);
++                goto out;
+         }
+-#else
++#endif
++
+ 	g_cancellable_cancel (session->priv->cancellable);
+ 
+ 	if (session->priv->proxy_session != NULL)
+ 		g_object_unref (session->priv->proxy_session);
+ 	g_object_unref (session->priv->cancellable);
+-#endif
+ 
++out:
+ 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
+ }
+ 
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 8db04e5..9883d76 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2031,7 +2031,7 @@ systemd_stop (void)
+         g_object_unref (bus);
+ }
+ 
+-#else
++#endif
+ 
+ static void
+ consolekit_stop_cb (GObject *source_object,
+@@ -2081,7 +2081,6 @@ consolekit_stop (void)
+                            consolekit_stop_cb, NULL);
+         g_object_unref (proxy);
+ }
+-#endif
+ 
+ static void
+ upower_sleep_cb (GObject *source_object,
+@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
+                  * hibernate is not available and is marginally better
+                  * than just powering down the computer mid-write */
+ #ifdef HAVE_SYSTEMD
+-                systemd_stop ();
+-#else
+-                consolekit_stop ();
++                if (sd_booted () > 0)
++                        systemd_stop ();
++                else
+ #endif
++                        consolekit_stop ();
+                 break;
+         case GSD_POWER_ACTION_BLANK:
+                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-x86_64/PKGBUILD	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.3.92
-pkgrel=0
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse'
-         'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa'
-         'upower' 'libsystemd' 'libwacom' 'udev' 'colord')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        systemd-fallback.patch)
-sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
-            '29387c8176ec2f8c56060ea08865201ca9c7a27cb8ae5d93bdc4c3afe8e5516b')
-
-build() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../systemd-fallback.patch
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-settings-daemon/repos/gnome-unstable-x86_64/PKGBUILD (from rev 153048, gnome-settings-daemon/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-settings-daemon
+pkgver=3.3.92
+pkgrel=0.1
+pkgdesc="The GNOME Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse'
+         'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa'
+         'upower' 'libsystemd' 'libwacom' 'udev' 'colord')
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+groups=('gnome')
+replaces=(gnome-settings-daemon-pulse)
+conflicts=(gnome-settings-daemon-pulse)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        systemd-fallback.patch)
+sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
+
+build() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../systemd-fallback.patch
+  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
+      --enable-systemd
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: gnome-unstable-x86_64/gnome-settings-daemon.install
===================================================================
--- gnome-unstable-x86_64/gnome-settings-daemon.install	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-x86_64/gnome-settings-daemon.install	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: gnome-settings-daemon/repos/gnome-unstable-x86_64/gnome-settings-daemon.install (from rev 153048, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===================================================================
--- gnome-unstable-x86_64/gnome-settings-daemon.install	                        (rev 0)
+++ gnome-unstable-x86_64/gnome-settings-daemon.install	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Deleted: gnome-unstable-x86_64/systemd-fallback.patch
===================================================================
--- gnome-unstable-x86_64/systemd-fallback.patch	2012-03-12 01:01:43 UTC (rev 153048)
+++ gnome-unstable-x86_64/systemd-fallback.patch	2012-03-12 01:03:57 UTC (rev 153049)
@@ -1,160 +0,0 @@
-diff -u -Nr gnome-settings-daemon-3.3.91/configure.ac gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac
---- gnome-settings-daemon-3.3.91/configure.ac	2012-03-05 19:13:16.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac	2012-03-10 16:20:31.417634553 +0100
-@@ -298,7 +298,7 @@
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c
---- gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c	2012-02-01 20:33:14.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c	2012-03-10 16:21:35.930442794 +0100
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
- 
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
- 
- typedef struct
-@@ -130,10 +131,9 @@
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
- 	GDBusProxy		*proxy_session;
- 	GCancellable		*cancellable;
--#endif
- 	gchar			*session_id;
- 	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@
-         return TRUE;
- }
- 
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
- 
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,35 +371,38 @@
- 	g_object_unref (proxy_manager);
- }
- 
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
- 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
- 
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
- 
--        sessions_changed (session);
--#else
--	session->priv->cancellable = g_cancellable_new ();
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
- 
--	/* connect to ConsoleKit */
--	g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--				  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--				  NULL,
--				  CONSOLEKIT_NAME,
--				  CONSOLEKIT_MANAGER_PATH,
--				  CONSOLEKIT_MANAGER_INTERFACE,
--				  session->priv->cancellable,
--				  got_manager_proxy_cb,
--				  session);
-+                sessions_changed (session);
-+        } else
- #endif
-+        {
-+                session->priv->cancellable = g_cancellable_new ();
-+
-+                /* connect to ConsoleKit */
-+                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+                                          NULL,
-+                                          CONSOLEKIT_NAME,
-+                                          CONSOLEKIT_MANAGER_PATH,
-+                                          CONSOLEKIT_MANAGER_INTERFACE,
-+                                          session->priv->cancellable,
-+                                          got_manager_proxy_cb,
-+                                          session);
-+        }
- }
- 
- static void
-@@ -415,14 +418,15 @@
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
--        }
--#else
--	g_cancellable_cancel (session->priv->cancellable);
--
--	if (session->priv->proxy_session != NULL)
--		g_object_unref (session->priv->proxy_session);
--	g_object_unref (session->priv->cancellable);
-+        } else
- #endif
-+        {
-+                g_cancellable_cancel (session->priv->cancellable);
-+
-+                if (session->priv->proxy_session != NULL)
-+                        g_object_unref (session->priv->proxy_session);
-+                g_object_unref (session->priv->cancellable);
-+        }
- 
- 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
-diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c
---- gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c	2012-03-05 18:27:43.000000000 +0100
-+++ gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c	2012-03-10 16:20:31.417634553 +0100
-@@ -2031,7 +2031,7 @@
-         g_object_unref (bus);
- }
- 
--#else
-+#endif
- 
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
- 
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,

Copied: gnome-settings-daemon/repos/gnome-unstable-x86_64/systemd-fallback.patch (from rev 153048, gnome-settings-daemon/trunk/systemd-fallback.patch)
===================================================================
--- gnome-unstable-x86_64/systemd-fallback.patch	                        (rev 0)
+++ gnome-unstable-x86_64/systemd-fallback.patch	2012-03-12 01:03:57 UTC (rev 153049)
@@ -0,0 +1,154 @@
+commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
+Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+Date:   Mon Mar 12 01:52:54 2012 +0100
+
+    Fallback to CK if systemd is not available
+    
+    Be nice to distributions where systemd is optional. This will select
+    the code path at runtime depending on whether the system was booted
+    using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index 3b4789f..d522852 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
+               [with_systemd=$enableval],
+               [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+-  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
++  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
+   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
+   SESSION_TRACKING=systemd
+ else
+diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
+index 5786300..83fe21e 100644
+--- a/gnome-settings-daemon/gnome-settings-session.c
++++ b/gnome-settings-daemon/gnome-settings-session.c
+@@ -30,6 +30,7 @@
+ #include "gnome-settings-session.h"
+ 
+ #ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
+ #include <systemd/sd-login.h>
+ 
+ typedef struct
+@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
+ {
+ #ifdef HAVE_SYSTEMD
+         GSource                   *sd_source;
+-#else
++#endif
+ 	GDBusProxy		*proxy_session;
+ 	GCancellable		*cancellable;
+-#endif
+ 	gchar			*session_id;
+ 	GnomeSettingsSessionState state;
+ };
+@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
+         return TRUE;
+ }
+ 
+-#else /* HAVE_SYSTEMD */
++#endif /* HAVE_SYSTEMD */
+ 
+ static void
+ gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
+@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
+ 	g_object_unref (proxy_manager);
+ }
+ 
+-#endif /* HAVE_SYSTEMD */
+-
+ static void
+ gnome_settings_session_init (GnomeSettingsSession *session)
+ {
+ 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
+ 
+ #ifdef HAVE_SYSTEMD
+-        sd_pid_get_session (getpid(), &session->priv->session_id);
++        session->priv->sd_source = NULL;
++
++        if (sd_booted () > 0) {
++                sd_pid_get_session (getpid(), &session->priv->session_id);
+ 
+-        session->priv->sd_source = sd_source_new ();
+-        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+-        g_source_attach (session->priv->sd_source, NULL);
++                session->priv->sd_source = sd_source_new ();
++                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
++                g_source_attach (session->priv->sd_source, NULL);
+ 
+-        sessions_changed (session);
+-#else
++                sessions_changed (session);
++                return;
++        }
++#endif
+ 	session->priv->cancellable = g_cancellable_new ();
+ 
+ 	/* connect to ConsoleKit */
+@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
+ 				  session->priv->cancellable,
+ 				  got_manager_proxy_cb,
+ 				  session);
+-#endif
+ }
+ 
+ static void
+@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
+         if (session->priv->sd_source != NULL) {
+                 g_source_destroy (session->priv->sd_source);
+                 g_source_unref (session->priv->sd_source);
++                goto out;
+         }
+-#else
++#endif
++
+ 	g_cancellable_cancel (session->priv->cancellable);
+ 
+ 	if (session->priv->proxy_session != NULL)
+ 		g_object_unref (session->priv->proxy_session);
+ 	g_object_unref (session->priv->cancellable);
+-#endif
+ 
++out:
+ 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
+ }
+ 
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 8db04e5..9883d76 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2031,7 +2031,7 @@ systemd_stop (void)
+         g_object_unref (bus);
+ }
+ 
+-#else
++#endif
+ 
+ static void
+ consolekit_stop_cb (GObject *source_object,
+@@ -2081,7 +2081,6 @@ consolekit_stop (void)
+                            consolekit_stop_cb, NULL);
+         g_object_unref (proxy);
+ }
+-#endif
+ 
+ static void
+ upower_sleep_cb (GObject *source_object,
+@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
+                  * hibernate is not available and is marginally better
+                  * than just powering down the computer mid-write */
+ #ifdef HAVE_SYSTEMD
+-                systemd_stop ();
+-#else
+-                consolekit_stop ();
++                if (sd_booted () > 0)
++                        systemd_stop ();
++                else
+ #endif
++                        consolekit_stop ();
+                 break;
+         case GSD_POWER_ACTION_BLANK:
+                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,



More information about the arch-commits mailing list