1 |
commit: 531e80bd475132687f17641d2d6f2fc781416ffe |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 7 22:04:07 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 7 22:08:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531e80bd |
7 |
|
8 |
mail-client/evolution: bump to 3.32.4 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/689582 |
11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
mail-client/evolution/Manifest | 1 + |
15 |
mail-client/evolution/evolution-3.32.4.ebuild | 154 +++++++++++++++++++++ |
16 |
.../evolution/files/3.32.4-gtk-doc-fix1.patch | 88 ++++++++++++ |
17 |
.../evolution/files/3.32.4-gtk-doc-fix2.patch | 29 ++++ |
18 |
4 files changed, 272 insertions(+) |
19 |
|
20 |
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest |
21 |
index 5301d9a2432..c2e8d4461e2 100644 |
22 |
--- a/mail-client/evolution/Manifest |
23 |
+++ b/mail-client/evolution/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1 |
26 |
+DIST evolution-3.32.4.tar.xz 11793452 BLAKE2B bb009a5881cca6724b804a1203d393003f92ef9f6a8fa9692fc42344224b0b2f5def5c05160d46bbf7f76b9ae9bfa1737f78207aee7038540f410df57f7a76cd SHA512 a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931 |
27 |
|
28 |
diff --git a/mail-client/evolution/evolution-3.32.4.ebuild b/mail-client/evolution/evolution-3.32.4.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..d83be2ff5b8 |
31 |
--- /dev/null |
32 |
+++ b/mail-client/evolution/evolution-3.32.4.ebuild |
33 |
@@ -0,0 +1,154 @@ |
34 |
+# Copyright 1999-2019 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1 |
40 |
+ |
41 |
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality" |
42 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
43 |
+ |
44 |
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
45 |
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" |
46 |
+SLOT="2.0" |
47 |
+ |
48 |
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" |
49 |
+ |
50 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
51 |
+ |
52 |
+# glade-3 support is for maintainers only per configure.ac |
53 |
+# pst is not mature enough and changes API/ABI frequently |
54 |
+# dconf explicitely needed for backup plugin |
55 |
+# gnome-desktop support is optional with --enable-gnome-desktop |
56 |
+# automagic libunity dep |
57 |
+COMMON_DEPEND=" |
58 |
+ >=app-crypt/gcr-3.4:=[gtk] |
59 |
+ >=app-text/enchant-1.6.0:0 |
60 |
+ >=dev-libs/glib-2.46:2[dbus] |
61 |
+ >=dev-libs/libxml2-2.7.3:2 |
62 |
+ >=gnome-base/gnome-desktop-2.91.3:3= |
63 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.92 |
64 |
+ >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] |
65 |
+ >=media-libs/libcanberra-0.25[gtk3] |
66 |
+ >=net-libs/libsoup-2.42:2.4 |
67 |
+ >=net-libs/webkit-gtk-2.16.0:4 |
68 |
+ >=x11-libs/cairo-1.9.15:=[glib] |
69 |
+ >=x11-libs/gdk-pixbuf-2.24:2 |
70 |
+ >=x11-libs/gtk+-3.22:3 |
71 |
+ >=x11-libs/libnotify-0.7:= |
72 |
+ >=x11-misc/shared-mime-info-0.22 |
73 |
+ |
74 |
+ >=app-text/iso-codes-0.49 |
75 |
+ dev-libs/atk |
76 |
+ gnome-base/dconf |
77 |
+ >=dev-libs/libical-3.0.2:= |
78 |
+ x11-libs/libSM |
79 |
+ x11-libs/libICE |
80 |
+ |
81 |
+ archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) |
82 |
+ geolocation? ( |
83 |
+ >=media-libs/libchamplain-0.12:0.12[gtk] |
84 |
+ >=media-libs/clutter-1.0.0:1.0 |
85 |
+ >=media-libs/clutter-gtk-0.90:1.0 |
86 |
+ >=sci-geosciences/geocode-glib-3.10.0 |
87 |
+ x11-libs/mx:1.0 ) |
88 |
+ ldap? ( >=net-nds/openldap-2:= ) |
89 |
+ spell? ( app-text/gtkspell:3 ) |
90 |
+ ssl? ( |
91 |
+ >=dev-libs/nspr-4.6.1:= |
92 |
+ >=dev-libs/nss-3.11:= ) |
93 |
+ weather? ( >=dev-libs/libgweather-3.10:2= ) |
94 |
+ ytnef? ( net-mail/ytnef ) |
95 |
+" |
96 |
+DEPEND="${COMMON_DEPEND} |
97 |
+ app-text/docbook-xml-dtd:4.1.2 |
98 |
+ dev-util/gdbus-codegen |
99 |
+ dev-util/glib-utils |
100 |
+ dev-util/itstool |
101 |
+ gtk-doc? ( dev-util/gtk-doc |
102 |
+ app-text/docbook-xml-dtd:4.3 ) |
103 |
+ >=dev-util/intltool-0.40.0 |
104 |
+ >=sys-devel/gettext-0.18.3 |
105 |
+ virtual/pkgconfig |
106 |
+" |
107 |
+RDEPEND="${COMMON_DEPEND} |
108 |
+ bogofilter? ( mail-filter/bogofilter ) |
109 |
+ highlight? ( app-text/highlight ) |
110 |
+ spamassassin? ( mail-filter/spamassassin ) |
111 |
+ !gnome-extra/evolution-exchange |
112 |
+" |
113 |
+ |
114 |
+DISABLE_AUTOFORMATTING="yes" |
115 |
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit |
116 |
+~/.local/share/applications/mimeapps.list so it includes the |
117 |
+following content: |
118 |
+ |
119 |
+[Default Applications] |
120 |
+x-scheme-handler/http=firefox.desktop |
121 |
+x-scheme-handler/https=firefox.desktop |
122 |
+ |
123 |
+(replace firefox.desktop with the name of the appropriate .desktop |
124 |
+file from /usr/share/applications if you use a different browser)." |
125 |
+ |
126 |
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare |
127 |
+# call; if needed, set them after cmake-utils_src_prepare call, if that works |
128 |
+ |
129 |
+src_prepare() { |
130 |
+ eapply "${FILESDIR}"/${PV}-gtk-doc-fix{1,2}.patch |
131 |
+ cmake-utils_src_prepare |
132 |
+ gnome2_src_prepare |
133 |
+} |
134 |
+ |
135 |
+src_configure() { |
136 |
+ # Use NSS/NSPR only if 'ssl' is enabled. |
137 |
+ local mycmakeargs=( |
138 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
139 |
+ -DENABLE_SCHEMAS_COMPILE=OFF |
140 |
+ -DENABLE_GTK_DOC=$(usex gtk-doc) |
141 |
+ -DWITH_OPENLDAP=$(usex ldap) |
142 |
+ -DENABLE_SMIME=$(usex ssl) |
143 |
+ -DENABLE_GNOME_DESKTOP=ON |
144 |
+ -DWITH_ENCHANT_VERSION=1 |
145 |
+ -DENABLE_CANBERRA=ON |
146 |
+ -DENABLE_AUTOAR=$(usex archive) |
147 |
+ -DWITH_HELP=ON |
148 |
+ -DENABLE_YTNEF=OFF |
149 |
+ -DWITH_BOGOFILTER=$(usex bogofilter) |
150 |
+ -DWITH_SPAMASSASSIN=$(usex spamassassin) |
151 |
+ -DENABLE_GTKSPELL=$(usex spell) |
152 |
+ -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) |
153 |
+ -DENABLE_WEATHER=$(usex weather) |
154 |
+ -DENABLE_CONTACT_MAPS=$(usex geolocation) |
155 |
+ -DENABLE_YTNEF=$(usex ytnef) |
156 |
+ -DENABLE_PST_IMPORT=OFF |
157 |
+ -DWITH_GLADE_CATALOG=OFF |
158 |
+ ) |
159 |
+ |
160 |
+ cmake-utils_src_configure |
161 |
+} |
162 |
+ |
163 |
+src_compile() { |
164 |
+ cmake-utils_src_compile |
165 |
+} |
166 |
+ |
167 |
+src_test() { |
168 |
+ cmake-utils_src_test |
169 |
+} |
170 |
+ |
171 |
+src_install() { |
172 |
+ cmake-utils_src_install |
173 |
+ |
174 |
+ # Problems with prelink: |
175 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=731680 |
176 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=732148 |
177 |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1114538 |
178 |
+ echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN} |
179 |
+ doenvd "${T}"/99${PN} |
180 |
+ |
181 |
+ readme.gentoo_create_doc |
182 |
+} |
183 |
+ |
184 |
+pkg_postinst() { |
185 |
+ gnome2_pkg_postinst |
186 |
+ readme.gentoo_print_elog |
187 |
+} |
188 |
|
189 |
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 |
190 |
new file mode 100644 |
191 |
index 00000000000..54a5fc714de |
192 |
--- /dev/null |
193 |
+++ b/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch |
194 |
@@ -0,0 +1,88 @@ |
195 |
+From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001 |
196 |
+From: Ting-Wei Lan <lantw@×××××××××.org> |
197 |
+Date: Mon, 22 Jul 2019 16:06:21 +0800 |
198 |
+Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line |
199 |
+ |
200 |
+When a library provides no way to find linker flags for linking with it, |
201 |
+the build system usually depends on the user to necessary put -L flags |
202 |
+in LDFLAGS environment variable in order to find it. However, GtkDoc |
203 |
+module constructs the command line by itself, and it forgets to add |
204 |
+LDFLAGS to the command line of gtkdoc-scangobj. |
205 |
+ |
206 |
+It is especially important to include LDFLAGS on non-GNU systems. For |
207 |
+example, FreeBSD libc doesn't include a gettext implementation. GLib |
208 |
+requires gettext, and it pulls in an external gettext runtime for it. |
209 |
+However, gettext-runtime doesn't include a .pc file, so LDFLAGS is |
210 |
+required if gettext-runtime isn't installed in the same prefix as GLib. |
211 |
+Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can |
212 |
+result in a linking error because -lintl cannot be found. |
213 |
+ |
214 |
+In evolution-data-server we are lucky most of the time because it |
215 |
+depends on a lot of external libraries. These external libraries are |
216 |
+likely to be installed in the same prefix as gettext-runtime, so not |
217 |
+using LDFLAGS doesn't cause linking failure because required flags are |
218 |
+already pulled in by other libraries. In fact, this problem was found |
219 |
+when building libical, which uses a similar GtkDoc.cmake file. |
220 |
+ |
221 |
+In addition to the change to include LDFLAGS, this commit also changes |
222 |
+the following things: |
223 |
+ |
224 |
+ - Instead of constructing _scangobj_ldflags in reverse order, do it in |
225 |
+ normal order. Appending is easier to understand than prepending, and |
226 |
+ the linker also interprets -L and -l flags in normal order. |
227 |
+ |
228 |
+ - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment |
229 |
+ says, and it is expected to work because we no longer constructs |
230 |
+ _scangobj_ldflags in reverse order. |
231 |
+ |
232 |
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 |
233 |
+--- |
234 |
+ cmake/modules/GtkDoc.cmake | 11 ++++++++--- |
235 |
+ 1 file changed, 8 insertions(+), 3 deletions(-) |
236 |
+ |
237 |
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake |
238 |
+index cc6cc007a..0ba1a7a78 100644 |
239 |
+--- a/cmake/modules/GtkDoc.cmake |
240 |
++++ b/cmake/modules/GtkDoc.cmake |
241 |
+@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign |
242 |
+ list(APPEND _scangobj_deps ${opt}) |
243 |
+ endforeach(opt) |
244 |
+ |
245 |
+- # Add them as the last, thus in-tree headers/libs have precedence |
246 |
++ # Add it as the last, thus in-tree headers have precedence |
247 |
+ list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) |
248 |
+- list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR}) |
249 |
+ |
250 |
+ if(_scangobj_deps) |
251 |
+ list(REMOVE_DUPLICATES _scangobj_deps) |
252 |
+@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign |
253 |
+ if(NOT _output_name) |
254 |
+ set(_output_name ${opt}) |
255 |
+ endif(NOT _output_name) |
256 |
+- set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}") |
257 |
++ set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}") |
258 |
+ |
259 |
+ if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY")) |
260 |
+ set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>") |
261 |
+@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign |
262 |
+ endif(TARGET ${opt}) |
263 |
+ endforeach(opt) |
264 |
+ |
265 |
++ # Add extra flags from LDFLAGS environment variable |
266 |
++ set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}") |
267 |
++ |
268 |
+ foreach(opt IN LISTS _scangobj_deps) |
269 |
+ if(NOT TARGET ${opt}) |
270 |
+ set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}") |
271 |
+ endif(NOT TARGET ${opt}) |
272 |
+ endforeach(opt) |
273 |
+ |
274 |
++ # Add it as the last, thus in-tree libs have precedence |
275 |
++ set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}") |
276 |
++ |
277 |
+ set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}") |
278 |
+ |
279 |
+ if(NOT (_scangobj_cflags STREQUAL "")) |
280 |
+-- |
281 |
+2.20.1 |
282 |
+ |
283 |
|
284 |
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 |
285 |
new file mode 100644 |
286 |
index 00000000000..56e66eae893 |
287 |
--- /dev/null |
288 |
+++ b/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch |
289 |
@@ -0,0 +1,29 @@ |
290 |
+From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001 |
291 |
+From: Milan Crha <mcrha@××××××.com> |
292 |
+Date: Mon, 5 Aug 2019 12:55:23 +0200 |
293 |
+Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line |
294 |
+ |
295 |
+The LDFLAGS could imply certain compile options being used (like -fPIC), |
296 |
+but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation |
297 |
+could fail. |
298 |
+ |
299 |
+Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 |
300 |
+--- |
301 |
+ cmake/modules/GtkDoc.cmake | 1 + |
302 |
+ 1 file changed, 1 insertion(+) |
303 |
+ |
304 |
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake |
305 |
+index 0ba1a7a78..2dfc4d691 100644 |
306 |
+--- a/cmake/modules/GtkDoc.cmake |
307 |
++++ b/cmake/modules/GtkDoc.cmake |
308 |
+@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign |
309 |
+ |
310 |
+ # Add it as the last, thus in-tree headers have precedence |
311 |
+ list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) |
312 |
++ list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS}) |
313 |
+ |
314 |
+ if(_scangobj_deps) |
315 |
+ list(REMOVE_DUPLICATES _scangobj_deps) |
316 |
+-- |
317 |
+2.20.1 |
318 |
+ |