1 |
commit: 0a846e963e87ae6a37a037c447326831d003ad9b |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 13:50:40 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 14:39:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a846e96 |
7 |
|
8 |
mail-client/evolution: make compatible with webkit-gtk-2.26 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/699156 |
11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
mail-client/evolution/evolution-3.32.5-r1.ebuild | 155 +++++++++++++++++++++ |
15 |
.../files/3.32.5-webkitgtk-2.26-compat.patch | 26 ++++ |
16 |
2 files changed, 181 insertions(+) |
17 |
|
18 |
diff --git a/mail-client/evolution/evolution-3.32.5-r1.ebuild b/mail-client/evolution/evolution-3.32.5-r1.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..7505a1ae344 |
21 |
--- /dev/null |
22 |
+++ b/mail-client/evolution/evolution-3.32.5-r1.ebuild |
23 |
@@ -0,0 +1,155 @@ |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=6 |
28 |
+ |
29 |
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1 |
30 |
+ |
31 |
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality" |
32 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
33 |
+ |
34 |
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
35 |
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" |
36 |
+SLOT="2.0" |
37 |
+ |
38 |
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" |
39 |
+ |
40 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
41 |
+ |
42 |
+# glade-3 support is for maintainers only per configure.ac |
43 |
+# pst is not mature enough and changes API/ABI frequently |
44 |
+# dconf explicitely needed for backup plugin |
45 |
+# gnome-desktop support is optional with --enable-gnome-desktop |
46 |
+# automagic libunity dep |
47 |
+COMMON_DEPEND=" |
48 |
+ >=app-crypt/gcr-3.4:=[gtk] |
49 |
+ >=app-text/enchant-1.6.0:0 |
50 |
+ >=dev-libs/glib-2.46:2[dbus] |
51 |
+ >=dev-libs/libxml2-2.7.3:2 |
52 |
+ >=gnome-base/gnome-desktop-2.91.3:3= |
53 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.92 |
54 |
+ >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] |
55 |
+ >=media-libs/libcanberra-0.25[gtk3] |
56 |
+ >=net-libs/libsoup-2.42:2.4 |
57 |
+ >=net-libs/webkit-gtk-2.16.0:4 |
58 |
+ >=x11-libs/cairo-1.9.15:=[glib] |
59 |
+ >=x11-libs/gdk-pixbuf-2.24:2 |
60 |
+ >=x11-libs/gtk+-3.22:3 |
61 |
+ >=x11-libs/libnotify-0.7:= |
62 |
+ >=x11-misc/shared-mime-info-0.22 |
63 |
+ |
64 |
+ >=app-text/iso-codes-0.49 |
65 |
+ dev-libs/atk |
66 |
+ gnome-base/dconf |
67 |
+ >=dev-libs/libical-3.0.2:= |
68 |
+ x11-libs/libSM |
69 |
+ x11-libs/libICE |
70 |
+ |
71 |
+ archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) |
72 |
+ geolocation? ( |
73 |
+ >=media-libs/libchamplain-0.12:0.12[gtk] |
74 |
+ >=media-libs/clutter-1.0.0:1.0 |
75 |
+ >=media-libs/clutter-gtk-0.90:1.0 |
76 |
+ >=sci-geosciences/geocode-glib-3.10.0 |
77 |
+ x11-libs/mx:1.0 ) |
78 |
+ ldap? ( >=net-nds/openldap-2:= ) |
79 |
+ spell? ( app-text/gtkspell:3 ) |
80 |
+ ssl? ( |
81 |
+ >=dev-libs/nspr-4.6.1:= |
82 |
+ >=dev-libs/nss-3.11:= ) |
83 |
+ weather? ( >=dev-libs/libgweather-3.10:2= ) |
84 |
+ ytnef? ( net-mail/ytnef ) |
85 |
+" |
86 |
+DEPEND="${COMMON_DEPEND} |
87 |
+ app-text/docbook-xml-dtd:4.1.2 |
88 |
+ dev-util/gdbus-codegen |
89 |
+ dev-util/glib-utils |
90 |
+ dev-util/itstool |
91 |
+ gtk-doc? ( dev-util/gtk-doc |
92 |
+ app-text/docbook-xml-dtd:4.3 ) |
93 |
+ >=dev-util/intltool-0.40.0 |
94 |
+ >=sys-devel/gettext-0.18.3 |
95 |
+ virtual/pkgconfig |
96 |
+" |
97 |
+RDEPEND="${COMMON_DEPEND} |
98 |
+ bogofilter? ( mail-filter/bogofilter ) |
99 |
+ highlight? ( app-text/highlight ) |
100 |
+ spamassassin? ( mail-filter/spamassassin ) |
101 |
+ !gnome-extra/evolution-exchange |
102 |
+" |
103 |
+ |
104 |
+DISABLE_AUTOFORMATTING="yes" |
105 |
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit |
106 |
+~/.local/share/applications/mimeapps.list so it includes the |
107 |
+following content: |
108 |
+ |
109 |
+[Default Applications] |
110 |
+x-scheme-handler/http=firefox.desktop |
111 |
+x-scheme-handler/https=firefox.desktop |
112 |
+ |
113 |
+(replace firefox.desktop with the name of the appropriate .desktop |
114 |
+file from /usr/share/applications if you use a different browser)." |
115 |
+ |
116 |
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare |
117 |
+# call; if needed, set them after cmake-utils_src_prepare call, if that works |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch |
121 |
+ eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 3.34, it should be compatible without this hack. |
122 |
+ cmake-utils_src_prepare |
123 |
+ gnome2_src_prepare |
124 |
+} |
125 |
+ |
126 |
+src_configure() { |
127 |
+ # Use NSS/NSPR only if 'ssl' is enabled. |
128 |
+ local mycmakeargs=( |
129 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
130 |
+ -DENABLE_SCHEMAS_COMPILE=OFF |
131 |
+ -DENABLE_GTK_DOC=$(usex gtk-doc) |
132 |
+ -DWITH_OPENLDAP=$(usex ldap) |
133 |
+ -DENABLE_SMIME=$(usex ssl) |
134 |
+ -DENABLE_GNOME_DESKTOP=ON |
135 |
+ -DWITH_ENCHANT_VERSION=1 |
136 |
+ -DENABLE_CANBERRA=ON |
137 |
+ -DENABLE_AUTOAR=$(usex archive) |
138 |
+ -DWITH_HELP=ON |
139 |
+ -DENABLE_YTNEF=OFF |
140 |
+ -DWITH_BOGOFILTER=$(usex bogofilter) |
141 |
+ -DWITH_SPAMASSASSIN=$(usex spamassassin) |
142 |
+ -DENABLE_GTKSPELL=$(usex spell) |
143 |
+ -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) |
144 |
+ -DENABLE_WEATHER=$(usex weather) |
145 |
+ -DENABLE_CONTACT_MAPS=$(usex geolocation) |
146 |
+ -DENABLE_YTNEF=$(usex ytnef) |
147 |
+ -DENABLE_PST_IMPORT=OFF |
148 |
+ -DWITH_GLADE_CATALOG=OFF |
149 |
+ ) |
150 |
+ |
151 |
+ cmake-utils_src_configure |
152 |
+} |
153 |
+ |
154 |
+src_compile() { |
155 |
+ cmake-utils_src_compile |
156 |
+} |
157 |
+ |
158 |
+src_test() { |
159 |
+ cmake-utils_src_test |
160 |
+} |
161 |
+ |
162 |
+src_install() { |
163 |
+ cmake-utils_src_install |
164 |
+ |
165 |
+ # Problems with prelink: |
166 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=731680 |
167 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=732148 |
168 |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1114538 |
169 |
+ echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN} |
170 |
+ doenvd "${T}"/99${PN} |
171 |
+ |
172 |
+ readme.gentoo_create_doc |
173 |
+} |
174 |
+ |
175 |
+pkg_postinst() { |
176 |
+ gnome2_pkg_postinst |
177 |
+ readme.gentoo_print_elog |
178 |
+} |
179 |
|
180 |
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 |
181 |
new file mode 100644 |
182 |
index 00000000000..192f4d0d3d8 |
183 |
--- /dev/null |
184 |
+++ b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch |
185 |
@@ -0,0 +1,26 @@ |
186 |
+From 66aeb5aeb4065f6a5482d10bacbe370de2e49b7f Mon Sep 17 00:00:00 2001 |
187 |
+From: Mart Raudsepp <leio@g.o> |
188 |
+Date: Sun, 29 Dec 2019 15:47:32 +0200 |
189 |
+Subject: [PATCH] Add env var workaround for WebKitGTK-2.26 compatibility |
190 |
+ |
191 |
+--- |
192 |
+ src/shell/main.c | 3 +++ |
193 |
+ 1 file changed, 3 insertions(+) |
194 |
+ |
195 |
+diff --git a/src/shell/main.c b/src/shell/main.c |
196 |
+index abc140d55f..cd671fd89a 100644 |
197 |
+--- a/src/shell/main.c |
198 |
++++ b/src/shell/main.c |
199 |
+@@ -607,6 +607,9 @@ main (gint argc, |
200 |
+ * it already set, thus he/she can override the Evolution's default. */ |
201 |
+ g_setenv ("WEBKIT_DISABLE_COMPOSITING_MODE", "1", FALSE); |
202 |
+ |
203 |
++ /* Workaround issues with WebKitGTK 2.26 */ |
204 |
++ g_setenv ("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", FALSE); |
205 |
++ |
206 |
+ /* FIXME WK2 - Look if we still need this it looks like it's not. */ |
207 |
+ /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */ |
208 |
+ g_type_ensure (WEBKIT_TYPE_WEB_VIEW); |
209 |
+-- |
210 |
+2.20.1 |
211 |
+ |