[arch-commits] Commit in gnome-control-center/repos (12 files)
Jan Steffens
heftig at archlinux.org
Tue Oct 30 22:33:49 UTC 2012
Date: Tuesday, October 30, 2012 @ 18:33:48
Author: heftig
Revision: 169892
db-move: moved gnome-control-center from [testing] to [extra] (i686, x86_64)
Added:
gnome-control-center/repos/extra-i686/PKGBUILD
(from rev 169886, gnome-control-center/repos/testing-i686/PKGBUILD)
gnome-control-center/repos/extra-i686/gnome-control-center.install
(from rev 169886, gnome-control-center/repos/testing-i686/gnome-control-center.install)
gnome-control-center/repos/extra-x86_64/PKGBUILD
(from rev 169886, gnome-control-center/repos/testing-x86_64/PKGBUILD)
gnome-control-center/repos/extra-x86_64/gnome-control-center.install
(from rev 169886, gnome-control-center/repos/testing-x86_64/gnome-control-center.install)
Deleted:
gnome-control-center/repos/extra-i686/PKGBUILD
gnome-control-center/repos/extra-i686/gnome-control-center.install
gnome-control-center/repos/extra-i686/systemd-fallback.patch
gnome-control-center/repos/extra-x86_64/PKGBUILD
gnome-control-center/repos/extra-x86_64/gnome-control-center.install
gnome-control-center/repos/extra-x86_64/systemd-fallback.patch
gnome-control-center/repos/testing-i686/
gnome-control-center/repos/testing-x86_64/
-------------------------------------------+
extra-i686/PKGBUILD | 89 +++++++++++++---------------
extra-i686/gnome-control-center.install | 22 +++---
extra-i686/systemd-fallback.patch | 81 -------------------------
extra-x86_64/PKGBUILD | 89 +++++++++++++---------------
extra-x86_64/gnome-control-center.install | 22 +++---
extra-x86_64/systemd-fallback.patch | 81 -------------------------
6 files changed, 106 insertions(+), 278 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-i686/PKGBUILD 2012-10-30 22:33:48 UTC (rev 169892)
@@ -1,47 +0,0 @@
-# $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.2
-pkgrel=1
-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')
-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=('efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a'
- '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 \
- --without-cheese
-
- #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/extra-i686/PKGBUILD (from rev 169886, gnome-control-center/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-30 22:33:48 UTC (rev 169892)
@@ -0,0 +1,42 @@
+# $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.6.2
+pkgrel=1
+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' 'libpwquality' 'libsystemd')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'gnome-color-manager: for color management tasks')
+makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+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)
+sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd --with-libsocialweb \
+ --disable-update-mimedb \
+ --without-cheese
+
+ #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
+}
Deleted: extra-i686/gnome-control-center.install
===================================================================
--- extra-i686/gnome-control-center.install 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-i686/gnome-control-center.install 2012-10-30 22:33:48 UTC (rev 169892)
@@ -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
-}
Copied: gnome-control-center/repos/extra-i686/gnome-control-center.install (from rev 169886, gnome-control-center/repos/testing-i686/gnome-control-center.install)
===================================================================
--- extra-i686/gnome-control-center.install (rev 0)
+++ extra-i686/gnome-control-center.install 2012-10-30 22:33:48 UTC (rev 169892)
@@ -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
+}
Deleted: extra-i686/systemd-fallback.patch
===================================================================
--- extra-i686/systemd-fallback.patch 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-i686/systemd-fallback.patch 2012-10-30 22:33:48 UTC (rev 169892)
@@ -1,81 +0,0 @@
-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)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-x86_64/PKGBUILD 2012-10-30 22:33:48 UTC (rev 169892)
@@ -1,47 +0,0 @@
-# $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.2
-pkgrel=1
-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')
-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=('efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a'
- '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 \
- --without-cheese
-
- #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/extra-x86_64/PKGBUILD (from rev 169886, gnome-control-center/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-30 22:33:48 UTC (rev 169892)
@@ -0,0 +1,42 @@
+# $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.6.2
+pkgrel=1
+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' 'libpwquality' 'libsystemd')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'gnome-color-manager: for color management tasks')
+makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+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)
+sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd --with-libsocialweb \
+ --disable-update-mimedb \
+ --without-cheese
+
+ #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
+}
Deleted: extra-x86_64/gnome-control-center.install
===================================================================
--- extra-x86_64/gnome-control-center.install 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-x86_64/gnome-control-center.install 2012-10-30 22:33:48 UTC (rev 169892)
@@ -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
-}
Copied: gnome-control-center/repos/extra-x86_64/gnome-control-center.install (from rev 169886, gnome-control-center/repos/testing-x86_64/gnome-control-center.install)
===================================================================
--- extra-x86_64/gnome-control-center.install (rev 0)
+++ extra-x86_64/gnome-control-center.install 2012-10-30 22:33:48 UTC (rev 169892)
@@ -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
+}
Deleted: extra-x86_64/systemd-fallback.patch
===================================================================
--- extra-x86_64/systemd-fallback.patch 2012-10-30 22:33:46 UTC (rev 169891)
+++ extra-x86_64/systemd-fallback.patch 2012-10-30 22:33:48 UTC (rev 169892)
@@ -1,81 +0,0 @@
-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