diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-04-03 14:54:55 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-04-03 14:54:55 +0000 |
commit | b618c3d0693aec564c6746238fd05d94e31d3b76 (patch) | |
tree | 4a4834f3097bba25dba1adeba4324080c1b4bf7b /gnome-unstable/gnome-control-center | |
parent | 8cb5196780766f47b595410eed8ddbee2e8add08 (diff) |
Tue Apr 3 14:54:45 UTC 2012
Diffstat (limited to 'gnome-unstable/gnome-control-center')
3 files changed, 0 insertions, 138 deletions
diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD deleted file mode 100644 index c4a5437d5..000000000 --- a/gnome-unstable/gnome-control-center/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 154951 2012-03-31 20:30:25Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@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 -} diff --git a/gnome-unstable/gnome-control-center/gnome-control-center.install b/gnome-unstable/gnome-control-center/gnome-control-center.install deleted file mode 100644 index 079e0fa34..000000000 --- a/gnome-unstable/gnome-control-center/gnome-control-center.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch deleted file mode 100644 index 709e54019..000000000 --- a/gnome-unstable/gnome-control-center/systemd-fallback.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 9873a7536844f5c38c2a123be58175c2774e5dcc -Author: Jan Alexander Steffens (heftig) <jan.steffens@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) |