summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-05-29 19:59:07 +0200
committerAaron Bauman <bman@gentoo.org>2020-06-02 00:26:47 -0400
commite0c2f154351c0e45890054356490ab3501342b9f (patch)
treeb958ab81d6c0a3cbd25b814106dfc1caf060a1c4 /mail-client
parentdev-vcs/stgit: stable 0.21 for x86 (diff)
downloadgentoo-e0c2f154351c0e45890054356490ab3501342b9f.tar.gz
gentoo-e0c2f154351c0e45890054356490ab3501342b9f.tar.bz2
gentoo-e0c2f154351c0e45890054356490ab3501342b9f.zip
mail-client/evolution: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16005 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch88
-rw-r--r--mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch29
-rw-r--r--mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch26
3 files changed, 0 insertions, 143 deletions
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
deleted file mode 100644
index 54a5fc714def..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Mon, 22 Jul 2019 16:06:21 +0800
-Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line
-
-When a library provides no way to find linker flags for linking with it,
-the build system usually depends on the user to necessary put -L flags
-in LDFLAGS environment variable in order to find it. However, GtkDoc
-module constructs the command line by itself, and it forgets to add
-LDFLAGS to the command line of gtkdoc-scangobj.
-
-It is especially important to include LDFLAGS on non-GNU systems. For
-example, FreeBSD libc doesn't include a gettext implementation. GLib
-requires gettext, and it pulls in an external gettext runtime for it.
-However, gettext-runtime doesn't include a .pc file, so LDFLAGS is
-required if gettext-runtime isn't installed in the same prefix as GLib.
-Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can
-result in a linking error because -lintl cannot be found.
-
-In evolution-data-server we are lucky most of the time because it
-depends on a lot of external libraries. These external libraries are
-likely to be installed in the same prefix as gettext-runtime, so not
-using LDFLAGS doesn't cause linking failure because required flags are
-already pulled in by other libraries. In fact, this problem was found
-when building libical, which uses a similar GtkDoc.cmake file.
-
-In addition to the change to include LDFLAGS, this commit also changes
-the following things:
-
- - Instead of constructing _scangobj_ldflags in reverse order, do it in
- normal order. Appending is easier to understand than prepending, and
- the linker also interprets -L and -l flags in normal order.
-
- - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment
- says, and it is expected to work because we no longer constructs
- _scangobj_ldflags in reverse order.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index cc6cc007a..0ba1a7a78 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- list(APPEND _scangobj_deps ${opt})
- endforeach(opt)
-
-- # Add them as the last, thus in-tree headers/libs have precedence
-+ # Add it as the last, thus in-tree headers have precedence
- list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
-- list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR})
-
- if(_scangobj_deps)
- list(REMOVE_DUPLICATES _scangobj_deps)
-@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- if(NOT _output_name)
- set(_output_name ${opt})
- endif(NOT _output_name)
-- set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}")
-+ set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}")
-
- if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY"))
- set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>")
-@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- endif(TARGET ${opt})
- endforeach(opt)
-
-+ # Add extra flags from LDFLAGS environment variable
-+ set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}")
-+
- foreach(opt IN LISTS _scangobj_deps)
- if(NOT TARGET ${opt})
- set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
- endif(NOT TARGET ${opt})
- endforeach(opt)
-
-+ # Add it as the last, thus in-tree libs have precedence
-+ set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}")
-+
- set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
-
- if(NOT (_scangobj_cflags STREQUAL ""))
---
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
deleted file mode 100644
index 56e66eae8938..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 5 Aug 2019 12:55:23 +0200
-Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line
-
-The LDFLAGS could imply certain compile options being used (like -fPIC),
-but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation
-could fail.
-
-Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index 0ba1a7a78..2dfc4d691 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
-
- # Add it as the last, thus in-tree headers have precedence
- list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
-+ list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
-
- if(_scangobj_deps)
- list(REMOVE_DUPLICATES _scangobj_deps)
---
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
deleted file mode 100644
index 192f4d0d3d8c..000000000000
--- a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 66aeb5aeb4065f6a5482d10bacbe370de2e49b7f Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Dec 2019 15:47:32 +0200
-Subject: [PATCH] Add env var workaround for WebKitGTK-2.26 compatibility
-
----
- src/shell/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/shell/main.c b/src/shell/main.c
-index abc140d55f..cd671fd89a 100644
---- a/src/shell/main.c
-+++ b/src/shell/main.c
-@@ -607,6 +607,9 @@ main (gint argc,
- * it already set, thus he/she can override the Evolution's default. */
- g_setenv ("WEBKIT_DISABLE_COMPOSITING_MODE", "1", FALSE);
-
-+ /* Workaround issues with WebKitGTK 2.26 */
-+ g_setenv ("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", FALSE);
-+
- /* FIXME WK2 - Look if we still need this it looks like it's not. */
- /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */
- g_type_ensure (WEBKIT_TYPE_WEB_VIEW);
---
-2.20.1
-