[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2017-08-09 Thread Jan Steffens 
Date: Wednesday, August 9, 2017 @ 10:34:46
  Author: heftig
Revision: 301804

Patch was upstreamed

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  
gnome-settings-daemon/trunk/0001-xsettings-Delay-fontconfig-update-until-changes-have.patch

-+
 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch |  717 
--
 PKGBUILD|8 
 2 files changed, 3 insertions(+), 722 deletions(-)

Deleted: 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch
===
--- 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch 
2017-08-09 10:26:27 UTC (rev 301803)
+++ 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch 
2017-08-09 10:34:46 UTC (rev 301804)
@@ -1,717 +0,0 @@
-From 219a320b6c0f30ad8a7385c330496a9716f3d360 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Wed, 2 Aug 2017 23:56:06 +0200
-Subject: [PATCH] xsettings: Delay fontconfig update until changes have settled
-
-Wait for the changes to the font directories to settle before starting
-the fontconfig update. In addition, make the update asynchronous and
-restart it if more changes arrive while the update runs, delaying the
-notify further.
-
-Try to avoid sending out a premature signal to Gtk and Clutter, which
-would then detect the additional changes and proceed with blocking
-updates themselves. This would even freeze the Shell.
-
-Revert commits f1b8257a and 578524da, which were added in the mistaken
-belief that GLocalFileMonitor already delays and coalesces change
-events.
-
-Use a GObject for the monitor handle in order to fix a leak
-(fontconfig_monitor_stop did not free the slice) and use refcounting to
-keep the handle alive over the async operation.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777255

- plugins/xsettings/Makefile.am  |   8 +-
- plugins/xsettings/fc-monitor.c | 317 +
- .../{fontconfig-monitor.h => fc-monitor.h} |  23 +-
- plugins/xsettings/fontconfig-monitor.c | 172 ---
- plugins/xsettings/gsd-xsettings-manager.c  |  29 +-
- 5 files changed, 344 insertions(+), 205 deletions(-)
- create mode 100644 plugins/xsettings/fc-monitor.c
- rename plugins/xsettings/{fontconfig-monitor.h => fc-monitor.h} (58%)
- delete mode 100644 plugins/xsettings/fontconfig-monitor.c
-
-diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
-index 74204290ddc43813..bc62c8a3f4bfed4d 100644
 a/plugins/xsettings/Makefile.am
-+++ b/plugins/xsettings/Makefile.am
-@@ -25,8 +25,8 @@ test_gtk_modules_CPPFLAGS =  \
- noinst_PROGRAMS += test-fontconfig-monitor
- 
- test_fontconfig_monitor_SOURCES = \
--  fontconfig-monitor.c\
--  fontconfig-monitor.h
-+  fc-monitor.c\
-+  fc-monitor.h
- 
- test_fontconfig_monitor_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS)
- 
-@@ -61,8 +61,8 @@ gsd_xsettings_SOURCES =  \
-   xsettings-common.h  \
-   xsettings-manager.c \
-   xsettings-manager.h \
--  fontconfig-monitor.c\
--  fontconfig-monitor.h\
-+  fc-monitor.c\
-+  fc-monitor.h\
-   gsd-remote-display-manager.c \
-   gsd-remote-display-manager.h \
-   wm-button-layout-translation.c  \
-diff --git a/plugins/xsettings/fc-monitor.c b/plugins/xsettings/fc-monitor.c
-new file mode 100644
-index ..63e87125622c48f4
 /dev/null
