[arch-commits] Commit in gnome-control-center/trunk (2 files)

2016-07-28 Thread Jan Steffens 
Date: Thursday, July 28, 2016 @ 10:31:22
  Author: heftig
Revision: 272556

3.20.1-2

Modified:
  gnome-control-center/trunk/PKGBUILD
Deleted:
  gnome-control-center/trunk/gnome-control-center.install

--+
 PKGBUILD |9 -
 gnome-control-center.install |   11 ---
 2 files changed, 4 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-28 10:30:41 UTC (rev 272555)
+++ PKGBUILD2016-07-28 10:31:22 UTC (rev 272556)
@@ -4,9 +4,10 @@
 
 pkgname=gnome-control-center
 pkgver=3.20.1
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
+pkgrel=2
+pkgdesc="GNOME's main interface to configure various aspects of the desktop"
+url="https://git.gnome.org/browse/gnome-control-center;
+license=(GPL2)
 arch=(i686 x86_64)
 depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
  gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas 
gtk3
@@ -20,8 +21,6 @@
 'vino: screen sharing'
 'openssh: remote login')
 groups=(gnome)
-url="http://www.gnome.org;
-install=gnome-control-center.install
 options=('!emptydirs')
 
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed')

Deleted: gnome-control-center.install
===
--- gnome-control-center.install2016-07-28 10:30:41 UTC (rev 272555)
+++ gnome-control-center.install2016-07-28 10:31:22 UTC (rev 272556)
@@ -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
-}

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2015-10-28 Thread Jan Steffens 
Date: Wednesday, October 28, 2015 @ 23:45:23
  Author: heftig
Revision: 249844

Fix polkit dir and add user services

Added:
  gnome-control-center/trunk/0001-Add-systemd-user-services.patch
Modified:
  gnome-control-center/trunk/PKGBUILD

--+
 0001-Add-systemd-user-services.patch |  144 +
 PKGBUILD |   15 +--
 2 files changed, 152 insertions(+), 7 deletions(-)

Added: 0001-Add-systemd-user-services.patch
===
--- 0001-Add-systemd-user-services.patch(rev 0)
+++ 0001-Add-systemd-user-services.patch2015-10-28 22:45:23 UTC (rev 
249844)
@@ -0,0 +1,144 @@
+From 2f8c902f4b9f86c8e3a6be758d78908e8cb50d0d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Wed, 28 Oct 2015 23:27:19 +0100
+Subject: [PATCH] Add systemd user services
+
+Follows the code in GVFS.
+---
+ search-provider/Makefile.am| 16 ++-
+ ...gnome-control-center-search-provider.service.in |  7 +++
+ ...g.gnome.ControlCenter.SearchProvider.service.in |  3 ++-
+ shell/Makefile.am  | 24 ++
+ shell/gnome-control-center.service.in  |  7 +++
+ shell/org.gnome.ControlCenter.service.in   |  1 +
+ 6 files changed, 44 insertions(+), 14 deletions(-)
+ create mode 100644 
search-provider/gnome-control-center-search-provider.service.in
+ create mode 100644 shell/gnome-control-center.service.in
+
+diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am
+index 2314d66..864d895 100644
+--- a/search-provider/Makefile.am
 b/search-provider/Makefile.am
+@@ -38,17 +38,23 @@ gnome_control_center_search_provider_LDADD =   \
+   $(top_builddir)/shell/libshell.la   \
+   $(SHELL_LIBS)
+ 
+-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
++CLEANFILES = $(BUILT_SOURCES) $(service_DATA) $(systemd_user_DATA)
+ 
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = $(service_in_files:.service.in=.service)
+-service_in_files =\
+-  org.gnome.ControlCenter.SearchProvider.service.in
++service_in_files = org.gnome.ControlCenter.SearchProvider.service.in
+ 
+-org.gnome.ControlCenter.SearchProvider.service: 
org.gnome.ControlCenter.SearchProvider.service.in Makefile
++systemd_userdir = ${prefix}/lib/systemd/user
++systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
++systemd_user_in_files = gnome-control-center-search-provider.service.in
++
++$(service_DATA): $(service_in_files) Makefile
+   $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ 
+-EXTRA_DIST = $(service_in_files) org.gnome.ShellSearchProvider2.xml
++$(systemd_user_DATA): $(systemd_user_in_files) Makefile
++  $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
++EXTRA_DIST = $(service_in_files) $(systemd_user_in_files) 
org.gnome.ShellSearchProvider2.xml
+ 
+ searchproviderdir = $(datadir)/gnome-shell/search-providers
+ dist_searchprovider_DATA = gnome-control-center-search-provider.ini
+diff --git a/search-provider/gnome-control-center-search-provider.service.in 
b/search-provider/gnome-control-center-search-provider.service.in
+new file mode 100644
+index 000..4e56af1
+--- /dev/null
 b/search-provider/gnome-control-center-search-provider.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME Control Center Search Provider
