Initial import

4 files changed, 183 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..0bdcbbb12894
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,42 @@
+# Generated by makepkg 4.2.1
+# Fri May 29 10:19:14 UTC 2015
+pkgbase = gnome-settings-daemon-volume-step-patch
+	pkgdesc = The GNOME Settings daemon with an additional patch to allow configuration of volume steps
+	pkgver = 3.16.2
+	pkgrel = 1
+	url = http://www.gnome.org
+	install = gnome-settings-daemon.install
+	arch = i686
+	arch = x86_64
+	groups = gnome
+	license = GPL
+	makedepends = intltool
+	makedepends = xf86-input-wacom
+	makedepends = libxslt
+	makedepends = docbook-xsl
+	depends = dconf
+	depends = gnome-desktop
+	depends = gsettings-desktop-schemas
+	depends = hicolor-icon-theme
+	depends = libcanberra-pulse
+	depends = libnotify
+	depends = libsystemd
+	depends = libwacom
+	depends = pulseaudio
+	depends = pulseaudio-alsa
+	depends = upower
+	depends = librsvg
+	depends = libgweather
+	depends = geocode-glib
+	depends = geoclue2
+	depends = nss
+	provides = gnome-settings-daemon
+	conflicts = gnome-settings-daemon
+	options = !emptydirs
+	source = http://ftp.gnome.org/pub/gnome/sources/gnome-settings-daemon/3.16/gnome-settings-daemon-3.16.2.tar.xz
+	source = volume-step.patch
+	sha256sums = d8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a
+	sha256sums = bb1ac714e05d6b7b2c3e8a03180a580f9d8e65356a3fd70c3e8f5ba1d15bbb03
+
+pkgname = gnome-settings-daemon-volume-step-patch
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..78e301689282
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,54 @@
+rplname=gnome-settings-daemon
+pkgname=gnome-settings-daemon-volume-step-patch
+pkgver=3.16.2
+pkgrel=1
+pkgdesc="The GNOME Settings daemon with an additional patch to allow configuration of volume steps"
+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' 'librsvg' 'libgweather' 'geocode-glib'
+	'geoclue2' 'nss'
+)
+makedepends=(
+	'intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl'
+)
+provides=('gnome-settings-daemon')
+conflicts=('gnome-settings-daemon')
+options=('!emptydirs')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+groups=('gnome')
+source=(
+	http://ftp.gnome.org/pub/gnome/sources/$rplname/${pkgver:0:4}/$rplname-$pkgver.tar.xz
+	volume-step.patch
+)
+sha256sums=(
+	'd8d536584ebb8fb1403050eb65e7ee3328eba14b123542369ff1917e727fa69a'
+	'bb1ac714e05d6b7b2c3e8a03180a580f9d8e65356a3fd70c3e8f5ba1d15bbb03'
+)
+
+prepare() {
+	cd $rplname-$pkgver
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=650371#c42
+	patch -p1 -i ../volume-step.patch
+}
+
+build() {
+	cd $rplname-$pkgver
+
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+			--libexecdir=/usr/lib/$rplname --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 $rplname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-settings-daemon.install b/gnome-settings-daemon.install
new file mode 100644
index 000000000000..f7e8c46ac846
--- /dev/null
+++ b/gnome-settings-daemon.install
@@ -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
+}
diff --git a/volume-step.patch b/volume-step.patch
new file mode 100644
index 000000000000..69a99e0ee3f6
--- /dev/null
+++ b/volume-step.patch
@@ -0,0 +1,75 @@
+diff -rupN old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+--- old/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2015-05-04 15:32:57.000000000 +0200
++++ new/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2015-05-29 11:55:56.423075521 +0200
+@@ -124,5 +124,11 @@
+       <_summary>Priority to use for this plugin</_summary>
+       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+     </key>
++    <key name="volume-step" type="i">
++      <default>6</default>
++      <range min="1" max="20"/>
++      <_summary>Size of volume step</_summary>
++      <_description>Size of the volume step for each consecutive press of the volume up or volume down key</_description>
++    </key>
+   </schema>
+ </schemalist>
+diff -rupN old/plugins/media-keys/gsd-media-keys-manager.c new/plugins/media-keys/gsd-media-keys-manager.c
+--- old/plugins/media-keys/gsd-media-keys-manager.c	2015-05-04 15:32:57.000000000 +0200
++++ new/plugins/media-keys/gsd-media-keys-manager.c	2015-05-29 12:04:31.312850233 +0200
+@@ -102,10 +102,11 @@ static const gchar introspection_xml[] =
+ #define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
+ #define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
+ #define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
++#define SETTINGS_SOUND_DIR "org.gnome.settings-daemon.plugins.sound"
+ #define TOUCHPAD_ENABLED_KEY "send-events"
++#define VOLUME_STEP_KEY "volume-step"
+ #define HIGH_CONTRAST "HighContrast"
+ 
+-#define VOLUME_STEP 6           /* percents for one volume button press */
+ #define MAX_VOLUME 65536.0
+ 
+ #define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
+@@ -144,6 +145,7 @@ struct GsdMediaKeysManagerPrivate
+         GvcMixerStream  *source;
+         ca_context      *ca;
+         GtkSettings     *gtksettings;
++        GSettings       *sound_settings;
+ #ifdef HAVE_GUDEV
+         GHashTable      *streams; /* key = X device ID, value = stream id */
+         GUdevClient     *udev_client;
+@@ -1180,7 +1182,7 @@ do_sound_action (GsdMediaKeysManager *ma
+ {
+ 	GvcMixerStream *stream;
+         gboolean old_muted, new_muted;
+-        guint old_vol, new_vol, norm_vol_step;
++        guint old_vol, new_vol, vol_step, norm_vol_step;
+         gboolean sound_changed;
+ 
+         /* Find the stream that corresponds to the device, if any */
+@@ -1199,7 +1201,8 @@ do_sound_action (GsdMediaKeysManager *ma
+         if (stream == NULL)
+                 return;
+ 
+-        norm_vol_step = PA_VOLUME_NORM * VOLUME_STEP / 100;
++        vol_step = g_settings_get_int (manager->priv->sound_settings, VOLUME_STEP_KEY);
++        norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
+ 
+         /* FIXME: this is racy */
+         new_vol = old_vol = gvc_mixer_stream_get_volume (stream);
+@@ -2357,6 +2360,8 @@ start_media_keys_idle_cb (GsdMediaKeysMa
+           g_hash_table_new_full (g_str_hash, g_str_equal,
+                                  g_free, g_object_unref);
+ 
++        manager->priv->sound_settings = g_settings_new (SETTINGS_SOUND_DIR);
++
+         /* for the power plugin interface code */
+         manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);
+ 
+@@ -2460,6 +2465,7 @@ gsd_media_keys_manager_stop (GsdMediaKey
+ 
+         g_clear_object (&priv->logind_proxy);
+         g_clear_object (&priv->settings);
++        g_clear_object (&priv->sound_settings);
+         g_clear_object (&priv->power_settings);
+         g_clear_object (&priv->power_proxy);
+         g_clear_object (&priv->power_screen_proxy);