-+++ b/plugins/xsettings/fc-monitor.c
-@@ -0,0 +1,317 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Red Hat, Inc.
-+ * Copyright (C) 2017 Jan Alexander Steffens (heftig) 
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see .
-+ *
-+ * Author:  Behdad Esfahbod, Red Hat, Inc.
-+ */
-+
-+#include "fc-monitor.h"
-+
-+#include 
-+#include 
-+
-+#define TIMEOUT_MILLISECONDS 1000
-+
-+static void
-+fontconfig_cache_update_thread (GTask *task,
-+gpointer source_object G_GNUC_UNUSED,
-+gpointer task_data G_GNUC_UNUSED,
-+

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2017-08-05 Thread Jan Steffens 
Date: Saturday, August 5, 2017 @ 22:32:16
  Author: heftig
Revision: 301690

3.24.3-2

Added:
  
gnome-settings-daemon/trunk/0001-xsettings-Delay-fontconfig-update-until-changes-have.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch |  717 
++
 PKGBUILD|   11 
 2 files changed, 725 insertions(+), 3 deletions(-)

Added: 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch
===
--- 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch 
(rev 0)
+++ 0001-xsettings-Delay-fontconfig-update-until-changes-have.patch 
2017-08-05 22:32:16 UTC (rev 301690)
@@ -0,0 +1,717 @@
+From 219a320b6c0f30ad8a7385c330496a9716f3d360 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Wed, 2 Aug 2017 23:56:06 +0200
+Subject: [PATCH] xsettings: Delay fontconfig update until changes have settled
+
+Wait for the changes to the font directories to settle before starting
+the fontconfig update. In addition, make the update asynchronous and
+restart it if more changes arrive while the update runs, delaying the
+notify further.
+
+Try to avoid sending out a premature signal to Gtk and Clutter, which
+would then detect the additional changes and proceed with blocking
+updates themselves. This would even freeze the Shell.
+
+Revert commits f1b8257a and 578524da, which were added in the mistaken
+belief that GLocalFileMonitor already delays and coalesces change
+events.
+
+Use a GObject for the monitor handle in order to fix a leak
+(fontconfig_monitor_stop did not free the slice) and use refcounting to
+keep the handle alive over the async operation.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777255
+---
+ plugins/xsettings/Makefile.am  |   8 +-
+ plugins/xsettings/fc-monitor.c | 317 +
+ .../{fontconfig-monitor.h => fc-monitor.h} |  23 +-
+ plugins/xsettings/fontconfig-monitor.c | 172 ---
+ plugins/xsettings/gsd-xsettings-manager.c  |  29 +-
+ 5 files changed, 344 insertions(+), 205 deletions(-)
+ create mode 100644 plugins/xsettings/fc-monitor.c
+ rename plugins/xsettings/{fontconfig-monitor.h => fc-monitor.h} (58%)
+ delete mode 100644 plugins/xsettings/fontconfig-monitor.c
+
+diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
+index 74204290ddc43813..bc62c8a3f4bfed4d 100644
+--- a/plugins/xsettings/Makefile.am
 b/plugins/xsettings/Makefile.am
+@@ -25,8 +25,8 @@ test_gtk_modules_CPPFLAGS =  \
+ noinst_PROGRAMS += test-fontconfig-monitor
+ 
+ test_fontconfig_monitor_SOURCES = \
+-  fontconfig-monitor.c\
+-  fontconfig-monitor.h
++  fc-monitor.c\
++  fc-monitor.h
+ 
+ test_fontconfig_monitor_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS)
+ 
+@@ -61,8 +61,8 @@ gsd_xsettings_SOURCES =  \
+   xsettings-common.h  \
+   xsettings-manager.c \
+   xsettings-manager.h \
+-  fontconfig-monitor.c\
+-  fontconfig-monitor.h\
++  fc-monitor.c\
++  fc-monitor.h\
+   gsd-remote-display-manager.c \
+   gsd-remote-display-manager.h \
+   wm-button-layout-translation.c  \
+diff --git a/plugins/xsettings/fc-monitor.c b/plugins/xsettings/fc-monitor.c
+new file mode 100644
+index ..63e87125622c48f4
+--- /dev/null
 b/plugins/xsettings/fc-monitor.c
+@@ -0,0 +1,317 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Red Hat, Inc.
++ * Copyright (C) 2017 Jan Alexander Steffens (heftig) 
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see .
++ *
++ * Author:  Behdad Esfahbod, Red Hat, Inc.
++ */
++
++#include "fc-monitor.h"
++
++#include 
++#include 
++
++#define TIMEOUT_MILLISECONDS 1000
++
++static void
++fontconfig_cache_update_thread (GTask *task,
++gpointer source_object G_GNUC_UNUSED,
++gpointer task_data G_GNUC_UNUSED,
++

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2016-06-03 Thread Jan de Groot 
Date: Friday, June 3, 2016 @ 14:09:10
  Author: jgc
Revision: 268868

upgpkg: gnome-settings-daemon 3.20.1+8+g40bf4fd-1

Update to git snapshot to fix quite some possible segfaults

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  gnome-settings-daemon/trunk/gnome-settings-daemon.install

---+
 PKGBUILD  |   27 ++-
 gnome-settings-daemon.install |   12 
 2 files changed, 18 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-03 08:20:59 UTC (rev 268867)
+++ PKGBUILD2016-06-03 12:09:10 UTC (rev 268868)
@@ -2,24 +2,33 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=gnome-settings-daemon
-pkgver=3.20.1
+pkgver=3.20.1+8+g40bf4fd
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=(i686 x86_64)
 license=(GPL)
 depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse
- libnotify libsystemd libwacom pulseaudio pulseaudio-alsa upower 
librsvg libgweather
- geocode-glib geoclue2 nss libgudev)
-makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python2)
+ libnotify libsystemd libwacom pulseaudio pulseaudio-alsa upower
+ librsvg libgweather geocode-glib geoclue2 nss libgudev)
+makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python git 
gnome-common)
 options=('!emptydirs')
-install=gnome-settings-daemon.install
 url="http://www.gnome.org;
 groups=(gnome)
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7')
+source=('git://git.gnome.org/gnome-settings-daemon#commit=40bf4fdce0001c662094f47e8edc1b0855ec9632')
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --long | sed -e 's/-/+/g' -e 's/^GNOME_SETTINGS_DAEMON_//' -e 
's/_/./g'
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/$pkgname --disable-static
@@ -31,6 +40,6 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }

Deleted: gnome-settings-daemon.install
===
--- gnome-settings-daemon.install   2016-06-03 08:20:59 UTC (rev 268867)
+++ gnome-settings-daemon.install   2016-06-03 12:09:10 UTC (rev 268868)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2014-02-25 Thread Jan de Groot 
Date: Tuesday, February 25, 2014 @ 13:05:32
  Author: jgc
Revision: 206401

upgpkg: gnome-settings-daemon 3.11.90-1

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  
gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch

-+
 0001-power-use-gnome_rr_output_get_min_backlight_step.patch |   37 --
 PKGBUILD|   17 +---
 2 files changed, 4 insertions(+), 50 deletions(-)

Deleted: 0001-power-use-gnome_rr_output_get_min_backlight_step.patch
===
--- 0001-power-use-gnome_rr_output_get_min_backlight_step.patch 2014-02-25 
11:37:41 UTC (rev 206400)
+++ 0001-power-use-gnome_rr_output_get_min_backlight_step.patch 2014-02-25 
12:05:32 UTC (rev 206401)
@@ -1,37 +0,0 @@
-From 28c4f287523607cd24bcb62b25bf83691036fadd Mon Sep 17 00:00:00 2001
-From: Asad Mehmood asad78...@googlemail.com
-Date: Thu, 17 Oct 2013 16:41:44 +0100
-Subject: [PATCH] power: use gnome_rr_output_get_min_backlight_step
-
-Use min_backlight_step or 5% increments whichever is larger
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710380

- plugins/power/gpm-common.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
-index 81af0b7..81dc048 100644
 a/plugins/power/gpm-common.c
-+++ b/plugins/power/gpm-common.c
-@@ -1275,7 +1275,7 @@ backlight_step_up (GnomeRRScreen *rr_screen, GError 
**error)
- now = gnome_rr_output_get_backlight (output);
- if (now  0)
-return percentage_value;
--step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
-+step = MAX (gnome_rr_output_get_min_backlight_step (output), 
BRIGHTNESS_STEP_AMOUNT (max - min + 1));
- discrete = MIN (now + step, max);
- ret = gnome_rr_output_set_backlight (output,
-  discrete,
-@@ -1334,7 +1334,7 @@ backlight_step_down (GnomeRRScreen *rr_screen, GError 
**error)
- now = gnome_rr_output_get_backlight (output);
- if (now  0)
-return percentage_value;
--step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
-+step = MAX (gnome_rr_output_get_min_backlight_step (output), 
BRIGHTNESS_STEP_AMOUNT (max - min + 1));
- discrete = MAX (now - step, 0);
- ret = gnome_rr_output_set_backlight (output,
-  discrete,
--- 
-1.8.4.1
-

Modified: PKGBUILD
===
--- PKGBUILD2014-02-25 11:37:41 UTC (rev 206400)
+++ PKGBUILD2014-02-25 12:05:32 UTC (rev 206401)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 
 pkgname=gnome-settings-daemon
-pkgver=3.10.2
-pkgrel=3
+pkgver=3.11.90
+pkgrel=1
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,18 +15,9 @@
 install=gnome-settings-daemon.install
 url=http://www.gnome.org;
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
-sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264'
-'e83d2d496506c3964236e376d0ec8f844e5b6850f5e2d2fea9208bd008c19f54')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('50203fe3f3f5ef7417c79ceb57a19c283149f0ec2ed960144b3bb5ab5b23362a')
 
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#37224
-  patch -Np1 -i ../0001-power-use-gnome_rr_output_get_min_backlight_step.patch
-}
-
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2013-11-16 Thread Jan Steffens 
Date: Saturday, November 16, 2013 @ 13:14:24
  Author: heftig
Revision: 199782

FS#37224

Added:
  
gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-power-use-gnome_rr_output_get_min_backlight_step.patch |   37 ++
 PKGBUILD|   15 +++-
 2 files changed, 49 insertions(+), 3 deletions(-)

Added: 0001-power-use-gnome_rr_output_get_min_backlight_step.patch
===
--- 0001-power-use-gnome_rr_output_get_min_backlight_step.patch 
(rev 0)
+++ 0001-power-use-gnome_rr_output_get_min_backlight_step.patch 2013-11-16 
12:14:24 UTC (rev 199782)
@@ -0,0 +1,37 @@
+From 28c4f287523607cd24bcb62b25bf83691036fadd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood asad78...@googlemail.com
+Date: Thu, 17 Oct 2013 16:41:44 +0100
+Subject: [PATCH] power: use gnome_rr_output_get_min_backlight_step
+
+Use min_backlight_step or 5% increments whichever is larger
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710380
+---
+ plugins/power/gpm-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
+index 81af0b7..81dc048 100644
+--- a/plugins/power/gpm-common.c
 b/plugins/power/gpm-common.c
