[arch-commits] Commit in gnome-settings-daemon/repos (10 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sat Nov 16 12:18:40 UTC 2013
Date: Saturday, November 16, 2013 @ 13:18:40
Author: heftig
Revision: 199789
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-settings-daemon/repos/extra-i686/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
(from rev 199788, gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
gnome-settings-daemon/repos/extra-i686/PKGBUILD
(from rev 199788, gnome-settings-daemon/trunk/PKGBUILD)
gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install
(from rev 199788, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
gnome-settings-daemon/repos/extra-x86_64/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
(from rev 199788, gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
(from rev 199788, gnome-settings-daemon/trunk/PKGBUILD)
gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install
(from rev 199788, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
Deleted:
gnome-settings-daemon/repos/extra-i686/PKGBUILD
gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install
gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install
--------------------------------------------------------------------------+
/PKGBUILD | 90 ++++++++++
/gnome-settings-daemon.install | 24 ++
extra-i686/0001-power-use-gnome_rr_output_get_min_backlight_step.patch | 37 ++++
extra-i686/PKGBUILD | 36 ----
extra-i686/gnome-settings-daemon.install | 12 -
extra-x86_64/0001-power-use-gnome_rr_output_get_min_backlight_step.patch | 37 ++++
extra-x86_64/PKGBUILD | 36 ----
extra-x86_64/gnome-settings-daemon.install | 12 -
8 files changed, 188 insertions(+), 96 deletions(-)
Copied: gnome-settings-daemon/repos/extra-i686/0001-power-use-gnome_rr_output_get_min_backlight_step.patch (from rev 199788, gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
===================================================================
--- extra-i686/0001-power-use-gnome_rr_output_get_min_backlight_step.patch (rev 0)
+++ extra-i686/0001-power-use-gnome_rr_output_get_min_backlight_step.patch 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,37 @@
+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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
+++ extra-i686/PKGBUILD 2013-11-16 12:18:40 UTC (rev 199789)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.10.2
-pkgrel=1
-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'
- '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=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-settings-daemon/repos/extra-i686/PKGBUILD (from rev 199788, gnome-settings-daemon/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-settings-daemon
+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'
+ '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
+ 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
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/gnome-settings-daemon.install
===================================================================
--- extra-i686/gnome-settings-daemon.install 2013-11-16 12:17:37 UTC (rev 199788)
+++ extra-i686/gnome-settings-daemon.install 2013-11-16 12:18:40 UTC (rev 199789)
@@ -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
-}
Copied: gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install (from rev 199788, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===================================================================
--- extra-i686/gnome-settings-daemon.install (rev 0)
+++ extra-i686/gnome-settings-daemon.install 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,12 @@
+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
+}
Copied: gnome-settings-daemon/repos/extra-x86_64/0001-power-use-gnome_rr_output_get_min_backlight_step.patch (from rev 199788, gnome-settings-daemon/trunk/0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
===================================================================
--- extra-x86_64/0001-power-use-gnome_rr_output_get_min_backlight_step.patch (rev 0)
+++ extra-x86_64/0001-power-use-gnome_rr_output_get_min_backlight_step.patch 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,37 @@
+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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-16 12:17:37 UTC (rev 199788)
+++ extra-x86_64/PKGBUILD 2013-11-16 12:18:40 UTC (rev 199789)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.10.2
-pkgrel=1
-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'
- '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=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-settings-daemon/repos/extra-x86_64/PKGBUILD (from rev 199788, gnome-settings-daemon/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-settings-daemon
+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'
+ '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
+ 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
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/gnome-settings-daemon.install
===================================================================
--- extra-x86_64/gnome-settings-daemon.install 2013-11-16 12:17:37 UTC (rev 199788)
+++ extra-x86_64/gnome-settings-daemon.install 2013-11-16 12:18:40 UTC (rev 199789)
@@ -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
-}
Copied: gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install (from rev 199788, gnome-settings-daemon/trunk/gnome-settings-daemon.install)
===================================================================
--- extra-x86_64/gnome-settings-daemon.install (rev 0)
+++ extra-x86_64/gnome-settings-daemon.install 2013-11-16 12:18:40 UTC (rev 199789)
@@ -0,0 +1,12 @@
+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
+}
More information about the arch-commits
mailing list