From 98bf2ac3fdd6f7bcb6ce45c932fc13c07fecc03f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Apr 2012 00:01:35 +0000 Subject: Wed Apr 25 00:01:35 UTC 2012 --- extra/gnome-control-center/PKGBUILD | 34 +++++---- .../gnome-control-center.install | 10 +-- extra/gnome-control-center/systemd-fallback.patch | 81 ++++++++++++++++++++++ 3 files changed, 103 insertions(+), 22 deletions(-) create mode 100644 extra/gnome-control-center/systemd-fallback.patch (limited to 'extra/gnome-control-center') diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index df8b95706..b9f00fba0 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 142419 2011-11-09 07:46:48Z ibiru $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 156808 2012-04-23 09:06:19Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot pkgname=gnome-control-center -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') +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') +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}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1' + '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb + --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 @@ -31,8 +40,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } - diff --git a/extra/gnome-control-center/gnome-control-center.install b/extra/gnome-control-center/gnome-control-center.install index eb703319f..079e0fa34 100644 --- a/extra/gnome-control-center/gnome-control-center.install +++ b/extra/gnome-control-center/gnome-control-center.install @@ -1,13 +1,5 @@ -pkgname=gnome-control-center - post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/extra/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) +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 + ++#ifdef HAVE_SYSTEMD ++# include ++# include ++#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 +- + 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) -- cgit v1.2.3-54-g00ecf