++
++[Service]
++Type=dbus
++BusName=org.gnome.ControlCenter.SearchProvider
++ExecStart=@libexecdir@/gnome-control-center-search-provider
+diff --git a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in 
b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+index 81dd0c8..79b54a2 100644
+--- a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
 b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.ControlCenter.SearchProvider
+-Exec=@libexecdir@/gnome-control-center-search-provider
+\ No newline at end of file
++Exec=@libexecdir@/gnome-control-center-search-provider
++SystemdService=gnome-control-center-search-provider.service
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index f72ebe9..bf78fd3 100644
+--- a/shell/Makefile.am
 b/shell/Makefile.am
+@@ -91,12 +91,19 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+ 
+-# Dbus service file
+-servicefiledir = $(datadir)/dbus-1/services
+-servicefile_in_files = org.gnome.ControlCenter.service.in
+-servicefile_DATA = $(servicefile_in_files:.service.in=.service)
+-$(servicefile_DATA): $(servicefile_in_files) Makefile
+-  $(AM_V_GEN) sed -e 's|[@]bindir[@]|$(bindir)|' $< > $@
++servicedir = $(datadir)/dbus-1/services
++service_DATA = $(service_in_files:.service.in=.service)

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2015-07-21 Thread Jan Steffens 
Date: Wednesday, July 22, 2015 @ 06:26:39
  Author: heftig
Revision: 242418

3.16.3

Modified:
  gnome-control-center/trunk/PKGBUILD
Deleted:
  gnome-control-center/trunk/network-Also-work-with-NM-10.patch

+
 PKGBUILD   |6 +--
 network-Also-work-with-NM-10.patch |   63 ---
 2 files changed, 3 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-22 04:11:16 UTC (rev 242417)
+++ PKGBUILD2015-07-22 04:26:39 UTC (rev 242418)
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-control-center
-pkgver=3.16.2
-pkgrel=2
+pkgver=3.16.3
+pkgrel=1
 pkgdesc=The Control Center for GNOME
 license=(GPL)
 arch=(i686 x86_64)