+@@ -1275,7 +1275,7 @@ backlight_step_up (GnomeRRScreen *rr_screen, GError 
**error)
+ now = gnome_rr_output_get_backlight (output);
+ if (now  0)
+return percentage_value;
+-step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
++step = MAX (gnome_rr_output_get_min_backlight_step (output), 
BRIGHTNESS_STEP_AMOUNT (max - min + 1));
+ discrete = MIN (now + step, max);
+ ret = gnome_rr_output_set_backlight (output,
+  discrete,
+@@ -1334,7 +1334,7 @@ backlight_step_down (GnomeRRScreen *rr_screen, GError 
**error)
+ now = gnome_rr_output_get_backlight (output);
+ if (now  0)
+return percentage_value;
+-step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
++step = MAX (gnome_rr_output_get_min_backlight_step (output), 
BRIGHTNESS_STEP_AMOUNT (max - min + 1));
+ discrete = MAX (now - step, 0);
+ ret = gnome_rr_output_set_backlight (output,
+  discrete,
+-- 
+1.8.4.1
+

Modified: PKGBUILD
===
--- PKGBUILD2013-11-16 09:28:45 UTC (rev 199781)
+++ PKGBUILD2013-11-16 12:14:24 UTC (rev 199782)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-settings-daemon
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,9 +15,18 @@
 install=gnome-settings-daemon.install
 url=http://www.gnome.org;
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
+sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264'
+'e83d2d496506c3964236e376d0ec8f844e5b6850f5e2d2fea9208bd008c19f54')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # FS#37224
+  patch -Np1 -i ../0001-power-use-gnome_rr_output_get_min_backlight_step.patch
+}
+
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2013-10-15 Thread Jan Steffens 
Date: Wednesday, October 16, 2013 @ 00:21:11
  Author: heftig
Revision: 196640

3.10.1

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  
gnome-settings-daemon/trunk/0001-power-Use-logind-to-discover-critical-action-availab.patch

-+
 0001-power-Use-logind-to-discover-critical-action-availab.patch |   77 
--
 PKGBUILD|4 
 2 files changed, 2 insertions(+), 79 deletions(-)

Deleted: 0001-power-Use-logind-to-discover-critical-action-availab.patch
===
--- 0001-power-Use-logind-to-discover-critical-action-availab.patch 
2013-10-15 22:20:16 UTC (rev 196639)
+++ 0001-power-Use-logind-to-discover-critical-action-availab.patch 
2013-10-15 22:21:11 UTC (rev 196640)
@@ -1,77 +0,0 @@
-From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001
-From: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-Date: Mon, 5 Aug 2013 18:15:00 +0200
-Subject: [PATCH] power: Use logind to discover critical action availability
-
-The upower functionality is deprecated and will return an
-error unless upower is built with --enable-deprecated.
-
-Follows a similar patch to gnome-control-center.

- plugins/power/gsd-power-manager.c | 42 ---
- 1 file changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c 
b/plugins/power/gsd-power-manager.c
-index fde90ef..8bd124f 100644
 a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,7 +27,6 @@
