diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2021-04-14 19:05:06 +0200 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2021-04-14 18:28:09 -0400 |
| commit | f258f8359d0110365291cede0dbc600ae958f2db (patch) | |
| tree | 19839863e64414b55a1eca2ff8f3b9b8a996a561 | |
| parent | virtual/jpeg-compat: adopt for codec@ (diff) | |
| download | gentoo-f258f8359d0110365291cede0dbc600ae958f2db.tar.gz gentoo-f258f8359d0110365291cede0dbc600ae958f2db.tar.bz2 gentoo-f258f8359d0110365291cede0dbc600ae958f2db.zip | |
gnome-base/dconf: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/20379
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch deleted file mode 100644 index 7b5d8c5aefc0..000000000000 --- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.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.20.1 - |