From afd7c5a4901fdc74a0087df6d597a4feb4c1e6ca Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Fri, 21 Sep 2018 19:36:46 +0200
Subject: [PATCH] gnome-settings-daemon: update to 3.30.0.

---
 .../patches/fix-crossbuild.patch              | 14 +++++++++++
 srcpkgs/gnome-settings-daemon/template        | 25 ++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/fix-crossbuild.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/fix-crossbuild.patch b/srcpkgs/gnome-settings-daemon/patches/fix-crossbuild.patch
new file mode 100644
index 00000000000..277e252ef87
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/fix-crossbuild.patch
@@ -0,0 +1,14 @@
+--- plugins/power/meson.build
++++ plugins/power/meson.build
+@@ -55,8 +55,9 @@ gsd_power_enums_update = executable(
+   'gsd-power-enums-update',
+   sources,
+   include_directories: top_inc,
+-  dependencies: deps,
+-  c_args: cflags
++  dependencies: [ dependency('glib-2.0', native: true), dependency('gio-2.0', native:true) ],
++  c_args: cflags,
++  native: true,
+ )
+ 
+ if enable_gudev
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 0293c22793a..116683a60e2 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,32 +1,33 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.28.1
+version=3.30.0
 revision=1
 build_style=meson
-hostmakedepends="docbook-xsl glib-devel intltool itstool libxslt pkg-config"
-makedepends="NetworkManager-devel alsa-lib-devel geoclue2-devel
- gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
+hostmakedepends="docbook-xsl glib-devel libglib-devel libxslt perl pkg-config"
+makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel
+ geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
  xf86-input-wacom-devel"
 depends="hicolor-icon-theme pulseaudio"
+checkdepends="elogind libnotify python3-dbusmock python3-gobject
+ python3-pycodestyle"
 short_desc="GNOME settings daemon"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3.0-or-later"
-homepage="https://www.gnome.org"
+homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=594f78e194eb42a6f77785d1a92a4cb9cda54b8c3af6ca0c315b4570d38d2d7d
+checksum=9c084a45909bd35b8d8849918648dfa0357b185d82a1dc05e64011a46f9f6463
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"
-	pre_configure() {
-		# The power plugin requires compilating gsd-power-enums-update
-		# and running it, which is impossible when cross-compiling, so
-		# we disable it on the meson.build
-		sed -i "/\['power', 'Power'\],/d" plugins/meson.build
-	}
 fi
 
+post_extract() {
+	# drop flaky test
+	sed "/test(/d" -i plugins/color/meson.build
+}
+
 gnome-settings-daemon-devel_package() {
 	depends="libglib-devel"
 	short_desc+=" - development files"