summaryrefslogtreecommitdiff
path: root/extra/gnome-settings-daemon
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 23:55:53 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-12-27 23:55:53 +0000
commit65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch)
treefbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/gnome-settings-daemon
parentd53c44f055929b18d7d1b25f8367ee5836c435fc (diff)
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/gnome-settings-daemon')
-rw-r--r--extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch37
-rw-r--r--extra/gnome-settings-daemon/PKGBUILD22
2 files changed, 53 insertions, 6 deletions
diff --git a/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
new file mode 100644
index 000000000..8a804429e
--- /dev/null
+++ b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
@@ -0,0 +1,37 @@
+From 28c4f287523607cd24bcb62b25bf83691036fadd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611@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
+
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index d34eeb742..de9090c4a 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,21 +1,31 @@
-# $Id: PKGBUILD 198028 2013-10-30 12:21:47Z allan $
+# $Id: PKGBUILD 199789 2013-11-16 12:18:40Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-settings-daemon
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="The GNOME Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
- 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2')
+ 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2'
+ 'nss')
makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
options=('!emptydirs')
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=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31')
+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