Tue Apr 15 03:22:01 UTC 2014

2 files changed, 4 insertions, 80 deletions

diff --git a/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
deleted file mode 100644
index 0bf10f61d..000000000
--- a/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ede893a90870c31d8b374978d524fddf6f3aac81 Mon Sep 17 00:00:00 2001
-From: Asad Mehmood <asad78611@googlemail.com>
-Date: Thu, 17 Oct 2013 16:21:42 +0100
-Subject: [PATCH] GnomeRR: gnome_rr_output_get_min_backlight_step
-
-Allows gnome-settings-daemon to read the min_backlight_step
-so that it can support displays with less than 10 steps
----
- libgnome-desktop/gnome-rr.c | 15 +++++++++++++++
- libgnome-desktop/gnome-rr.h |  1 +
- 2 files changed, 16 insertions(+)
-
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 5e011d3..88df060 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -77,6 +77,7 @@ struct GnomeRROutput
-     char *              edid_file;
- 
-     int                 backlight;
-+    int                 min_backlight_step;
- 
-     gboolean            is_primary;
-     gboolean            is_presentation;
-@@ -1271,6 +1272,7 @@ output_initialize (GnomeRROutput *output, GVariant *info)
-     g_variant_lookup (properties, "height-mm", "i", &output->height_mm);
-     g_variant_lookup (properties, "display-name", "s", &output->display_name);
-     g_variant_lookup (properties, "backlight", "i", &output->backlight);
-+    g_variant_lookup (properties, "min-backlight-step", "i", &output->min_backlight_step);
-     g_variant_lookup (properties, "primary", "b", &output->is_primary);
-     g_variant_lookup (properties, "presentation", "b", &output->is_presentation);
- 
-@@ -1446,6 +1448,19 @@ gnome_rr_output_get_backlight (GnomeRROutput *output)
- }
- 
- /**
-+ * gnome_rr_output_get_min_backlight_step:
-+ *
-+ * Returns: The minimum backlight step available in percent
-+ */
-+int
-+gnome_rr_output_get_min_backlight_step (GnomeRROutput *output)
-+{
-+    g_return_val_if_fail (output != NULL, -1);
-+    
-+    return output->min_backlight_step;
-+}
-+
-+/**
-  * gnome_rr_output_set_backlight:
-  * @value: the absolute value which is 0 >= this <= 100
-  *
-diff --git a/libgnome-desktop/gnome-rr.h b/libgnome-desktop/gnome-rr.h
-index a0d42f7..0443342 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -154,6 +154,7 @@ void            gnome_rr_output_get_physical_size  (GnomeRROutput         *outpu
-                                                     int                   *height_mm);
- 
- gint            gnome_rr_output_get_backlight      (GnomeRROutput         *output);
-+gint            gnome_rr_output_get_min_backlight_step(GnomeRROutput      *output);
- gboolean        gnome_rr_output_set_backlight      (GnomeRROutput         *output,
-                                                     gint                   value,
-                                                     GError                **error);
--- 
-1.8.4.1
-
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 5ddd9cdb5..07d43f9c4 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 204013 2014-01-14 08:11:43Z jgc $
+# $Id: PKGBUILD 210458 2014-04-14 20:06:29Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.10.2
+pkgver=3.12.0
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
@@ -12,17 +12,8 @@ depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
 makedepends=(intltool gobject-introspection itstool)
 url="http://www.gnome.org"
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch)
-sha256sums=('d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632'
-            '5920cec531b03ebe0ce0941250ce62d92a7b18ae44900f11df90adb381858df2')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#37224
-  patch -Np1 -i ../0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('dea684a14ce4e737ccbb90b3ef1b56d6e3db500cc4c11d488bce1bd4c7b87e81')
 
 build() {
   cd $pkgname-$pkgver