testing/gnome-settings-daemon: upgrade to 3.26.0, modernize APKBUILD

3 files changed, 118 insertions, 8 deletions

diff --git a/testing/gnome-settings-daemon/APKBUILD b/testing/gnome-settings-daemon/APKBUILD
index 3232d771e7..0d4ef2c7b5 100644
--- a/testing/gnome-settings-daemon/APKBUILD
+++ b/testing/gnome-settings-daemon/APKBUILD
@@ -1,17 +1,22 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnome-settings-daemon
-pkgver=3.24.2
+pkgver=3.26.0
 pkgrel=0
 pkgdesc="GNOME settings daemon"
 url="http://www.gnome.org/"
 arch="all"
 license="GPL"
-depends=""
-depends_dev="gnome-desktop-dev libnotify-dev libcanberra-dev colord-dev geoclue-dev libgweather-dev geocode-glib-dev pulseaudio-dev upower-dev libwacom-dev cups-dev networkmanager-dev"
-makedepends="$depends_dev"
-install=""
+options="!check"
+depends_dev="gnome-desktop-dev libnotify-dev
+	libcanberra-dev colord-dev geoclue-dev
+	libgweather-dev geocode-glib-dev
+	pulseaudio-dev upower-dev libwacom-dev
+	cups-dev networkmanager-dev"
+makedepends="$depends_dev libxml2-utils"
 subpackages="$pkgname-dev $pkgname-lang"
-source="http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/${pkgver%.*}/gnome-settings-daemon-$pkgver.tar.xz"
+source="http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/${pkgver%.*}/gnome-settings-daemon-$pkgver.tar.xz
+initial-keyboard.patch
+no-wayland-support.patch"
 builddir="$srcdir/gnome-settings-daemon-$pkgver"
 
 build() {
@@ -20,9 +25,11 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--enable-static=no \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-wayland
 	make
 }
 
@@ -31,4 +38,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12  gnome-settings-daemon-3.24.2.tar.xz"
+sha512sums="4338c097fa6bd148ae6ce4b6b04609ccaa6b896dd65cbecbc3a16fdae186e926860cbebddc1aab21c3c9c7af1b68000f0a69cbc7887c4533aade2a0cfd9780bb  gnome-settings-daemon-3.26.0.tar.xz
+235986a8fdbaaebfb5a8d351532ea6621c4359bccd34f45f3addbe1b8ec051f6c52487b947a4db881441f8f8f484e5ddb26b4501ae34ee7444c73004526ab0b7  initial-keyboard.patch
+3c4403afdc40ff565d0c53af24aad17038dde93d97b3996c318094bc21dc7576a4f603b4744a42325b154e3e123ff6f04a9f3c2523879f07a64dc8efbd6e912d  no-wayland-support.patch"
diff --git a/testing/gnome-settings-daemon/initial-keyboard.patch b/testing/gnome-settings-daemon/initial-keyboard.patch
new file mode 100644
index 0000000000..7a08b7fbd8
--- /dev/null
+++ b/testing/gnome-settings-daemon/initial-keyboard.patch
@@ -0,0 +1,67 @@
+From c2e0c03c03f47da9b117db0ba876732e84dcf0c4 Mon Sep 17 00:00:00 2001
+From: Federico Mena Quintero <federico@gnome.org>
+Date: Mon, 16 May 2016 19:18:43 -0500
+Subject: [PATCH] Resurrect the code from upstream to set the default keyboard
+ from XKB if there is one.
+
+Suse works differently than GNOME here; we set a default keyboard from
+the system's configuration instead of letting GNOME take care of
+everything itself.
+
+https://bugzilla.suse.com/show_bug.cgi?id=979051
+---
+ plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
+index eb75c92..06be608 100644
+--- a/plugins/keyboard/gsd-keyboard-manager.c
++++ b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -450,7 +450,7 @@ input_sources_changed (GSettings          *settings,
+ }
+ 
+ static void
+-get_sources_from_xkb_config (GsdKeyboardManager *manager)
++get_sources_from_xkb_config (GsdKeyboardManager *manager, gboolean running_under_gdm)
+ {
+         GsdKeyboardManagerPrivate *priv = manager->priv;
+         GVariantBuilder builder;
+@@ -501,7 +501,7 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+ 
+         init_builder_with_sources (&builder, priv->input_sources_settings);
+ 
+-        if (!layouts) {
++        if (!layouts && running_under_gdm) {
+                 g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
+                 goto out;
+ 	}
+@@ -653,15 +653,23 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
+ 
+         settings = manager->priv->input_sources_settings;
+ 
+-        if (g_getenv ("RUNNING_UNDER_GDM"))
+-                return;
++        if (g_getenv ("RUNNING_UNDER_GDM")) {
++                GVariantBuilder builder;
++                /* clean the settings and get them from the "system" */
++                g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
++                g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++                get_sources_from_xkb_config (manager, TRUE);
++
++                g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, NULL);
++                get_options_from_xkb_config (manager);
++        }
+ 
+         maybe_convert_old_settings (settings);
+ 
+         /* if we still don't have anything do some educated guesses */
+         sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+         if (g_variant_n_children (sources) < 1)
+-                get_sources_from_xkb_config (manager);
++                get_sources_from_xkb_config (manager, FALSE);
+         g_variant_unref (sources);
+ 
+         options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
+-- 
+2.1.4
+
diff --git a/testing/gnome-settings-daemon/no-wayland-support.patch b/testing/gnome-settings-daemon/no-wayland-support.patch
new file mode 100644
index 0000000000..3a55ef2afd
--- /dev/null
+++ b/testing/gnome-settings-daemon/no-wayland-support.patch
@@ -0,0 +1,34 @@
+
+Note: This is needed since gtk+3.0 is not compiled with the option :   --enable-wayland-backend
+therefore, the gdk/gdkwayland.h is not included in gtk+3.0-dev package.
+fcolista@alpinelinux.org
+
+diff '--exclude=.git' -urN a/plugins/common/gsd-device-manager-udev.c b/plugins/common/gsd-device-manager-udev.c
+--- a/plugins/common/gsd-device-manager-udev.c	2017-07-22 12:29:49.000000000 -0400
++++ b/plugins/common/gsd-device-manager-udev.c	2017-07-27 05:25:11.728250282 -0400
+@@ -24,7 +24,9 @@
+ #include <string.h>
+ #include <gudev/gudev.h>
+ 
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ #include "gsd-device-manager-udev.h"
+ 
+ struct _GsdUdevDeviceManager
+@@ -233,6 +235,7 @@
+ gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
+ 				       GdkDevice	*gdk_device)
+ {
++#ifdef GDK_WINDOWING_WAYLAND
+ 	const gchar *node_path;
+ 	GHashTableIter iter;
+ 	GsdDevice *device;
+@@ -249,6 +252,7 @@
+ 			return device;
+ 		}
+ 	}
++#endif
+ 
+ 	return NULL;
+ }