From 9294da37f820a898c556c4db2b3b855703bef5fe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Oct 2019 17:59:34 +0200 Subject: [PATCH] dconf: Fix build with meson 0.52 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Richard Purdie 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 Signed-off-by: Khem Raj --- .../dconf/dconf/fix-meson-0.52.patch | 25 +++++++++++++++++++ .../recipes-gnome/dconf/dconf_0.34.0.bb | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch 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 0000000000..485c46509c --- /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 + +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 a1996a1a37..ef549432e8 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"