diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-18 02:04:45 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-18 02:04:45 +0000 |
| commit | 41a9d152aab6548458f9614700de01c5c1491c96 (patch) | |
| tree | b18a8f7ded945427958383892fa212253bac0037 /user/dconf/meson.patch | |
| parent | b28b8cff52449ed420e617b4a86873a4b7664afe (diff) | |
| parent | 67a23db468213102907aed26ad6da8e171448cae (diff) | |
| download | packages-41a9d152aab6548458f9614700de01c5c1491c96.tar.gz packages-41a9d152aab6548458f9614700de01c5c1491c96.tar.bz2 packages-41a9d152aab6548458f9614700de01c5c1491c96.tar.xz packages-41a9d152aab6548458f9614700de01c5c1491c96.zip | |
Merge branch 'bumps.aerdan.20200408' into 'master'
Bumps for packages maintained by Kiyoshi Aman for 8 April 2020
See merge request adelie/packages!429
Diffstat (limited to 'user/dconf/meson.patch')
| -rw-r--r-- | user/dconf/meson.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/user/dconf/meson.patch b/user/dconf/meson.patch deleted file mode 100644 index 77d980e31..000000000 --- a/user/dconf/meson.patch +++ /dev/null @@ -1,35 +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 ---- 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.24.1 - |