[arch-commits] Commit in gnome-control-center/repos (5 files)
Jan Steffens
heftig at archlinux.org
Sun Apr 1 11:32:56 UTC 2012
Date: Sunday, April 1, 2012 @ 07:32:56
Author: heftig
Revision: 155104
db-move: moved gnome-control-center from [gnome-unstable] to [testing] (x86_64)
Added:
gnome-control-center/repos/testing-x86_64/
gnome-control-center/repos/testing-x86_64/PKGBUILD
(from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD)
gnome-control-center/repos/testing-x86_64/gnome-control-center.install
(from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install)
gnome-control-center/repos/testing-x86_64/systemd-fallback.patch
(from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/systemd-fallback.patch)
Deleted:
gnome-control-center/repos/gnome-unstable-x86_64/
------------------------------+
PKGBUILD | 46 +++++++++++++++++++++++
gnome-control-center.install | 11 +++++
systemd-fallback.patch | 81 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 138 insertions(+)
Copied: gnome-control-center/repos/testing-x86_64/PKGBUILD (from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-04-01 11:32:56 UTC (rev 155104)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.4.0
+pkgrel=2
+pkgdesc="The Control Center for GNOME"
+arch=('i686' 'x86_64')
+depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
+ 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
+ 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
+ 'libsystemd' 'cheese')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'apg: adds password generation for user accounts'
+ 'gnome-color-manager: for color management tasks')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ systemd-fallback.patch)
+sha256sums=('09dafad9afbb6e01bd29dd9186e990545ad58ede3873ba7eff7009c6ffddb254'
+ '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
+
+build() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../systemd-fallback.patch
+ gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd --with-libsocialweb \
+ --disable-update-mimedb
+
+ #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
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Copied: gnome-control-center/repos/testing-x86_64/gnome-control-center.install (from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install)
===================================================================
--- testing-x86_64/gnome-control-center.install (rev 0)
+++ testing-x86_64/gnome-control-center.install 2012-04-01 11:32:56 UTC (rev 155104)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: gnome-control-center/repos/testing-x86_64/systemd-fallback.patch (from rev 155005, gnome-control-center/repos/gnome-unstable-x86_64/systemd-fallback.patch)
===================================================================
--- testing-x86_64/systemd-fallback.patch (rev 0)
+++ testing-x86_64/systemd-fallback.patch 2012-04-01 11:32:56 UTC (rev 155104)
@@ -0,0 +1,81 @@
+commit 9873a7536844f5c38c2a123be58175c2774e5dcc
+Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+Date: Mon Mar 12 01:12:11 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 aee97ac..867f061 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
+ [with_systemd=$enableval],
+ [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+- SYSTEMD=libsystemd-login
++ SYSTEMD="libsystemd-login libsystemd-daemon"
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
+ else
+ SYSTEMD=
+diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
+index f027754..5ebbe29 100644
+--- a/panels/user-accounts/um-user.c
++++ b/panels/user-accounts/um-user.c
+@@ -37,6 +37,11 @@
+
+ #include <gio/gunixoutputstream.h>
+
++#ifdef HAVE_SYSTEMD
++# include <systemd/sd-login.h>
++# include <systemd/sd-daemon.h>
++#endif
++
+ #include "um-user.h"
+ #include "um-account-type.h"
+ #include "um-utils.h"
+@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user,
+ }
+ }
+
+-#ifdef HAVE_SYSTEMD
+-
+-#include <systemd/sd-login.h>
+-
+ gboolean
+ um_user_is_logged_in (UmUser *user)
+ {
+- int n_sessions;
+-
+- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
+-
+- return n_sessions > 0;
+-}
++#ifdef HAVE_SYSTEMD
++ if (sd_booted () > 0) {
++ int n_sessions;
+
+-#else
++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
+
+-gboolean
+-um_user_is_logged_in (UmUser *user)
+-{
++ return n_sessions > 0;
++ }
++#endif
+ GVariant *result;
+ GVariantIter *iter;
+ gint n_sessions;
+@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
+ return n_sessions > 0;
+ }
+
+-#endif
+-
+ void
+ um_user_set_automatic_login (UmUser *user,
+ gboolean enabled)
More information about the arch-commits
mailing list