- #include string.h
- #include glib/gi18n.h
- #include gtk/gtk.h
--#define UPOWER_ENABLE_DEPRECATED 1
- #include libupower-glib/upower.h
- #include libnotify/notify.h
- #include canberra-gtk.h
-@@ -1164,18 +1163,37 @@ static GsdPowerActionType
- manager_critical_action_get (GsdPowerManager *manager,
-  gboolean is_ups)
- {
--GsdPowerActionType policy;
-+GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN;
-+GsdPowerActionType setpolicy;
-+GVariant *result = NULL;
-+gchar *s;
- 
--policy = g_settings_get_enum (manager-priv-settings, 
critical-battery-action);
--if (policy == GSD_POWER_ACTION_SUSPEND) {
--if (is_ups == FALSE 
--up_client_get_can_suspend (manager-priv-up_client))
--return policy;
--return GSD_POWER_ACTION_SHUTDOWN;
--} else if (policy == GSD_POWER_ACTION_HIBERNATE) {
--if (up_client_get_can_hibernate (manager-priv-up_client))
--return policy;
--return GSD_POWER_ACTION_SHUTDOWN;
-+setpolicy = g_settings_get_enum (manager-priv-settings, 
critical-battery-action);
-+
-+if (setpolicy == GSD_POWER_ACTION_SUSPEND) {
-+if (is_ups == FALSE) {
-+result = g_dbus_proxy_call_sync 
(manager-priv-logind_proxy,
-+ CanSuspend,
-+ NULL,
-+ 
G_DBUS_CALL_FLAGS_NONE,
-+ -1, NULL, NULL);
-+}
-+} else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) {
-+result = g_dbus_proxy_call_sync (manager-priv-logind_proxy,
-+ CanHibernate,
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1, NULL, NULL);
-+} else {
-+/* Other actions need no check */
-+return setpolicy;
-+}
-+
-+if (result) {
-+g_variant_get (result, (s), s);
-+if (g_strcmp0 (s, yes) == 0)
-+policy = setpolicy;
-+g_variant_unref (result);
- }
- 
- return policy;
--- 
-1.8.3.4
-

Modified: PKGBUILD
===
--- PKGBUILD2013-10-15 22:20:16 UTC (rev 196639)
+++ PKGBUILD2013-10-15 22:21:11 UTC (rev 196640)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 
 pkgname=gnome-settings-daemon
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 url=http://www.gnome.org;
 groups=('gnome')
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005')
+sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2013-08-05 Thread Jan Steffens 
Date: Monday, August 5, 2013 @ 18:40:47
  Author: heftig
Revision: 192078

Add patch for upower

Added:
  
gnome-settings-daemon/trunk/0001-power-Use-logind-to-discover-critical-action-availab.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-power-Use-logind-to-discover-critical-action-availab.patch |   77 
++
 PKGBUILD|   13 +
 2 files changed, 87 insertions(+), 3 deletions(-)

Added: 0001-power-Use-logind-to-discover-critical-action-availab.patch
===
--- 0001-power-Use-logind-to-discover-critical-action-availab.patch 
(rev 0)
+++ 0001-power-Use-logind-to-discover-critical-action-availab.patch 
2013-08-05 16:40:47 UTC (rev 192078)
@@ -0,0 +1,77 @@
+From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001
+From: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+Date: Mon, 5 Aug 2013 18:15:00 +0200
+Subject: [PATCH] power: Use logind to discover critical action availability
+
+The upower functionality is deprecated and will return an
+error unless upower is built with --enable-deprecated.
+
+Follows a similar patch to gnome-control-center.
+---
+ plugins/power/gsd-power-manager.c | 42 ---
+ 1 file changed, 30 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/power/gsd-power-manager.c 
b/plugins/power/gsd-power-manager.c
+index fde90ef..8bd124f 100644
+--- a/plugins/power/gsd-power-manager.c
 b/plugins/power/gsd-power-manager.c
+@@ -27,7 +27,6 @@
+ #include string.h
+ #include glib/gi18n.h
+ #include gtk/gtk.h
+-#define UPOWER_ENABLE_DEPRECATED 1
+ #include libupower-glib/upower.h
+ #include libnotify/notify.h
+ #include canberra-gtk.h
+@@ -1164,18 +1163,37 @@ static GsdPowerActionType
+ manager_critical_action_get (GsdPowerManager *manager,
+  gboolean is_ups)
+ {
+-GsdPowerActionType policy;
++GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN;
++GsdPowerActionType setpolicy;
++GVariant *result = NULL;
++gchar *s;
+ 
+-policy = g_settings_get_enum (manager-priv-settings, 
critical-battery-action);
+-if (policy == GSD_POWER_ACTION_SUSPEND) {
+-if (is_ups == FALSE 
+-up_client_get_can_suspend (manager-priv-up_client))
+-return policy;
+-return GSD_POWER_ACTION_SHUTDOWN;
+-} else if (policy == GSD_POWER_ACTION_HIBERNATE) {
+-if (up_client_get_can_hibernate (manager-priv-up_client))
+-return policy;
+-return GSD_POWER_ACTION_SHUTDOWN;
++setpolicy = g_settings_get_enum (manager-priv-settings, 
critical-battery-action);
++
++if (setpolicy == GSD_POWER_ACTION_SUSPEND) {
++if (is_ups == FALSE) {
++result = g_dbus_proxy_call_sync 
(manager-priv-logind_proxy,
++ CanSuspend,
++ NULL,
++ 
G_DBUS_CALL_FLAGS_NONE,
++ -1, NULL, NULL);
++}
++} else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) {
++result = g_dbus_proxy_call_sync (manager-priv-logind_proxy,
++ CanHibernate,
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1, NULL, NULL);
++} else {
++/* Other actions need no check */
++return setpolicy;
++}
++
++if (result) {
++g_variant_get (result, (s), s);
++if (g_strcmp0 (s, yes) == 0)
++policy = setpolicy;
++g_variant_unref (result);
+ }
+ 
+ return policy;
+-- 
+1.8.3.4
+

Modified: PKGBUILD
===
--- PKGBUILD2013-08-05 16:37:39 UTC (rev 192077)
+++ PKGBUILD2013-08-05 16:40:47 UTC (rev 192078)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-settings-daemon
 pkgver=3.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,9 +14,16 @@
 install=gnome-settings-daemon.install
 url=http://www.gnome.org;
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2013-04-16 Thread Jan Steffens 
Date: Tuesday, April 16, 2013 @ 17:09:32
  Author: heftig
Revision: 182963

3.8.1

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
Deleted:
  
gnome-settings-daemon/trunk/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch

-+
 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch | 1476 
--
 PKGBUILD|4 
 2 files changed, 2 insertions(+), 1478 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 182962:182963 to see the changes.

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2013-01-16 Thread Jan de Groot 
Date: Wednesday, January 16, 2013 @ 08:36:16
  Author: jgc
Revision: 175197

Adjust patch to apply with 3.6.4.

upgpkg: gnome-settings-daemon 3.6.4-1

Modified:
  
gnome-settings-daemon/trunk/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch |6 ++---
 PKGBUILD|   12 
+-
 2 files changed, 10 insertions(+), 8 deletions(-)

Modified: 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
===
--- 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 
2013-01-16 11:12:55 UTC (rev 175196)
+++ 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 
2013-01-16 13:36:16 UTC (rev 175197)
@@ -1412,9 +1412,9 @@
  g_signal_connect (manager-priv-up_client, device-added,
G_CALLBACK (engine_device_added_cb), manager);
 @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
- manager-priv-x11_screen = gnome_rr_screen_new 
(gdk_screen_get_default (), error);
- if (manager-priv-x11_screen == NULL)
- return FALSE;
+   G_CALLBACK (idle_idletime_reset_cb), manager);
+ g_signal_connect (manager-priv-idletime, alarm-expired,
+   G_CALLBACK (idle_idletime_alarm_expired_cb), 
manager);
 +g_signal_connect (manager-priv-x11_screen, changed, G_CALLBACK 
(on_randr_event), manager);
 +/* set up initial state */
 +on_randr_event (manager-priv-x11_screen, manager);

Modified: PKGBUILD
===
--- PKGBUILD2013-01-16 11:12:55 UTC (rev 175196)
+++ PKGBUILD2013-01-16 13:36:16 UTC (rev 175197)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 
 pkgname=gnome-settings-daemon
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.6.4
+pkgrel=1
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,8 +16,8 @@
 groups=('gnome')
 
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc'
-'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109')
+sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
+'5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb')
 
 build() {
   cd $pkgname-$pkgver
@@ -25,8 +25,10 @@
   # logind key handling FS#31801, patch from Fedora
   # rebased onto screensaver.patch
   patch -Np1 -i 
../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+
   aclocal
-  automake
+  autoconf
+  automake --add-missing
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2012-11-08 Thread Jan Steffens 
Date: Thursday, November 8, 2012 @ 06:26:52
  Author: heftig
Revision: 170535

3.6.2

Modified:
  
gnome-settings-daemon/trunk/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch |   65 
+-
 PKGBUILD|   13 --
 2 files changed, 38 insertions(+), 40 deletions(-)

Modified: 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
===
--- 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 
2012-11-07 23:38:03 UTC (rev 170534)
+++ 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 
2012-11-08 11:26:52 UTC (rev 170535)
@@ -1,4 +1,4 @@
-From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001
+From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
 From: Richard Hughes rich...@hughsie.com
 Date: Fri, 21 Sep 2012 11:56:53 +0100
 Subject: [PATCH] power and media-keys: Use logind for suspending and
@@ -13,13 +13,16 @@
 resume.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=680689
+
+Conflicts:
+   plugins/power/gsd-power-manager.c
 ---
  plugins/common/Makefile.am  |   4 +-
  plugins/common/gsd-power-helper.c   | 203 
  plugins/common/gsd-power-helper.h   |  35 --
  plugins/media-keys/gsd-media-keys-manager.c | 156 +--
- plugins/power/gsd-power-manager.c   | 699 +++-
- 5 files changed, 595 insertions(+), 502 deletions(-)
+ plugins/power/gsd-power-manager.c   | 697 +++-
+ 5 files changed, 594 insertions(+), 501 deletions(-)
  delete mode 100644 plugins/common/gsd-power-helper.c
  delete mode 100644 plugins/common/gsd-power-helper.h
 
@@ -545,7 +548,7 @@
  
  GsdMediaKeysManager *
 diff --git a/plugins/power/gsd-power-manager.c 
b/plugins/power/gsd-power-manager.c
-index 070cf32..18fcedf 100644
+index 1c594d8..bb7224c 100644
 --- a/plugins/power/gsd-power-manager.c
 +++ b/plugins/power/gsd-power-manager.c
 @@ -1,7 +1,7 @@
@@ -584,7 +587,7 @@
  /* Keep this in sync with gnome-shell */
  #define SCREENSAVER_FADE_TIME   10 /* seconds */
  
-@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate
+@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
  ca_context  *canberra_context;
  ca_proplist *critical_alert_loop_props;
  guint32  critical_alert_timeout_id;
@@ -596,6 +599,7 @@
 -guintlid_close_safety_timer_id;
  GtkStatusIcon   *status_icon;
  guintxscreensaver_watchdog_timer_id;
+ gboolean is_virtual_machine;
 +
 +/* systemd stuff */
 +GDBusProxy  *logind_proxy;
@@ -607,7 +611,7 @@
  };
  
  enum {
-@@ -217,8 +227,8 @@ static GIcon*engine_get_icon (GsdPowerManager 
*manager);
+@@ -218,8 +228,8 @@ static GIcon*engine_get_icon (GsdPowerManager 
*manager);
  static gchar*engine_get_summary (GsdPowerManager *manager);
  static void  do_power_action_type (GsdPowerManager *manager, 
GsdPowerActionType action_type);
  static void  do_lid_closed_action (GsdPowerManager *manager);
@@ -618,7 +622,7 @@
  
  G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
  
-@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void)
+@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
  }
  
  static void
