mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
dconf: update to 0.36.0.
This commit is contained in:
parent
c7891063fb
commit
ec5d32bd91
2 changed files with 2 additions and 34 deletions
|
@ -1,32 +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
|
|
||||||
--- client/meson.build
|
|
||||||
+++ 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(
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'dconf'
|
# Template file for 'dconf'
|
||||||
pkgname=dconf
|
pkgname=dconf
|
||||||
version=0.32.0
|
version=0.36.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
|
hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="LGPL-2.1-or-later"
|
license="LGPL-2.1-or-later"
|
||||||
homepage="https://wiki.gnome.org/Projects/dconf"
|
homepage="https://wiki.gnome.org/Projects/dconf"
|
||||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab
|
checksum=9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d
|
||||||
|
|
||||||
dconf-devel_package() {
|
dconf-devel_package() {
|
||||||
depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"
|
depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"
|
||||||
|
|
Loading…
Add table
Reference in a new issue