diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-10 21:00:54 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-10 17:27:33 -0300 |
| commit | 8695ef64a28866ff8f56b71cb2c924d2ed4663fe (patch) | |
| tree | e7e6e3ca408288e867ff816057e17d63b8308c5e /main/dconf | |
| parent | 672f75ca5f5562f95ab35778287af25da1b99013 (diff) | |
| download | aports-8695ef64a28866ff8f56b71cb2c924d2ed4663fe.tar.bz2 aports-8695ef64a28866ff8f56b71cb2c924d2ed4663fe.tar.xz | |
main/dconf: upgrade to 0.36.0
Diffstat (limited to 'main/dconf')
| -rw-r--r-- | main/dconf/APKBUILD | 10 | ||||
| -rw-r--r-- | main/dconf/build-Update-use-of-link_whole-for-meson-0.52.patch | 35 |
2 files changed, 4 insertions, 41 deletions
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD index c711cf888b..f6a2562429 100644 --- a/main/dconf/APKBUILD +++ b/main/dconf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=dconf -pkgver=0.34.0 -pkgrel=3 +pkgver=0.36.0 +pkgrel=0 pkgdesc="A low-level configuration system." url="https://wiki.gnome.org/Projects/dconf" arch="all" @@ -11,8 +11,7 @@ makedepends="glib-dev dbus-dev docbook-xsl vala gtk+3.0-dev 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 - build-Update-use-of-link_whole-for-meson-0.52.patch" +source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz" build() { meson \ @@ -39,5 +38,4 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share } -sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz -1f0e2e77cc8410704590586ee3f6f2cde9e82dc25a6a43ff3a2accaa43b8f26c49bcd0d080ed44d73b56308829a7bf2dc2d7c67f5029a064d7dee9dac061bc83 build-Update-use-of-link_whole-for-meson-0.52.patch" +sha512sums="fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d dconf-0.36.0.tar.xz" diff --git a/main/dconf/build-Update-use-of-link_whole-for-meson-0.52.patch b/main/dconf/build-Update-use-of-link_whole-for-meson-0.52.patch deleted file mode 100644 index a4e74044f7..0000000000 --- a/main/dconf/build-Update-use-of-link_whole-for-meson-0.52.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.22.0 - |