[gnome-build-meta/abderrahim/fdsdk-19.08.9-34] sdk/dconf.bst: add patch to build against latest meson
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/fdsdk-19.08.9-34] sdk/dconf.bst: add patch to build against latest meson
- Date: Sat, 21 Mar 2020 07:38:39 +0000 (UTC)
commit 6d9848603aefac48372a2f26dc1d333ffb50be86
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Sat Mar 21 07:22:02 2020 +0100
sdk/dconf.bst: add patch to build against latest meson
backported from upstream
elements/sdk/dconf.bst | 2 ++
...d-Update-use-of-link_whole-for-meson-0.52.patch | 35 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
---
diff --git a/elements/sdk/dconf.bst b/elements/sdk/dconf.bst
index 5052a979..5cefe9bd 100644
--- a/elements/sdk/dconf.bst
+++ b/elements/sdk/dconf.bst
@@ -3,6 +3,8 @@ sources:
- kind: tar
url: gnome_downloads:dconf/0.34/dconf-0.34.0.tar.xz
ref: 943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52
+- kind: patch
+ path: files/dconf/0001-build-Update-use-of-link_whole-for-meson-0.52.patch
- kind: patch
path: files/dconf/dconf-override.patch
depends:
diff --git a/files/dconf/0001-build-Update-use-of-link_whole-for-meson-0.52.patch
b/files/dconf/0001-build-Update-use-of-link_whole-for-meson-0.52.patch
new file mode 100644
index 00000000..39b631fb
--- /dev/null
+++ b/files/dconf/0001-build-Update-use-of-link_whole-for-meson-0.52.patch
@@ -0,0 +1,35 @@
+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.26.0.rc2
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]