1 |
commit: 9fbc3efc7330d505fca1f63b3f9c738a19eda503 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 14:44:48 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 14:44:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbc3efc |
7 |
|
8 |
mail-client/geary: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
mail-client/geary/Manifest | 2 - |
14 |
.../geary/files/0.12.4-fix-cancellable.patch | 25 - |
15 |
mail-client/geary/files/geary-0.12-libdir.patch | 54 --- |
16 |
.../geary/files/geary-0.12-use-upstream-jsc.patch | 511 --------------------- |
17 |
mail-client/geary/geary-0.12.4.ebuild | 83 ---- |
18 |
mail-client/geary/geary-3.32.0-r1.ebuild | 90 ---- |
19 |
6 files changed, 765 deletions(-) |
20 |
|
21 |
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest |
22 |
index 78b991cdcef..2b86dbfcbd7 100644 |
23 |
--- a/mail-client/geary/Manifest |
24 |
+++ b/mail-client/geary/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c |
27 |
-DIST geary-3.32.0.tar.xz 2228056 BLAKE2B b9ee9e48fb901aa8fe8ef291b8332ac222d7581d1700170aa605071698ea0d8b698511c6e372c9a5056c3d7bf4885ec84aa389f7558fdd00cb4eeb43d745ee39 SHA512 eec6a552fe87c74d364d7242631f6ddfb6cfe35dc4f634ec7aa80342f9e02439255a2a4b12b0f88ee6369962058bbbdc64c390189bd6480a225685ad52cb68f8 |
28 |
DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0 |
29 |
|
30 |
diff --git a/mail-client/geary/files/0.12.4-fix-cancellable.patch b/mail-client/geary/files/0.12.4-fix-cancellable.patch |
31 |
deleted file mode 100644 |
32 |
index 6549bd0d622..00000000000 |
33 |
--- a/mail-client/geary/files/0.12.4-fix-cancellable.patch |
34 |
+++ /dev/null |
35 |
@@ -1,25 +0,0 @@ |
36 |
-From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001 |
37 |
-From: Rico Tzschichholz <ricotz@××××××.com> |
38 |
-Date: Tue, 27 Nov 2018 14:53:56 +0100 |
39 |
-Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED |
40 |
- |
41 |
---- |
42 |
- src/client/application/geary-controller.vala | 2 +- |
43 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
44 |
- |
45 |
-diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala |
46 |
-index 3e6c8fcb..6bfeaab9 100644 |
47 |
---- a/src/client/application/geary-controller.vala |
48 |
-+++ b/src/client/application/geary-controller.vala |
49 |
-@@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject { |
50 |
- yield do_empty_folder_async(emptyable, cancellable); |
51 |
- } catch (Error err) { |
52 |
- // don't report to user if cancelled |
53 |
-- if (cancellable is IOError.CANCELLED) |
54 |
-+ if (err is IOError.CANCELLED) |
55 |
- return; |
56 |
- |
57 |
- ErrorDialog dialog = new ErrorDialog(main_window, |
58 |
--- |
59 |
-2.18.1 |
60 |
- |
61 |
|
62 |
diff --git a/mail-client/geary/files/geary-0.12-libdir.patch b/mail-client/geary/files/geary-0.12-libdir.patch |
63 |
deleted file mode 100644 |
64 |
index 8e84ffa018b..00000000000 |
65 |
--- a/mail-client/geary/files/geary-0.12-libdir.patch |
66 |
+++ /dev/null |
67 |
@@ -1,54 +0,0 @@ |
68 |
-diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala |
69 |
---- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200 |
70 |
-+++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200 |
71 |
-@@ -7,6 +7,7 @@ |
72 |
- // Defined by CMake build script. |
73 |
- extern const string _INSTALL_PREFIX; |
74 |
- extern const string _GSETTINGS_DIR; |
75 |
-+extern const string _LIB_SUFFIX; |
76 |
- extern const string _SOURCE_ROOT_DIR; |
77 |
- extern const string _BUILD_ROOT_DIR; |
78 |
- extern const string GETTEXT_PACKAGE; |
79 |
-@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl |
80 |
- public const string VERSION = Geary.Version.GEARY_VERSION; |
81 |
- public const string INSTALL_PREFIX = _INSTALL_PREFIX; |
82 |
- public const string GSETTINGS_DIR = _GSETTINGS_DIR; |
83 |
-+ public const string LIB_SUFFIX = _LIB_SUFFIX; |
84 |
- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR; |
85 |
- public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR; |
86 |
- |
87 |
-@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl |
88 |
- * Returns the directory containing the application's WebExtension libs. |
89 |
- * |
90 |
- * If the application is installed, this will be |
91 |
-- * `$INSTALL_PREFIX/lib/geary/web-extension`, else it will be |
92 |
-+ * `$INSTALL_PREFIX/lib$LIB_SUFFIX/geary/web-extension`, else it will be |
93 |
- */ |
94 |
- public File get_web_extensions_dir() { |
95 |
- File? dir = get_install_dir(); |
96 |
- if (dir != null) |
97 |
-- dir = dir.get_child("lib").get_child("geary").get_child("web-extensions"); |
98 |
-+ dir = dir.get_child("lib" + LIB_SUFFIX).get_child("geary").get_child("web-extensions"); |
99 |
- else |
100 |
- dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src"); |
101 |
- return dir; |
102 |
-diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt |
103 |
---- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200 |
104 |
-+++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200 |
105 |
-@@ -567,6 +567,7 @@ set(CFLAGS |
106 |
- ${DEPS_CFLAGS} |
107 |
- ${DEPS_CFLAGS_OTHER} |
108 |
- -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" |
109 |
-+ -D_LIB_SUFFIX=\"${LIB_SUFFIX}\" |
110 |
- -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\" |
111 |
- -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\" |
112 |
- -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" |
113 |
-@@ -745,7 +746,7 @@ OPTIONS |
114 |
- |
115 |
- add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C}) |
116 |
- target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine) |
117 |
--install(TARGETS geary-web-process LIBRARY DESTINATION lib/geary/web-extensions) |
118 |
-+install(TARGETS geary-web-process LIBRARY DESTINATION lib${LIB_SUFFIX}/geary/web-extensions) |
119 |
- |
120 |
- # Console app |
121 |
- ################################################# |
122 |
|
123 |
diff --git a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch |
124 |
deleted file mode 100644 |
125 |
index c7965ccf315..00000000000 |
126 |
--- a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch |
127 |
+++ /dev/null |
128 |
@@ -1,511 +0,0 @@ |
129 |
-commit a0b1827298dc3210ad0ad16b09cff3507c3ad333 |
130 |
-Author: Thomas Moschny <thomas.moschny@×××.de> |
131 |
-Date: Sat Jul 14 12:33:47 2018 |
132 |
- |
133 |
- Squashed commit of the following: |
134 |
- |
135 |
- commit e091f24b00ec421e1aadd5e360d1550e658ad5ef |
136 |
- Author: Michael James Gratton <mike@×××.net> |
137 |
- Date: Sun May 20 19:07:56 2018 +1000 |
138 |
- |
139 |
- Clean up JS util API courtesy the new bindings. |
140 |
- |
141 |
- commit 0d966950a2cba888873cd3a7f4f42bb7a017dc6d |
142 |
- Author: Rico Tzschichholz <ricotz@××××××.com> |
143 |
- Date: Mon Apr 23 19:56:18 2018 +0200 |
144 |
- |
145 |
- Adjust to upstream javascriptcore-4.0 bindings |
146 |
- |
147 |
- commit 5d0f711426d76f878cf9b71f7e8f785199c7cde1 |
148 |
- Author: Rico Tzschichholz <ricotz@××××××.com> |
149 |
- Date: Thu Jun 22 15:01:19 2017 +0200 |
150 |
- |
151 |
- bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi |
152 |
- |
153 |
-diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata |
154 |
-deleted file mode 100644 |
155 |
-index f3e72e8..0000000 |
156 |
---- a/bindings/metadata/Soup-2.4.metadata |
157 |
-+++ /dev/null |
158 |
-@@ -1,3 +0,0 @@ |
159 |
--AuthDomain.accepts skip |
160 |
--AuthDomain.challenge skip |
161 |
-- |
162 |
-diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata |
163 |
-deleted file mode 100644 |
164 |
-index 3e3044f..0000000 |
165 |
---- a/bindings/metadata/WebKit2-4.0.metadata |
166 |
-+++ /dev/null |
167 |
-@@ -1,15 +0,0 @@ |
168 |
-- |
169 |
--JavascriptResult |
170 |
-- .get_global_context nullable=false unowned=true |
171 |
-- .get_value nullable=false unowned=true |
172 |
-- |
173 |
--//Forward upstream |
174 |
--Download |
175 |
-- .failed#signal.error type="WebKit.DownloadError" |
176 |
--PrintOperation |
177 |
-- .failed#signal.error type="WebKit.PrintError" |
178 |
--WebResource |
179 |
-- .failed#signal.error type="GLib.Error" |
180 |
--WebView |
181 |
-- .load_failed#signal.error type="GLib.Error" |
182 |
-- .show_option_menu#signal skip |
183 |
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala |
184 |
-deleted file mode 100644 |
185 |
-index a994a77..0000000 |
186 |
---- a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala |
187 |
-+++ /dev/null |
188 |
-@@ -1,5 +0,0 @@ |
189 |
--namespace WebKit { |
190 |
-- namespace DOM { |
191 |
-- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event); |
192 |
-- } |
193 |
--} |
194 |
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata |
195 |
-deleted file mode 100644 |
196 |
-index c496dba..0000000 |
197 |
---- a/bindings/metadata/WebKit2WebExtension-4.0.metadata |
198 |
-+++ /dev/null |
199 |
-@@ -1,9 +0,0 @@ |
200 |
--DOM* parent="WebKit.DOM" name="DOM(.+)" |
201 |
-- |
202 |
--DOMEventTarget.add_event_listener skip |
203 |
--_ContextMenu skip |
204 |
--_ContextMenuItem skip |
205 |
-- |
206 |
--Frame.get_javascript_* nullable=false unowned=true |
207 |
-- |
208 |
--DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc" |
209 |
-diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi |
210 |
-deleted file mode 100644 |
211 |
-index d152ce2..0000000 |
212 |
---- a/bindings/vapi/javascriptcore-4.0.vapi |
213 |
-+++ /dev/null |
214 |
-@@ -1,155 +0,0 @@ |
215 |
--/* |
216 |
-- * Copyright 2017 Michael Gratton <mike@×××.net> |
217 |
-- * |
218 |
-- * This software is licensed under the GNU Lesser General Public License |
219 |
-- * (version 2.1 or later). See the COPYING file in this distribution. |
220 |
-- */ |
221 |
-- |
222 |
--[CCode (cprefix = "JS", |
223 |
-- gir_namespace = "JavaScriptCore", |
224 |
-- gir_version = "4.0", |
225 |
-- lower_case_cprefix = "JS_", |
226 |
-- cheader_filename = "JavaScriptCore/JavaScript.h")] |
227 |
--namespace JS { |
228 |
-- |
229 |
-- [CCode (cname = "JSContextRef")] |
230 |
-- [SimpleType] |
231 |
-- public struct Context { |
232 |
-- |
233 |
-- [CCode (cname = "JSEvaluateScript")] |
234 |
-- public Value evaluate_script(String script, |
235 |
-- Object? thisObject, |
236 |
-- String? sourceURL, |
237 |
-- int startingLineNumber, |
238 |
-- out Value? exception); |
239 |
-- |
240 |
-- [CCode (cname = "JSCheckScriptSyntax")] |
241 |
-- public Value check_script_syntax(String script, |
242 |
-- String? sourceURL, |
243 |
-- int startingLineNumber, |
244 |
-- out Value? exception); |
245 |
-- |
246 |
-- } |
247 |
-- |
248 |
-- [CCode (cname = "JSGlobalContextRef")] |
249 |
-- [SimpleType] |
250 |
-- public struct GlobalContext : Context { |
251 |
-- |
252 |
-- [CCode (cname = "JSGlobalContextRetain")] |
253 |
-- public bool retain(); |
254 |
-- |
255 |
-- [CCode (cname = "JSGlobalContextRelease")] |
256 |
-- public bool release(); |
257 |
-- |
258 |
-- } |
259 |
-- |
260 |
-- [CCode (cname = "JSType", has_type_id = false)] |
261 |
-- public enum Type { |
262 |
-- |
263 |
-- [CCode (cname = "kJSTypeUndefined")] |
264 |
-- UNDEFINED, |
265 |
-- |
266 |
-- [CCode (cname = "kJSTypeNull")] |
267 |
-- NULL, |
268 |
-- |
269 |
-- [CCode (cname = "kJSTypeBoolean")] |
270 |
-- BOOLEAN, |
271 |
-- |
272 |
-- [CCode (cname = "kJSTypeNumber")] |
273 |
-- NUMBER, |
274 |
-- |
275 |
-- [CCode (cname = "kJSTypeString")] |
276 |
-- STRING, |
277 |
-- |
278 |
-- [CCode (cname = "kJSTypeObject")] |
279 |
-- OBJECT |
280 |
-- } |
281 |
-- |
282 |
-- [CCode (cname = "JSObjectRef")] |
283 |
-- [SimpleType] |
284 |
-- public struct Object { |
285 |
-- |
286 |
-- [CCode (cname = "JSObjectMakeFunction")] |
287 |
-- public Object.make_function(String? name, |
288 |
-- [CCode (array_length_pos=1.5)] |
289 |
-- String[]? parameterNames, |
290 |
-- String body, |
291 |
-- String? sourceURL, |
292 |
-- int startingLineNumber, |
293 |
-- out Value? exception); |
294 |
-- |
295 |
-- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)] |
296 |
-- public Value call_as_function(Context ctx, |
297 |
-- Object? thisObject, |
298 |
-- [CCode (array_length_pos=2.5)] |
299 |
-- Value[]? arguments, |
300 |
-- out Value? exception); |
301 |
-- |
302 |
-- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)] |
303 |
-- public bool has_property(Context ctx, String property_name); |
304 |
-- |
305 |
-- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)] |
306 |
-- public Value get_property(Context ctx, |
307 |
-- String property_name, |
308 |
-- out Value? exception); |
309 |
-- |
310 |
-- } |
311 |
-- |
312 |
-- [CCode (cname = "JSValueRef")] |
313 |
-- [SimpleType] |
314 |
-- public struct Value { |
315 |
-- |
316 |
-- [CCode (cname = "JSValueGetType", instance_pos = 1.1)] |
317 |
-- public Type get_type(Context context); |
318 |
-- |
319 |
-- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)] |
320 |
-- public bool is_boolean(Context ctx); |
321 |
-- |
322 |
-- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)] |
323 |
-- public bool is_number(Context ctx); |
324 |
-- |
325 |
-- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)] |
326 |
-- public bool is_object(Context ctx); |
327 |
-- |
328 |
-- [CCode (cname = "JSValueIsString", instance_pos = 1.1)] |
329 |
-- public bool is_string(Context ctx); |
330 |
-- |
331 |
-- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)] |
332 |
-- public bool to_boolean(Context ctx); |
333 |
-- |
334 |
-- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)] |
335 |
-- public double to_number(Context ctx, out Value exception); |
336 |
-- |
337 |
-- [CCode (cname = "JSValueToObject", instance_pos = 1.1)] |
338 |
-- public Object to_object(Context ctx, out Value exception); |
339 |
-- |
340 |
-- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)] |
341 |
-- public String to_string_copy(Context ctx, out Value exception); |
342 |
-- |
343 |
-- } |
344 |
-- |
345 |
-- [CCode (cname = "JSStringRef")] |
346 |
-- [SimpleType] |
347 |
-- public struct String { |
348 |
-- |
349 |
-- [CCode (cname = "JSStringCreateWithUTF8CString")] |
350 |
-- public String.create_with_utf8_cstring(string str); |
351 |
-- |
352 |
-- [CCode (cname = "JSStringGetLength")] |
353 |
-- public int String.get_length(); |
354 |
-- |
355 |
-- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")] |
356 |
-- public int String.get_maximum_utf8_cstring_size(); |
357 |
-- |
358 |
-- [CCode (cname = "JSStringGetUTF8CString")] |
359 |
-- public void String.get_utf8_cstring(string* buffer, int bufferSize); |
360 |
-- |
361 |
-- [CCode (cname = "JSStringRetain")] |
362 |
-- public void String.retain(); |
363 |
-- |
364 |
-- [CCode (cname = "JSStringRelease")] |
365 |
-- public void String.release(); |
366 |
-- |
367 |
-- } |
368 |
-- |
369 |
--} |
370 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
371 |
-index 1e4213f..e0bebdf 100644 |
372 |
---- a/src/CMakeLists.txt |
373 |
-+++ b/src/CMakeLists.txt |
374 |
-@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES |
375 |
- gio-2.0 |
376 |
- glib-2.0 |
377 |
- gmime-2.6 |
378 |
-- javascriptcore-4.0 |
379 |
-+ javascriptcoregtk-4.0 |
380 |
- libxml-2.0 |
381 |
- posix |
382 |
- sqlite3 |
383 |
-@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES |
384 |
- geary-engine |
385 |
- gee-0.8 |
386 |
- gtk+-3.0 |
387 |
-- javascriptcore-4.0 |
388 |
-+ javascriptcoregtk-4.0 |
389 |
- libsoup-2.4 |
390 |
- webkit2gtk-web-extension-4.0 |
391 |
- ) |
392 |
-@@ -618,7 +618,6 @@ add_definitions(${CFLAGS}) |
393 |
- set(VALAC_OPTIONS |
394 |
- --vapidir=${CMAKE_BINARY_DIR}/src |
395 |
- --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi |
396 |
-- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata |
397 |
- --target-glib=${TARGET_GLIB} |
398 |
- --thread |
399 |
- --debug |
400 |
-@@ -650,38 +649,6 @@ set_property( |
401 |
- ) |
402 |
- target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn) |
403 |
- |
404 |
--# WebKit2GTK VAPI generation |
405 |
--################################################# |
406 |
--add_custom_target(webkit2gtk-vapi |
407 |
-- DEPENDS |
408 |
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi" |
409 |
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi" |
410 |
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" |
411 |
--) |
412 |
--add_custom_command( |
413 |
-- OUTPUT |
414 |
-- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi |
415 |
-- DEPENDS |
416 |
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata" |
417 |
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" |
418 |
-- WORKING_DIRECTORY |
419 |
-- "${CMAKE_SOURCE_DIR}/bindings/metadata" |
420 |
-- COMMAND |
421 |
-- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir |
422 |
--) |
423 |
--add_custom_command( |
424 |
-- OUTPUT |
425 |
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi" |
426 |
-- DEPENDS |
427 |
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata" |
428 |
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala" |
429 |
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" |
430 |
-- WORKING_DIRECTORY |
431 |
-- "${CMAKE_SOURCE_DIR}/bindings/metadata" |
432 |
-- COMMAND |
433 |
-- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala |
434 |
--) |
435 |
-- |
436 |
- # Client library (static lib used for building client and unit tests) |
437 |
- ################################################# |
438 |
- |
439 |
-@@ -698,7 +665,7 @@ OPTIONS |
440 |
- ) |
441 |
- |
442 |
- add_library(geary-client STATIC ${CLIENT_VALA_C}) |
443 |
--add_dependencies(geary-client resource_copy webkit2gtk-vapi) |
444 |
-+add_dependencies(geary-client resource_copy) |
445 |
- target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine) |
446 |
- |
447 |
- # Main client application binary |
448 |
-diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala |
449 |
-index 588d39b..d851235 100644 |
450 |
---- a/src/client/conversation-viewer/conversation-web-view.vala |
451 |
-+++ b/src/client/conversation-viewer/conversation-web-view.vala |
452 |
-@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView { |
453 |
- |
454 |
- private void on_deceptive_link_clicked(WebKit.JavascriptResult result) { |
455 |
- try { |
456 |
-- JS.GlobalContext context = result.get_global_context(); |
457 |
-+ unowned JS.GlobalContext context = result.get_global_context(); |
458 |
- JS.Object details = WebKitUtil.to_object(result); |
459 |
- |
460 |
- uint reason = (uint) Geary.JS.to_number( |
461 |
-diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala |
462 |
-index 319e28a..45a27c4 100644 |
463 |
---- a/src/client/util/util-webkit.vala |
464 |
-+++ b/src/client/util/util-webkit.vala |
465 |
-@@ -18,8 +18,8 @@ namespace WebKitUtil { |
466 |
- */ |
467 |
- public bool to_bool(WebKit.JavascriptResult result) |
468 |
- throws Geary.JS.Error { |
469 |
-- JS.GlobalContext context = result.get_global_context(); |
470 |
-- JS.Value value = result.get_value(); |
471 |
-+ unowned JS.GlobalContext context = result.get_global_context(); |
472 |
-+ unowned JS.Value value = result.get_value(); |
473 |
- if (!value.is_boolean(context)) { |
474 |
- throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object"); |
475 |
- } |
476 |
-@@ -59,12 +59,12 @@ namespace WebKitUtil { |
477 |
- */ |
478 |
- public string as_string(WebKit.JavascriptResult result) |
479 |
- throws Geary.JS.Error { |
480 |
-- JS.GlobalContext context = result.get_global_context(); |
481 |
-- JS.Value js_str_value = result.get_value(); |
482 |
-+ unowned JS.GlobalContext context = result.get_global_context(); |
483 |
-+ unowned JS.Value js_str_value = result.get_value(); |
484 |
- JS.Value? err = null; |
485 |
- JS.String js_str = js_str_value.to_string_copy(context, out err); |
486 |
- Geary.JS.check_exception(context, err); |
487 |
-- return Geary.JS.to_string_released(js_str); |
488 |
-+ return Geary.JS.to_native_string(js_str); |
489 |
- } |
490 |
- |
491 |
- /** |
492 |
-diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala |
493 |
-index ee89139..1f478a6 100644 |
494 |
---- a/src/client/web-process/web-process-extension.vala |
495 |
-+++ b/src/client/web-process/web-process-extension.vala |
496 |
-@@ -87,10 +87,9 @@ public class GearyWebExtension : Object { |
497 |
- bool should_load = false; |
498 |
- WebKit.Frame frame = page.get_main_frame(); |
499 |
- // Explicit cast fixes build on s390x/ppc64. Bug 783882 |
500 |
-- JS.GlobalContext context = (JS.GlobalContext) |
501 |
-- frame.get_javascript_global_context(); |
502 |
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); |
503 |
- try { |
504 |
-- JS.Value ret = execute_script( |
505 |
-+ unowned JS.Value ret = execute_script( |
506 |
- context, "geary.allowRemoteImages", int.parse("__LINE__") |
507 |
- ); |
508 |
- should_load = ret.to_boolean(context); |
509 |
-@@ -106,8 +105,7 @@ public class GearyWebExtension : Object { |
510 |
- private void remote_image_load_blocked(WebKit.WebPage page) { |
511 |
- WebKit.Frame frame = page.get_main_frame(); |
512 |
- // Explicit cast fixes build on s390x/ppc64. Bug 783882 |
513 |
-- JS.GlobalContext context = (JS.GlobalContext) |
514 |
-- frame.get_javascript_global_context(); |
515 |
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); |
516 |
- try { |
517 |
- execute_script( |
518 |
- context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__") |
519 |
-@@ -123,8 +121,7 @@ public class GearyWebExtension : Object { |
520 |
- private void selection_changed(WebKit.WebPage page) { |
521 |
- WebKit.Frame frame = page.get_main_frame(); |
522 |
- // Explicit cast fixes build on s390x/ppc64. Bug 783882 |
523 |
-- JS.GlobalContext context = (JS.GlobalContext) |
524 |
-- frame.get_javascript_global_context(); |
525 |
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); |
526 |
- try { |
527 |
- execute_script( |
528 |
- context, "geary.selectionChanged();", int.parse("__LINE__") |
529 |
-@@ -136,20 +133,18 @@ public class GearyWebExtension : Object { |
530 |
- |
531 |
- // Return type is nullable as a workaround for Bug 778046, it will |
532 |
- // never actually be null. |
533 |
-- private JS.Value? execute_script(JS.Context context, string script, int line) |
534 |
-+ private unowned JS.Value? execute_script(JS.Context context, string script, int line) |
535 |
- throws Geary.JS.Error { |
536 |
- JS.String js_script = new JS.String.create_with_utf8_cstring(script); |
537 |
- JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__"); |
538 |
- JS.Value? err = null; |
539 |
- try { |
540 |
-- JS.Value ret = context.evaluate_script( |
541 |
-+ unowned JS.Value ret = context.evaluate_script( |
542 |
- js_script, null, js_source, line, out err |
543 |
- ); |
544 |
- Geary.JS.check_exception(context, err); |
545 |
- return ret; |
546 |
- } finally { |
547 |
-- js_script.release(); |
548 |
-- js_source.release(); |
549 |
- } |
550 |
- } |
551 |
- |
552 |
-diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala |
553 |
-index 4d22429..a98d798 100644 |
554 |
---- a/src/engine/util/util-js.vala |
555 |
-+++ b/src/engine/util/util-js.vala |
556 |
-@@ -10,6 +10,16 @@ |
557 |
- */ |
558 |
- namespace Geary.JS { |
559 |
- |
560 |
-+#if !VALA_0_42 |
561 |
-+ // Workaround broken version of this in the vala bindings. See Bug |
562 |
-+ // 788113. |
563 |
-+ [CCode (cname = "JSStringGetUTF8CString")] |
564 |
-+ private extern size_t js_string_get_utf8_cstring( |
565 |
-+ global::JS.String js, |
566 |
-+ [CCode (array_length_type = "gsize")] char[] buffer |
567 |
-+ ); |
568 |
-+#endif |
569 |
-+ |
570 |
- /** |
571 |
- * Errors produced by functions in {@link Geary.JS}. |
572 |
- */ |
573 |
-@@ -72,7 +82,7 @@ namespace Geary.JS { |
574 |
- global::JS.String js_str = value.to_string_copy(context, out err); |
575 |
- Geary.JS.check_exception(context, err); |
576 |
- |
577 |
-- return Geary.JS.to_string_released(js_str); |
578 |
-+ return to_native_string(js_str); |
579 |
- } |
580 |
- |
581 |
- /** |
582 |
-@@ -101,12 +111,15 @@ namespace Geary.JS { |
583 |
- /** |
584 |
- * Returns a JSC {@link JS.String} as a Vala {@link string}. |
585 |
- */ |
586 |
-- public inline string to_string_released(global::JS.String js) { |
587 |
-- int len = js.get_maximum_utf8_cstring_size(); |
588 |
-- string str = string.nfill(len, 0); |
589 |
-- js.get_utf8_cstring(str, len); |
590 |
-- js.release(); |
591 |
-- return str; |
592 |
-+ public inline string to_native_string(global::JS.String js) { |
593 |
-+ size_t len = js.get_maximum_utf8_cstring_size(); |
594 |
-+ uint8[] str = new uint8[len]; |
595 |
-+#if VALA_0_42 |
596 |
-+ js.get_utf8_cstring(str); |
597 |
-+#else |
598 |
-+ js_string_get_utf8_cstring(js, (char[]) str); |
599 |
-+#endif |
600 |
-+ return (string) str; |
601 |
- } |
602 |
- |
603 |
- /** |
604 |
-@@ -125,11 +138,8 @@ namespace Geary.JS { |
605 |
- global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name); |
606 |
- global::JS.Value? err = null; |
607 |
- global::JS.Value prop = object.get_property(context, js_name, out err); |
608 |
-- try { |
609 |
-- Geary.JS.check_exception(context, err); |
610 |
-- } finally { |
611 |
-- js_name.release(); |
612 |
-- } |
613 |
-+ Geary.JS.check_exception(context, err); |
614 |
-+ |
615 |
- return prop; |
616 |
- } |
617 |
- |
618 |
-@@ -157,7 +167,7 @@ namespace Geary.JS { |
619 |
- |
620 |
- throw new Error.EXCEPTION( |
621 |
- "JS exception thrown [%s]: %s" |
622 |
-- .printf(err_type.to_string(), to_string_released(err_str)) |
623 |
-+ .printf(err_type.to_string(), to_native_string(err_str)) |
624 |
- ); |
625 |
- } |
626 |
- } |
627 |
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
628 |
-index afcca95..7517b3d 100644 |
629 |
---- a/test/CMakeLists.txt |
630 |
-+++ b/test/CMakeLists.txt |
631 |
-@@ -56,7 +56,7 @@ set(TEST_PACKAGES |
632 |
- glib-2.0 |
633 |
- gmime-2.6 |
634 |
- gtk+-3.0 |
635 |
-- javascriptcore-4.0 |
636 |
-+ javascriptcoregtk-4.0 |
637 |
- libsoup-2.4 |
638 |
- webkit2gtk-4.0 |
639 |
- ) |
640 |
|
641 |
diff --git a/mail-client/geary/geary-0.12.4.ebuild b/mail-client/geary/geary-0.12.4.ebuild |
642 |
deleted file mode 100644 |
643 |
index a19a5f7c62e..00000000000 |
644 |
--- a/mail-client/geary/geary-0.12.4.ebuild |
645 |
+++ /dev/null |
646 |
@@ -1,83 +0,0 @@ |
647 |
-# Copyright 1999-2019 Gentoo Authors |
648 |
-# Distributed under the terms of the GNU General Public License v2 |
649 |
- |
650 |
-EAPI=6 |
651 |
-VALA_MIN_API_VERSION="0.40" |
652 |
-VALA_MAX_API_VERSION="0.42" |
653 |
-# Keep cmake-utils at the end |
654 |
-inherit gnome2 vala cmake-utils |
655 |
- |
656 |
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" |
657 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary" |
658 |
- |
659 |
-LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons |
660 |
-SLOT="0" |
661 |
-KEYWORDS="~amd64 ~x86" |
662 |
- |
663 |
-DEPEND=" |
664 |
- >=dev-libs/glib-2.42:2 |
665 |
- >=x11-libs/gtk+-3.14.0:3[introspection] |
666 |
- >=net-libs/webkit-gtk-2.10.0:4=[introspection] |
667 |
- app-text/iso-codes |
668 |
- >=dev-db/sqlite-3.12:3 |
669 |
- |
670 |
- >=net-libs/libsoup-2.48:2.4[introspection] |
671 |
- >=dev-libs/libgee-0.8.5:0.8=[introspection] |
672 |
- >=x11-libs/libnotify-0.7.5[introspection] |
673 |
- >=media-libs/libcanberra-0.28 |
674 |
- >=dev-libs/gmime-2.6.17:2.6 |
675 |
- >=app-crypt/libsecret-0.11[introspection,vala] |
676 |
- >=dev-libs/libxml2-2.7.8:2 |
677 |
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] |
678 |
- >=app-text/enchant-1.6:0 |
679 |
-" |
680 |
-RDEPEND="${DEPEND} |
681 |
- gnome-base/dconf |
682 |
- gnome-base/gsettings-desktop-schemas |
683 |
-" # org.gnome.desktop.interface clock-format global setting usage |
684 |
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option |
685 |
-DEPEND="${DEPEND} |
686 |
- sys-devel/gettext |
687 |
- dev-util/intltool |
688 |
- app-text/gnome-doc-utils |
689 |
- dev-util/desktop-file-utils |
690 |
- virtual/pkgconfig |
691 |
- $(vala_depend) |
692 |
-" |
693 |
- |
694 |
-src_prepare() { |
695 |
- eapply "${FILESDIR}"/geary-0.12-libdir.patch |
696 |
- eapply "${FILESDIR}"/geary-0.12-use-upstream-jsc.patch |
697 |
- eapply "${FILESDIR}"/${PV}-fix-cancellable.patch |
698 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557 |
699 |
- sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die |
700 |
- |
701 |
- local i |
702 |
- if [[ -n "${LINGUAS+x}" ]] ; then |
703 |
- for i in $(cd po ; echo *.po) ; do |
704 |
- if ! has ${i%.po} ${LINGUAS} ; then |
705 |
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die |
706 |
- fi |
707 |
- done |
708 |
- fi |
709 |
- |
710 |
- cmake-utils_src_prepare |
711 |
- gnome2_src_prepare |
712 |
- vala_src_prepare |
713 |
-} |
714 |
- |
715 |
-src_configure() { |
716 |
- local mycmakeargs=( |
717 |
- -DICON_UPDATE=OFF |
718 |
- -DDESKTOP_UPDATE=OFF |
719 |
- -DDESKTOP_VALIDATE=OFF |
720 |
- -DTRANSLATE_HELP=ON |
721 |
- |
722 |
- -DNO_FATAL_WARNINGS=ON |
723 |
- -DGSETTINGS_COMPILE=OFF |
724 |
- -DVALA_EXECUTABLE="${VALAC}" |
725 |
- -DVAPIGEN="${VAPIGEN}" |
726 |
- ) |
727 |
- |
728 |
- cmake-utils_src_configure |
729 |
-} |
730 |
|
731 |
diff --git a/mail-client/geary/geary-3.32.0-r1.ebuild b/mail-client/geary/geary-3.32.0-r1.ebuild |
732 |
deleted file mode 100644 |
733 |
index dd806a26e5b..00000000000 |
734 |
--- a/mail-client/geary/geary-3.32.0-r1.ebuild |
735 |
+++ /dev/null |
736 |
@@ -1,90 +0,0 @@ |
737 |
-# Copyright 1999-2019 Gentoo Authors |
738 |
-# Distributed under the terms of the GNU General Public License v2 |
739 |
- |
740 |
-EAPI=6 |
741 |
-VALA_MIN_API_VERSION="0.40" |
742 |
- |
743 |
-inherit gnome.org gnome2-utils meson vala xdg |
744 |
- |
745 |
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" |
746 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary" |
747 |
- |
748 |
-LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons |
749 |
-SLOT="0" |
750 |
- |
751 |
-IUSE="unwind" |
752 |
- |
753 |
-KEYWORDS="~amd64" |
754 |
- |
755 |
-# for now both enchants work |
756 |
-# FIXME: add valadoc support |
757 |
- |
758 |
-DEPEND=" |
759 |
- >=dev-libs/glib-2.54:2 |
760 |
- >=x11-libs/gtk+-3.22.26:3[introspection] |
761 |
- >=net-libs/webkit-gtk-2.20:4=[introspection] |
762 |
- app-text/iso-codes |
763 |
- >=dev-db/sqlite-3.12:3 |
764 |
- |
765 |
- >=net-libs/libsoup-2.48:2.4[introspection] |
766 |
- net-libs/gnome-online-accounts |
767 |
- |
768 |
- >=dev-libs/libgee-0.8.5:0.8=[introspection] |
769 |
- >=x11-libs/libnotify-0.7.5[introspection] |
770 |
- >=media-libs/libcanberra-0.28 |
771 |
- >=dev-libs/gmime-2.6.17:2.6 |
772 |
- >=app-crypt/libsecret-0.11[introspection,vala] |
773 |
- >=dev-libs/libxml2-2.7.8:2 |
774 |
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] |
775 |
- app-text/enchant |
776 |
- >=dev-libs/folks-0.11:0 |
777 |
- dev-libs/json-glib |
778 |
- unwind? ( >=sys-libs/libunwind-1.1:7 ) |
779 |
-" |
780 |
-RDEPEND="${DEPEND} |
781 |
- gnome-base/dconf |
782 |
- gnome-base/gsettings-desktop-schemas |
783 |
-" |
784 |
-# org.gnome.desktop.interface clock-format global setting usage |
785 |
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option |
786 |
-DEPEND="${DEPEND} |
787 |
- sys-devel/gettext |
788 |
- dev-util/desktop-file-utils |
789 |
- virtual/pkgconfig |
790 |
- $(vala_depend) |
791 |
-" |
792 |
- |
793 |
-src_prepare() { |
794 |
- local i |
795 |
- if [[ -n "${LINGUAS+x}" ]] ; then |
796 |
- for i in $(cd po ; echo *.po) ; do |
797 |
- if ! has ${i%.po} ${LINGUAS} ; then |
798 |
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die |
799 |
- fi |
800 |
- done |
801 |
- fi |
802 |
- |
803 |
- vala_src_prepare |
804 |
- xdg_src_prepare |
805 |
-} |
806 |
- |
807 |
-src_configure() { |
808 |
- # appstream_util & desktop_file_validate doesn't seem to |
809 |
- # doing anything useful for an actual release, maybe for 9999? |
810 |
- local emesonargs=( |
811 |
- -Dlibunwind_optional=$(usex unwind false true) |
812 |
- -Dpoodle=true |
813 |
- ) |
814 |
- |
815 |
- meson_src_configure |
816 |
-} |
817 |
- |
818 |
-pkg_postinst() { |
819 |
- xdg_pkg_postinst |
820 |
- gnome2_schemas_update |
821 |
-} |
822 |
- |
823 |
-pkg_postrm() { |
824 |
- xdg_pkg_postrm |
825 |
- gnome2_schemas_update |
826 |
-} |