@@ -676,7 +680,7 @@
  do_power_action_type (GsdPowerManager *manager,
GsdPowerActionType action_type)
  {
-@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager,
+@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
  
  switch (action_type) {
  case GSD_POWER_ACTION_SUSPEND:
@@ -699,7 +703,7 @@
  break;
  case GSD_POWER_ACTION_BLANK:
  ret = gnome_rr_screen_set_dpms_mode 
(manager-priv-x11_screen,
-@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
+@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
  return ret;
  }
  
@@ -795,7 +799,7 @@
  }
  
  /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2226,82 +,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
+@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
   * again in the timeout handler to see if we can suspend then.
   */
  static void
@@ -880,8 +884,7 @@
 -g_warning (failed to turn the panel off after lid close: %s,
 +g_warning (failed to turn the panel on after lid open: %s,
 error-message);
--g_error_free (error);
-+g_clear_error (error);
+

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2012-10-08 Thread Jan Steffens 
Date: Monday, October 8, 2012 @ 15:46:57
  Author: heftig
Revision: 168323

Update to 3.6.1, add logind power patch, remove updates schema reference

Added:
  
gnome-settings-daemon/trunk/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

-+
 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch | 1472 
++
 PKGBUILD|   18 
 2 files changed, 1487 insertions(+), 3 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 168322:168323 to see the changes.

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2012-03-19 Thread Ionut Biru 
Date: Monday, March 19, 2012 @ 14:03:00
  Author: ibiru
Revision: 153789

update to 3.3.92

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
  gnome-settings-daemon/trunk/gnome-settings-daemon.install

---+
 PKGBUILD  |   13 +
 gnome-settings-daemon.install |   10 ++
 2 files changed, 7 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-19 17:50:23 UTC (rev 153788)
+++ PKGBUILD2012-03-19 18:03:00 UTC (rev 153789)
@@ -3,23 +3,20 @@
 
 pkgname=gnome-settings-daemon
 pkgver=3.3.92
-pkgrel=0.1
+pkgrel=1
 pkgdesc=The GNOME Settings daemon
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 
'libcanberra-pulse'
- 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 
'pulseaudio-alsa'
- 'upower' 'libsystemd' 'libwacom' 'udev' 'colord')
+depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 
'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify'
+ 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower')
 makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 
'xf86-input-wacom')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url=http://www.gnome.org;
 groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 systemd-fallback.patch)
