From 7ebd50f90b3b7f4e1dc56f07ae7e8e02275d41c8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Oct 2019 13:27:07 +0100 Subject: [PATCH] dconf: Fix build with meson 0.52 Signed-off-by: Richard Purdie --- .../dconf/dconf/fix-meson-0.52.patch | 25 +++++++++++++++++++ .../recipes-gnome/dconf/dconf_0.32.0.bb | 1 + 2 files changed, 26 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 000000000..bca021347 --- /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.32.0/client/meson.build +=================================================================== +--- dconf-0.32.0.orig/client/meson.build ++++ dconf-0.32.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.32.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb index 8d1bbdfd1..fec04079e 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb @@ -3,6 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" +SRC_URI += "file://fix-meson-0.52.patch" SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" -- 2.17.1