From 2b6bd7c1f6e820895fd271812fa472903936aacb Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Sat, 13 Mar 2021 02:43:41 -0300
Subject: main/dconf: upgrade to 0.40.0

---
 main/dconf/APKBUILD               | 23 ++++++++++-----------
 main/dconf/systemd-userunit.patch | 42 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 main/dconf/systemd-userunit.patch

diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index fbfe2359e9d..3f386bb648c 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=dconf
-pkgver=0.38.0
+pkgver=0.40.0
 pkgrel=0
-pkgdesc="A low-level configuration system."
+pkgdesc="low-level configuration system"
 url="https://wiki.gnome.org/Projects/dconf"
 arch="all"
 license="LGPL-2.1-or-later"
 makedepends="glib-dev dbus-dev docbook-xsl vala libxml2-dev meson
 	py3-setuptools bash-completion"
 checkdepends="dbus"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion"
+source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
+	systemd-userunit.patch
+	"
 
 build() {
 	abuild-meson . output
@@ -26,12 +30,5 @@ package() {
 	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-bashcomp() {
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname-$pkgver-r$pkgrel bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
-}
-
-sha512sums="795f723f34a8406a06323870f8425ca579bbc751c1661db02e170532f6a2653aee749cbb84ad4d7e5a84a07c0caf2662a868b34b6f0d383361c0ff1ad9aed355  dconf-0.38.0.tar.xz"
+sha512sums="71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a  dconf-0.40.0.tar.xz
+320cafc3229c0f5e90f468c948e9a9d1499f69a40cea13c9d75e33d96c9fbef1584b1507fbcdb7ca12f967eb925a399a7bc0805d6f62af52ef3de7dfefee4242  systemd-userunit.patch"
diff --git a/main/dconf/systemd-userunit.patch b/main/dconf/systemd-userunit.patch
new file mode 100644
index 00000000000..24dfeca938b
--- /dev/null
+++ b/main/dconf/systemd-userunit.patch
@@ -0,0 +1,42 @@
+From b643f31976d92f67e9fab863836f74ccf41c75d5 Mon Sep 17 00:00:00 2001
+From: Leo <thinkabit.ukim@gmail.com>
+Date: Sat, 13 Mar 2021 02:52:44 -0300
+Subject: [PATCH] build: don't install systemd service unless systemd is found
+
+avoids installing useless files when compiling on non-systemd systems
+like Alpine Linux and Void Linux
+---
+ service/meson.build | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/service/meson.build b/service/meson.build
+index a2045e5..214b74f 100644
+--- a/service/meson.build
++++ b/service/meson.build
+@@ -10,14 +10,16 @@ configure_file(
+   install_dir: dbus_session_service_dir,
+ )
+ 
+-systemd_service = 'dconf.service'
++if systemd_dep.found()
++  systemd_service = 'dconf.service'
+ 
+-configure_file(
+-  input: systemd_service + '.in',
+-  output: systemd_service,
+-  configuration: service_conf,
+-  install_dir: systemd_userunitdir,
+-)
++  configure_file(
++    input: systemd_service + '.in',
++    output: systemd_service,
++    configuration: service_conf,
++    install_dir: systemd_userunitdir,
++  )
++endif
+ 
+ lib_sources = [
+   'dconf-blame.c',
+-- 
+GitLab
+
-- 
cgit v1.2.3