@@ -24,7 +24,7 @@
 install=gnome-control-center.install
 options=('!emptydirs')
 
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d')
+sha256sums=('ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5')
 
 build() {
   cd $pkgname-$pkgver

Deleted: network-Also-work-with-NM-10.patch
===
--- network-Also-work-with-NM-10.patch  2015-07-22 04:11:16 UTC (rev 242417)
+++ network-Also-work-with-NM-10.patch  2015-07-22 04:26:39 UTC (rev 242418)
@@ -1,63 +0,0 @@
-From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera had...@hadess.net
-Date: Thu, 18 Dec 2014 08:04:00 +0100
-Subject: [PATCH] network: Also work with NM 1.0
-
-Remove the NetworkManager version checking altogether. The code was made
-to check for now very old versions of NetworkManager, and anything newer
-than ancient should degrade gracefully if we support newer features.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741661

- panels/network/cc-network-panel.c | 19 +++
- 1 file changed, 3 insertions(+), 16 deletions(-)
-
-diff --git a/panels/network/cc-network-panel.c 
b/panels/network/cc-network-panel.c
-index 90b265e..28f6158 100644
 a/panels/network/cc-network-panel.c
-+++ b/panels/network/cc-network-panel.c
-@@ -1321,30 +1321,17 @@ static gboolean
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
- const gchar *version;
--gchar **split = NULL;
--guint major = 0;
--guint micro = 0;
--guint minor = 0;
- gboolean ret = TRUE;
- 
- /* parse running version */
- version = nm_client_get_version (panel-priv-client);
--if (version != NULL) {
--split = g_strsplit (version, ., -1);
--major = atoi (split[0]);
--minor = atoi (split[1]);
--micro = atoi (split[2]);
--}
--
--/* is it too new or old */
--if (major  0 || minor  9 || (minor = 8  micro  992)) {
-+if (version == NULL) {
- ret = FALSE;
- 
- /* do modal dialog in idle so we don't block startup */
- panel-priv-nm_warning_idle = g_idle_add 
((GSourceFunc)display_version_warning_idle, panel);
- }
- 
--g_strfreev (split);
- return ret;
- }
- 
-@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget  *widget,
- {
- gboolean ret;
- 
--/* is the user compiling against a new version, but running an
-- * old daemon version? */
-+/* is the user compiling against a new version, but not running
-+ * the daemon? */
- ret = panel_check_network_manager_version (panel);
- if (ret) {
- manager_running (panel-priv-client, NULL, panel);

-2.1.0

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2015-01-10 Thread Jan Steffens 
Date: Saturday, January 10, 2015 @ 22:48:44
  Author: heftig
Revision: 228908

Fix compat with NM 1.0

Added:
  gnome-control-center/trunk/network-Also-work-with-NM-10.patch
Modified:
  gnome-control-center/trunk/PKGBUILD

+
 PKGBUILD   |   13 +--
 network-Also-work-with-NM-10.patch |   63 +++
 2 files changed, 73 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-10 21:19:02 UTC (rev 228907)
+++ PKGBUILD2015-01-10 21:48:44 UTC (rev 228908)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-control-center
 pkgver=3.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc=The Control Center for GNOME
 license=(GPL)
 arch=(i686 x86_64)
@@ -22,9 +22,16 @@
 url=http://www.gnome.org;
 install=gnome-control-center.install
 options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+network-Also-work-with-NM-10.patch)
+sha256sums=('b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a'
+'5a09f20f2defd097050498791194d0937bec2edfec0edbd903cea71a1ab0af78')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../network-Also-work-with-NM-10.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: network-Also-work-with-NM-10.patch
===
--- network-Also-work-with-NM-10.patch  (rev 0)
+++ network-Also-work-with-NM-10.patch  2015-01-10 21:48:44 UTC (rev 228908)
@@ -0,0 +1,63 @@
+From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera had...@hadess.net
+Date: Thu, 18 Dec 2014 08:04:00 +0100
+Subject: [PATCH] network: Also work with NM 1.0
+
+Remove the NetworkManager version checking altogether. The code was made
+to check for now very old versions of NetworkManager, and anything newer
+than ancient should degrade gracefully if we support newer features.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741661
+---
+ panels/network/cc-network-panel.c | 19 +++
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/panels/network/cc-network-panel.c 
b/panels/network/cc-network-panel.c
+index 90b265e..28f6158 100644
+--- a/panels/network/cc-network-panel.c
 b/panels/network/cc-network-panel.c
+@@ -1321,30 +1321,17 @@ static gboolean
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+ const gchar *version;
+-gchar **split = NULL;
+-guint major = 0;
+-guint micro = 0;
+-guint minor = 0;
+ gboolean ret = TRUE;
+ 
+ /* parse running version */
+ version = nm_client_get_version (panel-priv-client);
+-if (version != NULL) {
+-split = g_strsplit (version, ., -1);
+-major = atoi (split[0]);
+-minor = atoi (split[1]);
+-micro = atoi (split[2]);
+-}
+-
+-/* is it too new or old */
+-if (major  0 || minor  9 || (minor = 8  micro  992)) {
++if (version == NULL) {
+ ret = FALSE;
+ 
+ /* do modal dialog in idle so we don't block startup */
+ panel-priv-nm_warning_idle = g_idle_add 
((GSourceFunc)display_version_warning_idle, panel);
+ }
+ 
+-g_strfreev (split);
+ return ret;
+ }
+ 
+@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget  *widget,
+ {
+ gboolean ret;
+ 
+-/* is the user compiling against a new version, but running an
+- * old daemon version? */
++/* is the user compiling against a new version, but not running
++ * the daemon? */
+ ret = panel_check_network_manager_version (panel);
+ if (ret) {
+ manager_running (panel-priv-client, NULL, panel);
+---
+2.1.0

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2013-07-31 Thread Jan Steffens 
Date: Wednesday, July 31, 2013 @ 15:08:56
  Author: heftig
Revision: 191843

Remove dep on deprecated upower features

Added:
  gnome-control-center/trunk/no-deprecated-upower.diff
Modified:
  gnome-control-center/trunk/PKGBUILD

---+
 PKGBUILD  |   14 +++-
 no-deprecated-upower.diff |   69 
 2 files changed, 80 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-31 09:40:22 UTC (rev 191842)
+++ PKGBUILD2013-07-31 13:08:56 UTC (rev 191843)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-control-center
 pkgver=3.8.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The Control Center for GNOME
 license=(GPL)
 arch=(i686 x86_64)
@@ -22,9 +22,16 @@
 url=http://www.gnome.org;
 install=gnome-control-center.install
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+no-deprecated-upower.diff)
+sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55'
+'4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../no-deprecated-upower.diff
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -33,6 +40,7 @@
 
   #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
 }
 

Added: no-deprecated-upower.diff
===
--- no-deprecated-upower.diff   (rev 0)
+++ no-deprecated-upower.diff   2013-07-31 13:08:56 UTC (rev 191843)
@@ -0,0 +1,69 @@
+diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
+index d70496a..af71db9 100644
+--- c/panels/power/cc-power-panel.c
 i/panels/power/cc-power-panel.c
+@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
+   GCancellable  *cancellable;
+   GtkBuilder*builder;
+   UpClient  *up_client;
++  GDBusProxy*logind_proxy;
+   GDBusProxy*screen_proxy;
+   gboolean   has_batteries;
+ 
+@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
+ }
+   g_clear_object (priv-builder);
+   g_clear_object (priv-screen_proxy);
++  g_clear_object (priv-logind_proxy);
+   g_clear_object (priv-up_client);
+ #ifdef HAVE_BLUETOOTH
+   g_clear_object (priv-bt_client);
+@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   GtkWidget *dialog;
+   GtkWidget *combo;
+   GtkCellRenderer *cell;
++  GVariant *result;
+ 
+   /* The default values for these settings are unfortunate for us;
+* timeout == 0, action == suspend means 'do nothing' - just
+@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ 
+-  if (up_client_get_can_hibernate (self-priv-up_client))
++  value = 0;
++  result = g_dbus_proxy_call_sync (self-priv-logind_proxy,
++   CanHibernate,
++   NULL,
++   G_DBUS_CALL_FLAGS_NONE,
++   -1,
++   NULL,
++   NULL);
++  if (result)
++{
++  g_variant_get (result, (s), s);
++  if (g_strcmp0 (s, yes) == 0)
++value = 1;
++  g_variant_unref(result);
++}
++
++  if (value)
+ {
+   model = (GtkTreeModel*)gtk_builder_get_object (priv-builder, 
liststore_critical);
+   priv-critical_battery_combo = sw = gtk_combo_box_new_with_model 
(model);
+@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
+ got_screen_proxy_cb,
+ self);
+ 
++  priv-logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++  G_DBUS_PROXY_FLAGS_NONE,
++  NULL,
++  
org.freedesktop.login1,
++  
/org/freedesktop/login1,
++  
org.freedesktop.login1.Manager,
++  NULL,
++  error);
++
+   priv-up_client = up_client_new ();
+ 
+   priv-gsd_settings = g_settings_new 
(org.gnome.settings-daemon.plugins.power);

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2012-03-19 Thread Ionut Biru 
Date: Monday, March 19, 2012 @ 14:15:42
  Author: ibiru
Revision: 153793

update to 3.3.92

Modified:
  gnome-control-center/trunk/PKGBUILD
  gnome-control-center/trunk/gnome-control-center.install

--+
 PKGBUILD |   20 +---
 gnome-control-center.install |   10 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-19 18:12:16 UTC (rev 153792)
+++ PKGBUILD2012-03-19 18:15:42 UTC (rev 153793)
@@ -3,13 +3,12 @@
 # Contributor: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-control-center
-pkgver=3.3.91
-pkgrel=2
+pkgver=3.3.92
+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' 'gnome-bluetooth' 
'libsocialweb')
+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')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
 'apg: adds password generation for user accounts'
 'gnome-color-manager: for color management tasks'
@@ -20,13 +19,13 @@
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 systemd-fallback.patch)
-sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
+sha256sums=('fe5c9e4e065bc2988096a6eaba53f0d9bd760e198c05c71d5c9316f73d892cfb'
 '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   
   patch -Np1 -i ../systemd-fallback.patch
   gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
@@ -40,8 +39,7 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=$pkgdir install
 }
-

Modified: gnome-control-center.install
===
--- gnome-control-center.install2012-03-19 18:12:16 UTC (rev 153792)
+++ gnome-control-center.install2012-03-19 18:15:42 UTC (rev 153793)
@@ -1,15 +1,7 @@
-pkgname=gnome-control-center
-
 post_install() {
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+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
-}
-
 post_upgrade() {
 post_install $1
 }

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2011-04-27 Thread Ionut Biru 
Date: Wednesday, April 27, 2011 @ 04:37:19
  Author: ibiru
Revision: 120905

update to 3.0.1.1, drop gconf, add sound theme

Modified:
  gnome-control-center/trunk/PKGBUILD
  gnome-control-center/trunk/gnome-control-center.install

--+
 PKGBUILD |   12 
 gnome-control-center.install |   13 +++--
 2 files changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-27 08:07:11 UTC (rev 120904)
+++ PKGBUILD2011-04-27 08:37:19 UTC (rev 120905)
@@ -2,11 +2,11 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-control-center
-pkgver=3.0.1
+pkgver=3.0.1.1
 pkgrel=1
 pkgdesc=The Control Center for GNOME
 arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 
'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 
'accountsservice')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 
'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 
'sound-theme-freedesktop')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
 'apg: adds password generation for user accounts')
 makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
@@ -16,7 +16,7 @@
 license=('GPL')
 options=('!libtool' '!emptydirs')
 
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('90dde4b3db8b7a9c973f71e15601fd176ad6746cfef63c818fbdfd2254a8e99f')
+sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,10 +29,6 @@
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/gconf/schemas
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas 
--domain gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR=${pkgdir} install
 }
 

Modified: gnome-control-center.install
===
--- gnome-control-center.install2011-04-27 08:07:11 UTC (rev 120904)
+++ gnome-control-center.install2011-04-27 08:37:19 UTC (rev 120905)
@@ -1,18 +1,19 @@
 pkgname=gnome-control-center
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+usr/sbin/gconfpkg --uninstall ${pkgname}
+fi
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_upgrade() {
+post_install $1
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+post_install $1
 }

[arch-commits] Commit in gnome-control-center/trunk (2 files)

2011-02-18 Thread Ionut Biru 
Date: Friday, February 18, 2011 @ 13:15:57
  Author: ibiru
Revision: 110299

upgpkg: gnome-control-center 2.91.6-1
update to 2.91.6

Modified:
  gnome-control-center/trunk/PKGBUILD
  gnome-control-center/trunk/gnome-control-center.install

--+
 PKGBUILD |   18 ++
 gnome-control-center.install |9 -
 2 files changed, 10 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 18:02:01 UTC (rev 110298)
+++ PKGBUILD2011-02-18 18:15:57 UTC (rev 110299)
@@ -2,32 +2,34 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-control-center
-pkgver=2.32.1
+pkgver=2.91.6
 pkgrel=1
 pkgdesc=The Control Center for GNOME
 arch=('i686' 'x86_64')
-depends=('metacity=2.30.2' 'libxss' 'desktop-file-utils' 
'gnome-settings-daemon=2.32.1' 'libgnomekbd=2.32.0' 'libcanberra=0.25' 
'sound-theme-freedesktop' 'libunique=1.1.6' 'gnome-menus=2.30.5' 
'evolution-data-server=2.32.1' 'librsvg=2.32.1')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 
'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop')
 makedepends=('gnome-doc-utils=0.20.1' 'intltool')
 url=http://www.gnome.org;
 groups=('gnome')
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('befccae38ff25a036225b843bfa67a02f6708ed097f79dba344a1606f3180c27')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static --enable-aboutme \
+  --localstatedir=/var --disable-static \
   --disable-scrollkeeper --disable-update-mimedb
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
 
   install -m755 -d ${pkgdir}/usr/share/gconf/schemas
   gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas 
--domain gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  # --disable-update-mimedb?
-  rm -f ${pkgdir}/usr/share/applications/mimeinfo.cache
 }

Modified: gnome-control-center.install
===
--- gnome-control-center.install2011-02-18 18:02:01 UTC (rev 110298)
+++ gnome-control-center.install2011-02-18 18:15:57 UTC (rev 110299)
@@ -4,20 +4,12 @@
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
 }
 
 pre_upgrade() {
   pre_remove $1
 }
 
-post_upgrade() {
-  if [ `vercmp $2 2.22.0-3` -lt 0 ]; then
-usr/sbin/gconfpkg --install gnome-settings-daemon
-  fi
-  post_install $1
-}
-
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
@@ -25,5 +17,4 @@
 post_remove() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
 }