[oe-commits] [meta-openembedded] 08/09: dconf: Fix build with meson 0.52
git at git.openembedded.org
git at git.openembedded.org
Mon Oct 21 11:31:08 UTC 2019
This is an automated email from the git hooks/post-receive script.
khem pushed a commit to branch master-next
in repository meta-openembedded.
commit a621166533d27d4235db7019f6a9efeda46e47ae
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sun Oct 20 17:59:34 2019 +0200
dconf: Fix build with meson 0.52
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Slightly adjusted patch sent to mailing list [1]
[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-October/288108.html
Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
.../recipes-gnome/dconf/dconf/fix-meson-0.52.patch | 25 ++++++++++++++++++++++
meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb | 2 ++
2 files changed, 27 insertions(+)
diff --git a/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch b/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
new file mode 100644
index 0000000..485c465
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
@@ -0,0 +1,25 @@
+With meson 0.52 the build fails due to duplicate symbols. There is a fix
+to meson but the dconf build also needs tweaking.
+
+https://gitlab.gnome.org/GNOME/dconf/issues/59
+https://github.com/mesonbuild/meson/pull/5936
+
+Despite the comments there about this being incorrect, libdconf is unchanged
+between 0.51 and 0.52 and this patch.
+
+Upstream-Status: Pending [under discussion, see above links]
+Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
+
+Index: dconf-0.34.0/client/meson.build
+===================================================================
+--- dconf-0.34.0.orig/client/meson.build
++++ dconf-0.34.0/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(
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
index a1996a1..ef54943 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
@@ -12,6 +12,8 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase bash-completion vala
+SRC_URI += "file://fix-meson-0.52.patch"
+
# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
EXTRA_OEMESON = "-Dman=false"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list