From d1d506eeef8b273fa2f0f2791047c4396bae683d Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman@gmail.com>
Date: Wed, 8 Apr 2020 07:17:08 +0000
Subject: user/dconf: upgrade to 0.36.0

---
 user/dconf/APKBUILD    |  9 +++------
 user/dconf/meson.patch | 35 -----------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 user/dconf/meson.patch

(limited to 'user')

diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD
index 3495c4f93..98f8bd549 100644
--- a/user/dconf/APKBUILD
+++ b/user/dconf/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=dconf
-pkgver=0.34.0
+pkgver=0.36.0
 pkgrel=0
 pkgdesc="Configuration management for the Gnome desktop environment"
 url="https://gnome.org"
@@ -12,9 +12,7 @@ depends="dbus"
 makedepends="meson ninja
 	bash-completion dbus-dev docbook-xsl libxslt-dev python3-dev vala-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
-	meson.patch
-	"
+source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
 
 build() {
 	meson \
@@ -32,5 +30,4 @@ package() {
 	DESTDIR="$pkgdir" ninja -C build install
 }
 
-sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743  dconf-0.34.0.tar.xz
-be807b17c20c829b307da2df23252893f99f47845825328a0b1880aad9d97f85fe1d66be3903e8c1cc62bb6daa2baf1462bc09daf397c31394e7159ede07d58c  meson.patch"
+sha512sums="fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d  dconf-0.36.0.tar.xz"
diff --git a/user/dconf/meson.patch b/user/dconf/meson.patch
deleted file mode 100644
index 77d980e31..000000000
--- a/user/dconf/meson.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <diegoe@gnome.org>
-Date: Thu, 31 Oct 2019 05:51:22 -0500
-Subject: [PATCH] build: Update use of link_whole for meson-0.52
-
-A regression in meson-0.52 caused uses of link_whole to expose scenarios
-where duplicate symbols issues could appear. In particular
-libdconf_client_dep was being link_whole'd to itself, which recursively
-already included libdconf_common which was also a link_whole.
-
-This change does not modify the available symbols in libdconf.so, and is
-compatible with meson-0.52 and 0.51.
-
-See: https://github.com/mesonbuild/meson/pull/6030
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
----
- client/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/meson.build b/client/meson.build
-index f3b7122..de6387e 100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
- 
- libdconf_client_dep = declare_dependency(
-   dependencies: gio_dep,
--  link_whole: libdconf_client,
-+  link_with: libdconf_client,
- )
- 
- libdconf = shared_library(
--- 
-2.24.1
-
-- 
cgit v1.2.3-70-g09d2