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

[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 <asad78611 at 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
===================================================================
--- PKGBUILD	2014-02-25 11:37:41 UTC (rev 206400)
+++ PKGBUILD	2014-02-25 12:05:32 UTC (rev 206401)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at 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