| 1 |
commit: f258f8359d0110365291cede0dbc600ae958f2db |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Wed Apr 14 17:05:06 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 14 22:28:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f258f835 |
| 7 |
|
| 8 |
gnome-base/dconf: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/20379 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
.../dconf/files/0.32.0-meson-0.52-compat.patch | 35 ---------------------- |
| 15 |
1 file changed, 35 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 7b5d8c5aefc..00000000000 |
| 20 |
--- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,35 +0,0 @@ |
| 23 |
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Diego Escalante Urrelo <diegoe@×××××.org> |
| 25 |
-Date: Thu, 31 Oct 2019 05:51:22 -0500 |
| 26 |
-Subject: [PATCH] build: Update use of link_whole for meson-0.52 |
| 27 |
- |
| 28 |
-A regression in meson-0.52 caused uses of link_whole to expose scenarios |
| 29 |
-where duplicate symbols issues could appear. In particular |
| 30 |
-libdconf_client_dep was being link_whole'd to itself, which recursively |
| 31 |
-already included libdconf_common which was also a link_whole. |
| 32 |
- |
| 33 |
-This change does not modify the available symbols in libdconf.so, and is |
| 34 |
-compatible with meson-0.52 and 0.51. |
| 35 |
- |
| 36 |
-See: https://github.com/mesonbuild/meson/pull/6030 |
| 37 |
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59 |
| 38 |
---- |
| 39 |
- client/meson.build | 2 +- |
| 40 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 41 |
- |
| 42 |
-diff --git a/client/meson.build b/client/meson.build |
| 43 |
-index f3b7122..de6387e 100644 |
| 44 |
---- a/client/meson.build |
| 45 |
-+++ b/client/meson.build |
| 46 |
-@@ -28,7 +28,7 @@ libdconf_client = static_library( |
| 47 |
- |
| 48 |
- libdconf_client_dep = declare_dependency( |
| 49 |
- dependencies: gio_dep, |
| 50 |
-- link_whole: libdconf_client, |
| 51 |
-+ link_with: libdconf_client, |
| 52 |
- ) |
| 53 |
- |
| 54 |
- libdconf = shared_library( |
| 55 |
--- |
| 56 |
-2.20.1 |
| 57 |
- |
Archives