-sha256sums=('7eb35aa956feb1ce370406d5bc68c0f2a7b5aac43c9730c7391ad74b1c83feab'
+sha256sums=('419d177a2c381b51fee775987973f7434a21a4f0fd9a0b1253c2d80e318e9a3f'
 '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
 
 build() {

Modified: gnome-settings-daemon.install
===
--- gnome-settings-daemon.install   2012-03-19 17:50:23 UTC (rev 153788)
+++ gnome-settings-daemon.install   2012-03-19 18:03:00 UTC (rev 153789)
@@ -1,14 +1,8 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0)  0 )); then
-usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
 post_upgrade() {
   post_install
 }

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2010-03-29 Thread Ionut Biru 
Date: Monday, March 29, 2010 @ 15:39:43
  Author: ibiru
Revision: 73975

update to 2.30

Added:
  gnome-settings-daemon/trunk/gstreamer-volume-2.30.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

-+
 PKGBUILD|   16 
 gstreamer-volume-2.30.patch |  861 ++
 2 files changed, 869 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-29 19:39:27 UTC (rev 73974)
+++ PKGBUILD2010-03-29 19:39:43 UTC (rev 73975)
@@ -2,26 +2,26 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=gnome-settings-daemon
-pkgver=2.29.92
+pkgver=2.30.0
 pkgrel=1
 pkgdesc=The GNOME Settings daemon
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libgnomekbd=2.29.92' 'gnome-desktop=2.29.92' 'libnotify=0.4.5' 
'libxxf86misc' 'gstreamer0.10-base=0.10.26' 'hicolor-icon-theme')
+depends=('libgnomekbd=2.30.0' 'gnome-desktop=2.29.92' 'libnotify=0.4.5' 
'libxxf86misc' 'gstreamer0.10-base=0.10.26' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig')
 conflicts=('gnome-control-center2.22.0')
 options=(!emptydirs !libtool)
 install=gnome-settings-daemon.install
 url=http://www.gnome.org;
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.29/${pkgname}-${pkgver}.tar.bz2
-gstreamer-volume-2.29.91.patch)
-sha256sums=('c27097f5db4e19926729d961e30ec8e0f7a9c565daa0d2674c4f02d0cb2c8c19'
-'a235e34b3732447c2945fb498ef16f17236a94ec8ee4fddaa44a9bf44ea06006')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+gstreamer-volume-2.30.patch)
+sha256sums=('cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa'
+'4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gstreamer-volume-2.29.91.patch || return 1
+  patch -Np1 -i ${srcdir}/gstreamer-volume-2.30.patch || return 1
   libtoolize --force || return 1
   aclocal || return 1
   autoconf || return 1

Added: gstreamer-volume-2.30.patch
===
--- gstreamer-volume-2.30.patch (rev 0)
+++ gstreamer-volume-2.30.patch 2010-03-29 19:39:43 UTC (rev 73975)
@@ -0,0 +1,861 @@
+diff -Nur gnome-settings-daemon-2.30.0.orig/configure.ac 
gnome-settings-daemon-2.30.0/configure.ac
+--- gnome-settings-daemon-2.30.0.orig/configure.ac 2010-03-29 
17:03:47.0 +0300
 gnome-settings-daemon-2.30.0/configure.ac  2010-03-29 21:35:17.974333715 
+0300
+@@ -251,6 +251,48 @@
+ AC_SUBST(PULSE_CFLAGS)
+ AC_SUBST(PULSE_LIBS)
+ 
++dnl ==
++dnl GStreamer section
++dnl ==
++GST_MAJORMINOR=auto
++
++AC_ARG_ENABLE(gstreamer,
++AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and 
optionally specify a version)]),
++[case ${enableval} in
++ yes) ENABLE_GSTREAMER=yes ;;
++ 0.10) ENABLE_GSTREAMER=yes  GST_MAJORMINOR=0.10 ;;
++ no)  ENABLE_GSTREAMER=no ;;
++ *) AC_MSG_ERROR([
++  *** Bad value ${enableval} for --enable-gstreamer
++  *** Please use one of the following:
++  ***--enable-gstreamer=0.10
++   ]) ;;
++esac],
++[ENABLE_GSTREAMER=yes]) dnl Default value
++
++have_gstreamer=no
++if test x$ENABLE_GSTREAMER = xyes; then
++   GST_REQS=0.10.1.2
++   PKGS=gstreamer-0.10 = $GST_REQS gstreamer-plugins-base-0.10 = $GST_REQS
++
++   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
++ AC_MSG_RESULT([no]))
++
++   if test x$have_pulse = xtrue; then
++  AC_MSG_ERROR([*** GStreamer  Pulseaudio both are selected ***])
++   fi
++
++   if test x$have_gstreamer = xyes; then
++  GST_LIBS=$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10
++  AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])
++   fi
++else
++   AC_MSG_NOTICE([*** GStreamer support disabled ***])
++fi
++AM_CONDITIONAL(HAVE_GSTREAMER, test x$have_gstreamer = xyes)
++AC_SUBST(GST_LIBS)
++AC_SUBST(GST_CFLAGS)
++
+ # ---
+ # Enable Profiling
+ # ---
+@@ -389,6 +431,7 @@
+ dbus-1 system.d dir:  ${DBUS_SYS_DIR}
+ 
+ Libnotify support:${have_libnotify}
++GStreamer support:${have_gstreamer}
+ PulseAudio support:   ${have_pulse}
+ Profiling support:${enable_profiling}
+ 
+diff -Nur 
gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
 
gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
+--- 
gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
  1970-01-01

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2010-02-25 Thread Ionut Biru 
Date: Thursday, February 25, 2010 @ 11:00:01
  Author: ibiru
Revision: 70214

update to 2.29.91, modify patch to build with this version

Added:
  gnome-settings-daemon/trunk/gstreamer-volume-2.29.91.patch
Modified:
  gnome-settings-daemon/trunk/PKGBUILD

+
 PKGBUILD   |   10 
 gstreamer-volume-2.29.91.patch | 2741 +++
 2 files changed, 2746 insertions(+), 5 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 70213:70214 to see the changes.

[arch-commits] Commit in gnome-settings-daemon/trunk (2 files)

2010-02-25 Thread Ionut Biru 
Date: Thursday, February 25, 2010 @ 11:25:05
  Author: ibiru
Revision: 70229

redo the patch

Modified:
  gnome-settings-daemon/trunk/PKGBUILD
  gnome-settings-daemon/trunk/gstreamer-volume-2.29.91.patch

+
 PKGBUILD   |2 
 gstreamer-volume-2.29.91.patch | 1944 ---
 2 files changed, 7 insertions(+), 1939 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 70228:70229 to see the changes.