Index: head/mail/geary/files/patch-0d96695 =================================================================== --- head/mail/geary/files/patch-0d96695 (revision 495724) +++ head/mail/geary/files/patch-0d96695 (nonexistent) @@ -1,190 +0,0 @@ -https://gitlab.gnome.org/GNOME/geary/issues/37 - -From 0d966950a2cba888873cd3a7f4f42bb7a017dc6d Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Mon, 23 Apr 2018 19:56:18 +0200 -Subject: [PATCH] Adjust to upstream javascriptcore-4.0 bindings - ---- - .../conversation-web-view.vala | 2 +- - src/client/util/util-webkit.vala | 10 +++---- - .../web-process/web-process-extension.vala | 17 ++++------- - src/engine/util/util-js.vala | 30 +++++++++++++------ - 4 files changed, 33 insertions(+), 26 deletions(-) - -diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala -index 588d39bd..d8512355 100644 ---- src/client/conversation-viewer/conversation-web-view.vala -+++ src/client/conversation-viewer/conversation-web-view.vala -@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView { - - private void on_deceptive_link_clicked(WebKit.JavascriptResult result) { - try { -- JS.GlobalContext context = result.get_global_context(); -+ unowned JS.GlobalContext context = result.get_global_context(); - JS.Object details = WebKitUtil.to_object(result); - - uint reason = (uint) Geary.JS.to_number( -diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala -index 319e28ad..cba9eaf2 100644 ---- src/client/util/util-webkit.vala -+++ src/client/util/util-webkit.vala -@@ -18,8 +18,8 @@ namespace WebKitUtil { - */ - public bool to_bool(WebKit.JavascriptResult result) - throws Geary.JS.Error { -- JS.GlobalContext context = result.get_global_context(); -- JS.Value value = result.get_value(); -+ unowned JS.GlobalContext context = result.get_global_context(); -+ unowned JS.Value value = result.get_value(); - if (!value.is_boolean(context)) { - throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object"); - } -@@ -59,12 +59,12 @@ namespace WebKitUtil { - */ - public string as_string(WebKit.JavascriptResult result) - throws Geary.JS.Error { -- JS.GlobalContext context = result.get_global_context(); -- JS.Value js_str_value = result.get_value(); -+ unowned JS.GlobalContext context = result.get_global_context(); -+ unowned JS.Value js_str_value = result.get_value(); - JS.Value? err = null; - JS.String js_str = js_str_value.to_string_copy(context, out err); - Geary.JS.check_exception(context, err); -- return Geary.JS.to_string_released(js_str); -+ return Geary.JS.to_string_released((owned) js_str); - } - - /** -diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala -index ee89139d..1f478a6c 100644 ---- src/client/web-process/web-process-extension.vala -+++ src/client/web-process/web-process-extension.vala -@@ -87,10 +87,9 @@ public class GearyWebExtension : Object { - bool should_load = false; - WebKit.Frame frame = page.get_main_frame(); - // Explicit cast fixes build on s390x/ppc64. Bug 783882 -- JS.GlobalContext context = (JS.GlobalContext) -- frame.get_javascript_global_context(); -+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); - try { -- JS.Value ret = execute_script( -+ unowned JS.Value ret = execute_script( - context, "geary.allowRemoteImages", int.parse("__LINE__") - ); - should_load = ret.to_boolean(context); -@@ -106,8 +105,7 @@ public class GearyWebExtension : Object { - private void remote_image_load_blocked(WebKit.WebPage page) { - WebKit.Frame frame = page.get_main_frame(); - // Explicit cast fixes build on s390x/ppc64. Bug 783882 -- JS.GlobalContext context = (JS.GlobalContext) -- frame.get_javascript_global_context(); -+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); - try { - execute_script( - context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__") -@@ -123,8 +121,7 @@ public class GearyWebExtension : Object { - private void selection_changed(WebKit.WebPage page) { - WebKit.Frame frame = page.get_main_frame(); - // Explicit cast fixes build on s390x/ppc64. Bug 783882 -- JS.GlobalContext context = (JS.GlobalContext) -- frame.get_javascript_global_context(); -+ unowned JS.GlobalContext context = frame.get_javascript_global_context(); - try { - execute_script( - context, "geary.selectionChanged();", int.parse("__LINE__") -@@ -136,20 +133,18 @@ public class GearyWebExtension : Object { - - // Return type is nullable as a workaround for Bug 778046, it will - // never actually be null. -- private JS.Value? execute_script(JS.Context context, string script, int line) -+ private unowned JS.Value? execute_script(JS.Context context, string script, int line) - throws Geary.JS.Error { - JS.String js_script = new JS.String.create_with_utf8_cstring(script); - JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__"); - JS.Value? err = null; - try { -- JS.Value ret = context.evaluate_script( -+ unowned JS.Value ret = context.evaluate_script( - js_script, null, js_source, line, out err - ); - Geary.JS.check_exception(context, err); - return ret; - } finally { -- js_script.release(); -- js_source.release(); - } - } - -diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala -index 4d224297..ea955e99 100644 ---- src/engine/util/util-js.vala -+++ src/engine/util/util-js.vala -@@ -10,6 +10,16 @@ - */ - namespace Geary.JS { - -+#if !VALA_0_42 -+ // Workaround broken version of this in the vala bindings. See Bug -+ // 788113. -+ [CCode (cname = "JSStringGetUTF8CString")] -+ private extern size_t js_string_get_utf8_cstring( -+ global::JS.String js, -+ [CCode (array_length_type = "gsize")] char[] buffer -+ ); -+#endif -+ - /** - * Errors produced by functions in {@link Geary.JS}. - */ -@@ -72,7 +82,7 @@ namespace Geary.JS { - global::JS.String js_str = value.to_string_copy(context, out err); - Geary.JS.check_exception(context, err); - -- return Geary.JS.to_string_released(js_str); -+ return Geary.JS.to_string_released((owned) js_str); - } - - /** -@@ -101,12 +111,15 @@ namespace Geary.JS { - /** - * Returns a JSC {@link JS.String} as a Vala {@link string}. - */ -- public inline string to_string_released(global::JS.String js) { -- int len = js.get_maximum_utf8_cstring_size(); -- string str = string.nfill(len, 0); -- js.get_utf8_cstring(str, len); -- js.release(); -- return str; -+ public inline string to_string_released(owned global::JS.String js) { -+ size_t len = js.get_maximum_utf8_cstring_size(); -+ uint8[] str = new uint8[len]; -+#if VALA_0_42 -+ js.get_utf8_cstring(str); -+#else -+ js_string_get_utf8_cstring(js, (char[]) str); -+#endif -+ return (string) str; - } - - /** -@@ -128,7 +141,6 @@ namespace Geary.JS { - try { - Geary.JS.check_exception(context, err); - } finally { -- js_name.release(); - } - return prop; - } -@@ -157,7 +169,7 @@ namespace Geary.JS { - - throw new Error.EXCEPTION( - "JS exception thrown [%s]: %s" -- .printf(err_type.to_string(), to_string_released(err_str)) -+ .printf(err_type.to_string(), to_string_released((owned) err_str)) - ); - } - } --- -2.18.1 - Property changes on: head/mail/geary/files/patch-0d96695 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/geary/files/patch-e091f24 =================================================================== --- head/mail/geary/files/patch-e091f24 (revision 495724) +++ head/mail/geary/files/patch-e091f24 (nonexistent) @@ -1,72 +0,0 @@ -https://gitlab.gnome.org/GNOME/geary/issues/37 - -From e091f24b00ec421e1aadd5e360d1550e658ad5ef Mon Sep 17 00:00:00 2001 -From: Michael James Gratton -Date: Sun, 20 May 2018 19:07:56 +1000 -Subject: [PATCH] Clean up JS util API courtesy the new bindings. - ---- - src/client/util/util-webkit.vala | 2 +- - src/engine/util/util-js.vala | 12 +++++------- - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala -index cba9eaf2..45a27c44 100644 ---- src/client/util/util-webkit.vala -+++ src/client/util/util-webkit.vala -@@ -64,7 +64,7 @@ namespace WebKitUtil { - JS.Value? err = null; - JS.String js_str = js_str_value.to_string_copy(context, out err); - Geary.JS.check_exception(context, err); -- return Geary.JS.to_string_released((owned) js_str); -+ return Geary.JS.to_native_string(js_str); - } - - /** -diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala -index ea955e99..a98d7985 100644 ---- src/engine/util/util-js.vala -+++ src/engine/util/util-js.vala -@@ -82,7 +82,7 @@ namespace Geary.JS { - global::JS.String js_str = value.to_string_copy(context, out err); - Geary.JS.check_exception(context, err); - -- return Geary.JS.to_string_released((owned) js_str); -+ return to_native_string(js_str); - } - - /** -@@ -111,7 +111,7 @@ namespace Geary.JS { - /** - * Returns a JSC {@link JS.String} as a Vala {@link string}. - */ -- public inline string to_string_released(owned global::JS.String js) { -+ public inline string to_native_string(global::JS.String js) { - size_t len = js.get_maximum_utf8_cstring_size(); - uint8[] str = new uint8[len]; - #if VALA_0_42 -@@ -138,10 +138,8 @@ namespace Geary.JS { - global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name); - global::JS.Value? err = null; - global::JS.Value prop = object.get_property(context, js_name, out err); -- try { -- Geary.JS.check_exception(context, err); -- } finally { -- } -+ Geary.JS.check_exception(context, err); -+ - return prop; - } - -@@ -169,7 +167,7 @@ namespace Geary.JS { - - throw new Error.EXCEPTION( - "JS exception thrown [%s]: %s" -- .printf(err_type.to_string(), to_string_released((owned) err_str)) -+ .printf(err_type.to_string(), to_native_string(err_str)) - ); - } - } --- -2.18.1 - Property changes on: head/mail/geary/files/patch-e091f24 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/geary/files/patch-5d0f711 =================================================================== --- head/mail/geary/files/patch-5d0f711 (revision 495724) +++ head/mail/geary/files/patch-5d0f711 (nonexistent) @@ -1,334 +0,0 @@ -https://gitlab.gnome.org/GNOME/geary/issues/37 - -From 5d0f711426d76f878cf9b71f7e8f785199c7cde1 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Thu, 22 Jun 2017 15:01:19 +0200 -Subject: [PATCH] bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 - vapi - ---- - bindings/metadata/Soup-2.4.metadata | 3 - - bindings/metadata/WebKit2-4.0.metadata | 15 -- - .../WebKit2WebExtension-4.0-custom.vala | 5 - - .../metadata/WebKit2WebExtension-4.0.metadata | 9 - - bindings/vapi/javascriptcore-4.0.vapi | 155 ------------------ - src/CMakeLists.txt | 39 +---- - test/CMakeLists.txt | 2 +- - 7 files changed, 4 insertions(+), 224 deletions(-) - delete mode 100644 bindings/metadata/Soup-2.4.metadata - delete mode 100644 bindings/metadata/WebKit2-4.0.metadata - delete mode 100644 bindings/metadata/WebKit2WebExtension-4.0-custom.vala - delete mode 100644 bindings/metadata/WebKit2WebExtension-4.0.metadata - delete mode 100644 bindings/vapi/javascriptcore-4.0.vapi - -diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata -deleted file mode 100644 -index f3e72e81..00000000 ---- bindings/metadata/Soup-2.4.metadata -+++ /dev/null -@@ -1,3 +0,0 @@ --AuthDomain.accepts skip --AuthDomain.challenge skip -- -diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata -deleted file mode 100644 -index 3e3044ff..00000000 ---- bindings/metadata/WebKit2-4.0.metadata -+++ /dev/null -@@ -1,15 +0,0 @@ -- --JavascriptResult -- .get_global_context nullable=false unowned=true -- .get_value nullable=false unowned=true -- --//Forward upstream --Download -- .failed#signal.error type="WebKit.DownloadError" --PrintOperation -- .failed#signal.error type="WebKit.PrintError" --WebResource -- .failed#signal.error type="GLib.Error" --WebView -- .load_failed#signal.error type="GLib.Error" -- .show_option_menu#signal skip -diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala -deleted file mode 100644 -index a994a774..00000000 ---- bindings/metadata/WebKit2WebExtension-4.0-custom.vala -+++ /dev/null -@@ -1,5 +0,0 @@ --namespace WebKit { -- namespace DOM { -- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event); -- } --} -diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata -deleted file mode 100644 -index c496dba4..00000000 ---- bindings/metadata/WebKit2WebExtension-4.0.metadata -+++ /dev/null -@@ -1,9 +0,0 @@ --DOM* parent="WebKit.DOM" name="DOM(.+)" -- --DOMEventTarget.add_event_listener skip --_ContextMenu skip --_ContextMenuItem skip -- --Frame.get_javascript_* nullable=false unowned=true -- --DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc" -diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi -deleted file mode 100644 -index d152ce2a..00000000 ---- bindings/vapi/javascriptcore-4.0.vapi -+++ /dev/null -@@ -1,155 +0,0 @@ --/* -- * Copyright 2017 Michael Gratton -- * -- * This software is licensed under the GNU Lesser General Public License -- * (version 2.1 or later). See the COPYING file in this distribution. -- */ -- --[CCode (cprefix = "JS", -- gir_namespace = "JavaScriptCore", -- gir_version = "4.0", -- lower_case_cprefix = "JS_", -- cheader_filename = "JavaScriptCore/JavaScript.h")] --namespace JS { -- -- [CCode (cname = "JSContextRef")] -- [SimpleType] -- public struct Context { -- -- [CCode (cname = "JSEvaluateScript")] -- public Value evaluate_script(String script, -- Object? thisObject, -- String? sourceURL, -- int startingLineNumber, -- out Value? exception); -- -- [CCode (cname = "JSCheckScriptSyntax")] -- public Value check_script_syntax(String script, -- String? sourceURL, -- int startingLineNumber, -- out Value? exception); -- -- } -- -- [CCode (cname = "JSGlobalContextRef")] -- [SimpleType] -- public struct GlobalContext : Context { -- -- [CCode (cname = "JSGlobalContextRetain")] -- public bool retain(); -- -- [CCode (cname = "JSGlobalContextRelease")] -- public bool release(); -- -- } -- -- [CCode (cname = "JSType", has_type_id = false)] -- public enum Type { -- -- [CCode (cname = "kJSTypeUndefined")] -- UNDEFINED, -- -- [CCode (cname = "kJSTypeNull")] -- NULL, -- -- [CCode (cname = "kJSTypeBoolean")] -- BOOLEAN, -- -- [CCode (cname = "kJSTypeNumber")] -- NUMBER, -- -- [CCode (cname = "kJSTypeString")] -- STRING, -- -- [CCode (cname = "kJSTypeObject")] -- OBJECT -- } -- -- [CCode (cname = "JSObjectRef")] -- [SimpleType] -- public struct Object { -- -- [CCode (cname = "JSObjectMakeFunction")] -- public Object.make_function(String? name, -- [CCode (array_length_pos=1.5)] -- String[]? parameterNames, -- String body, -- String? sourceURL, -- int startingLineNumber, -- out Value? exception); -- -- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)] -- public Value call_as_function(Context ctx, -- Object? thisObject, -- [CCode (array_length_pos=2.5)] -- Value[]? arguments, -- out Value? exception); -- -- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)] -- public bool has_property(Context ctx, String property_name); -- -- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)] -- public Value get_property(Context ctx, -- String property_name, -- out Value? exception); -- -- } -- -- [CCode (cname = "JSValueRef")] -- [SimpleType] -- public struct Value { -- -- [CCode (cname = "JSValueGetType", instance_pos = 1.1)] -- public Type get_type(Context context); -- -- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)] -- public bool is_boolean(Context ctx); -- -- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)] -- public bool is_number(Context ctx); -- -- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)] -- public bool is_object(Context ctx); -- -- [CCode (cname = "JSValueIsString", instance_pos = 1.1)] -- public bool is_string(Context ctx); -- -- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)] -- public bool to_boolean(Context ctx); -- -- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)] -- public double to_number(Context ctx, out Value exception); -- -- [CCode (cname = "JSValueToObject", instance_pos = 1.1)] -- public Object to_object(Context ctx, out Value exception); -- -- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)] -- public String to_string_copy(Context ctx, out Value exception); -- -- } -- -- [CCode (cname = "JSStringRef")] -- [SimpleType] -- public struct String { -- -- [CCode (cname = "JSStringCreateWithUTF8CString")] -- public String.create_with_utf8_cstring(string str); -- -- [CCode (cname = "JSStringGetLength")] -- public int String.get_length(); -- -- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")] -- public int String.get_maximum_utf8_cstring_size(); -- -- [CCode (cname = "JSStringGetUTF8CString")] -- public void String.get_utf8_cstring(string* buffer, int bufferSize); -- -- [CCode (cname = "JSStringRetain")] -- public void String.retain(); -- -- [CCode (cname = "JSStringRelease")] -- public void String.release(); -- -- } -- --} -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1e4213fc..e0bebdf7 100644 ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES - gio-2.0 - glib-2.0 - gmime-2.6 -- javascriptcore-4.0 -+ javascriptcoregtk-4.0 - libxml-2.0 - posix - sqlite3 -@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES - geary-engine - gee-0.8 - gtk+-3.0 -- javascriptcore-4.0 -+ javascriptcoregtk-4.0 - libsoup-2.4 - webkit2gtk-web-extension-4.0 - ) -@@ -618,7 +618,6 @@ add_definitions(${CFLAGS}) - set(VALAC_OPTIONS - --vapidir=${CMAKE_BINARY_DIR}/src - --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi -- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata - --target-glib=${TARGET_GLIB} - --thread - --debug -@@ -650,38 +649,6 @@ set_property( - ) - target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn) - --# WebKit2GTK VAPI generation --################################################# --add_custom_target(webkit2gtk-vapi -- DEPENDS -- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi" -- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi" -- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" --) --add_custom_command( -- OUTPUT -- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi -- DEPENDS -- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata" -- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" -- WORKING_DIRECTORY -- "${CMAKE_SOURCE_DIR}/bindings/metadata" -- COMMAND -- 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 --) --add_custom_command( -- OUTPUT -- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi" -- DEPENDS -- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata" -- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala" -- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi" -- WORKING_DIRECTORY -- "${CMAKE_SOURCE_DIR}/bindings/metadata" -- COMMAND -- 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 --) -- - # Client library (static lib used for building client and unit tests) - ################################################# - -@@ -698,7 +665,7 @@ OPTIONS - ) - - add_library(geary-client STATIC ${CLIENT_VALA_C}) --add_dependencies(geary-client resource_copy webkit2gtk-vapi) -+add_dependencies(geary-client resource_copy) - target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine) - - # Main client application binary -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index afcca95c..7517b3da 100644 ---- test/CMakeLists.txt -+++ test/CMakeLists.txt -@@ -56,7 +56,7 @@ set(TEST_PACKAGES - glib-2.0 - gmime-2.6 - gtk+-3.0 -- javascriptcore-4.0 -+ javascriptcoregtk-4.0 - libsoup-2.4 - webkit2gtk-4.0 - ) --- -2.18.1 - Property changes on: head/mail/geary/files/patch-5d0f711 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/geary/Makefile =================================================================== --- head/mail/geary/Makefile (revision 495724) +++ head/mail/geary/Makefile (revision 495725) @@ -1,43 +1,43 @@ # Created by: Gustau Perez # $FreeBSD$ PORTNAME= geary -PORTVERSION= 0.12.4 -PORTREVISION= 1 +PORTVERSION= 0.13.3 CATEGORIES= mail gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Mail client for GNOME 3 LICENSE= BSD2CLAUSE CC-BY-3.0 LGPL21+ LICENSE_COMB= multi -BUILD_DEPENDS= vapigen:lang/vala +BUILD_DEPENDS= vapigen:lang/vala \ + itstool:textproc/itstool LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ + libsoup-2.4.so:devel/libsoup \ + libunwind.so:devel/libunwind \ + libjson-glib-1.0.so:devel/json-glib \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ - libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 \ + libgoa-1.0.so:net/gnome-online-accounts \ libcanberra.so:audio/libcanberra \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libnotify.so:devel/libnotify \ libgee-0.8.so:devel/libgee \ libgcr-3.so:security/gcr \ libsecret-1.so:security/libsecret \ - libp11-kit.so:security/p11-kit \ - libsoup-2.4.so:devel/libsoup \ - libenchant.so:textproc/enchant + libenchant-2.so:textproc/enchant2 -USES= cmake compiler:c11 desktop-file-utils gettext gnome libtool \ - localbase:ldflags pkgconfig shebangfix sqlite tar:xz -USE_GNOME= cairo gnomedocutils gnomeprefix gtk30 intlhack introspection -SHEBANG_FILES= desktop/geary-attach +USES= compiler:c11 desktop-file-utils gettext gmake gnome meson \ + pkgconfig python:3.5+,build shebangfix sqlite tar:xz +USE_GNOME= cairo gtk30 libxml2 + USE_LDCONFIG= yes + +SHEBANG_FILES= desktop/geary-attach INSTALLS_ICONS= yes -CMAKE_ARGS= -DNO_FATAL_WARNINGS:BOOL=ON \ - -DISO_CODE_639_XML:STRING=${LOCALBASE}/share/xml/iso-codes/iso_639.xml \ - -DISO_CODE_3166_XML:STRING=${LOCALBASE}/share/xml/iso-codes/iso_3166.xml +BINARY_ALIAS= python3=${PYTHON_VERSION} GLIB_SCHEMAS= org.gnome.Geary.gschema.xml .include Index: head/mail/geary/distinfo =================================================================== --- head/mail/geary/distinfo (revision 495724) +++ head/mail/geary/distinfo (revision 495725) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542129202 -SHA256 (gnome3/geary-0.12.4.tar.xz) = b5224cb3f07d6856acc67b3242785c115fa1bba1f9677267823bdfe9e484d307 -SIZE (gnome3/geary-0.12.4.tar.xz) = 1070368 +TIMESTAMP = 1552340885 +SHA256 (gnome/geary-0.13.3.tar.xz) = f1d7a9192f927a8889767d0c0a62598bafd1c3d1f4e6a9bd4397ee2084b1710c +SIZE (gnome/geary-0.13.3.tar.xz) = 2337168 Index: head/mail/geary/pkg-plist =================================================================== --- head/mail/geary/pkg-plist (revision 495724) +++ head/mail/geary/pkg-plist (revision 495725) @@ -1,228 +1,264 @@ bin/geary -bin/geary-attach lib/geary/web-extensions/libgeary-web-process.so -share/appdata/org.gnome.Geary.appdata.xml share/applications/geary-autostart.desktop share/applications/org.gnome.Geary.desktop -share/contractor/geary-attach.contract %%DATADIR%%/sql/version-001.sql %%DATADIR%%/sql/version-002.sql %%DATADIR%%/sql/version-003.sql %%DATADIR%%/sql/version-004.sql %%DATADIR%%/sql/version-005.sql %%DATADIR%%/sql/version-006.sql %%DATADIR%%/sql/version-007.sql %%DATADIR%%/sql/version-008.sql %%DATADIR%%/sql/version-009.sql %%DATADIR%%/sql/version-010.sql %%DATADIR%%/sql/version-011.sql %%DATADIR%%/sql/version-012.sql %%DATADIR%%/sql/version-013.sql %%DATADIR%%/sql/version-014.sql %%DATADIR%%/sql/version-015.sql %%DATADIR%%/sql/version-016.sql %%DATADIR%%/sql/version-017.sql %%DATADIR%%/sql/version-018.sql %%DATADIR%%/sql/version-019.sql %%DATADIR%%/sql/version-020.sql %%DATADIR%%/sql/version-021.sql %%DATADIR%%/sql/version-022.sql %%DATADIR%%/sql/version-023.sql %%DATADIR%%/sql/version-024.sql %%DATADIR%%/sql/version-025.sql -share/gnome/help/geary/C/accounts.page -share/gnome/help/geary/C/archive.page -share/gnome/help/geary/C/bugs.page -share/gnome/help/geary/C/figures/geary.svg -share/gnome/help/geary/C/index.page -share/gnome/help/geary/C/label.page -share/gnome/help/geary/C/limits.page -share/gnome/help/geary/C/overview.page -share/gnome/help/geary/C/preferences.page -share/gnome/help/geary/C/search.page -share/gnome/help/geary/C/shortcuts.page -share/gnome/help/geary/C/star.page -share/gnome/help/geary/C/write.page -share/gnome/help/geary/cs/accounts.page -share/gnome/help/geary/cs/archive.page -share/gnome/help/geary/cs/bugs.page -share/gnome/help/geary/cs/index.page -share/gnome/help/geary/cs/label.page -share/gnome/help/geary/cs/limits.page -share/gnome/help/geary/cs/overview.page -share/gnome/help/geary/cs/preferences.page -share/gnome/help/geary/cs/search.page -share/gnome/help/geary/cs/shortcuts.page -share/gnome/help/geary/cs/star.page -share/gnome/help/geary/cs/write.page -share/gnome/help/geary/de/accounts.page -share/gnome/help/geary/de/archive.page -share/gnome/help/geary/de/bugs.page -share/gnome/help/geary/de/index.page -share/gnome/help/geary/de/label.page -share/gnome/help/geary/de/limits.page -share/gnome/help/geary/de/overview.page -share/gnome/help/geary/de/preferences.page -share/gnome/help/geary/de/search.page -share/gnome/help/geary/de/shortcuts.page -share/gnome/help/geary/de/star.page -share/gnome/help/geary/de/write.page -share/gnome/help/geary/el/accounts.page -share/gnome/help/geary/el/archive.page -share/gnome/help/geary/el/bugs.page -share/gnome/help/geary/el/index.page -share/gnome/help/geary/el/label.page -share/gnome/help/geary/el/limits.page -share/gnome/help/geary/el/overview.page -share/gnome/help/geary/el/preferences.page -share/gnome/help/geary/el/search.page -share/gnome/help/geary/el/shortcuts.page -share/gnome/help/geary/el/star.page -share/gnome/help/geary/el/write.page -share/gnome/help/geary/es/accounts.page -share/gnome/help/geary/es/archive.page -share/gnome/help/geary/es/bugs.page -share/gnome/help/geary/es/index.page -share/gnome/help/geary/es/label.page -share/gnome/help/geary/es/limits.page -share/gnome/help/geary/es/overview.page -share/gnome/help/geary/es/preferences.page -share/gnome/help/geary/es/search.page -share/gnome/help/geary/es/shortcuts.page -share/gnome/help/geary/es/star.page -share/gnome/help/geary/es/write.page -share/gnome/help/geary/fr/accounts.page -share/gnome/help/geary/fr/archive.page -share/gnome/help/geary/fr/bugs.page -share/gnome/help/geary/fr/index.page -share/gnome/help/geary/fr/label.page -share/gnome/help/geary/fr/limits.page -share/gnome/help/geary/fr/overview.page -share/gnome/help/geary/fr/preferences.page -share/gnome/help/geary/fr/search.page -share/gnome/help/geary/fr/shortcuts.page -share/gnome/help/geary/fr/star.page -share/gnome/help/geary/fr/write.page -share/gnome/help/geary/it/accounts.page -share/gnome/help/geary/it/archive.page -share/gnome/help/geary/it/bugs.page -share/gnome/help/geary/it/index.page -share/gnome/help/geary/it/label.page -share/gnome/help/geary/it/limits.page -share/gnome/help/geary/it/overview.page -share/gnome/help/geary/it/preferences.page -share/gnome/help/geary/it/search.page -share/gnome/help/geary/it/shortcuts.page -share/gnome/help/geary/it/star.page -share/gnome/help/geary/it/write.page -share/gnome/help/geary/pl/accounts.page -share/gnome/help/geary/pl/archive.page -share/gnome/help/geary/pl/bugs.page -share/gnome/help/geary/pl/index.page -share/gnome/help/geary/pl/label.page -share/gnome/help/geary/pl/limits.page -share/gnome/help/geary/pl/overview.page -share/gnome/help/geary/pl/preferences.page -share/gnome/help/geary/pl/search.page -share/gnome/help/geary/pl/shortcuts.page -share/gnome/help/geary/pl/star.page -share/gnome/help/geary/pl/write.page -share/gnome/help/geary/pt_BR/accounts.page -share/gnome/help/geary/pt_BR/archive.page -share/gnome/help/geary/pt_BR/bugs.page -share/gnome/help/geary/pt_BR/index.page -share/gnome/help/geary/pt_BR/label.page -share/gnome/help/geary/pt_BR/limits.page -share/gnome/help/geary/pt_BR/overview.page -share/gnome/help/geary/pt_BR/preferences.page -share/gnome/help/geary/pt_BR/search.page -share/gnome/help/geary/pt_BR/shortcuts.page -share/gnome/help/geary/pt_BR/star.page -share/gnome/help/geary/pt_BR/write.page -share/gnome/help/geary/sv/accounts.page -share/gnome/help/geary/sv/archive.page -share/gnome/help/geary/sv/bugs.page -share/gnome/help/geary/sv/index.page -share/gnome/help/geary/sv/label.page -share/gnome/help/geary/sv/limits.page -share/gnome/help/geary/sv/overview.page -share/gnome/help/geary/sv/preferences.page -share/gnome/help/geary/sv/search.page -share/gnome/help/geary/sv/shortcuts.page -share/gnome/help/geary/sv/star.page -share/gnome/help/geary/sv/write.page +share/help/C/geary/accounts.page +share/help/C/geary/archive.page +share/help/C/geary/bugs.page +share/help/C/geary/contributing.page +share/help/C/geary/figures/geary.svg +share/help/C/geary/index.page +share/help/C/geary/label.page +share/help/C/geary/limits.page +share/help/C/geary/overview.page +share/help/C/geary/preferences.page +share/help/C/geary/search.page +share/help/C/geary/shortcuts.page +share/help/C/geary/star.page +share/help/C/geary/write.page +share/help/cs/geary/accounts.page +share/help/cs/geary/archive.page +share/help/cs/geary/bugs.page +share/help/cs/geary/contributing.page +share/help/cs/geary/figures/geary.svg +share/help/cs/geary/index.page +share/help/cs/geary/label.page +share/help/cs/geary/limits.page +share/help/cs/geary/overview.page +share/help/cs/geary/preferences.page +share/help/cs/geary/search.page +share/help/cs/geary/shortcuts.page +share/help/cs/geary/star.page +share/help/cs/geary/write.page +share/help/de/geary/accounts.page +share/help/de/geary/archive.page +share/help/de/geary/bugs.page +share/help/de/geary/contributing.page +share/help/de/geary/figures/geary.svg +share/help/de/geary/index.page +share/help/de/geary/label.page +share/help/de/geary/limits.page +share/help/de/geary/overview.page +share/help/de/geary/preferences.page +share/help/de/geary/search.page +share/help/de/geary/shortcuts.page +share/help/de/geary/star.page +share/help/de/geary/write.page +share/help/el/geary/accounts.page +share/help/el/geary/archive.page +share/help/el/geary/bugs.page +share/help/el/geary/contributing.page +share/help/el/geary/figures/geary.svg +share/help/el/geary/index.page +share/help/el/geary/label.page +share/help/el/geary/limits.page +share/help/el/geary/overview.page +share/help/el/geary/preferences.page +share/help/el/geary/search.page +share/help/el/geary/shortcuts.page +share/help/el/geary/star.page +share/help/el/geary/write.page +share/help/es/geary/accounts.page +share/help/es/geary/archive.page +share/help/es/geary/bugs.page +share/help/es/geary/contributing.page +share/help/es/geary/figures/geary.svg +share/help/es/geary/index.page +share/help/es/geary/label.page +share/help/es/geary/limits.page +share/help/es/geary/overview.page +share/help/es/geary/preferences.page +share/help/es/geary/search.page +share/help/es/geary/shortcuts.page +share/help/es/geary/star.page +share/help/es/geary/write.page +share/help/fr/geary/accounts.page +share/help/fr/geary/archive.page +share/help/fr/geary/bugs.page +share/help/fr/geary/contributing.page +share/help/fr/geary/figures/geary.svg +share/help/fr/geary/index.page +share/help/fr/geary/label.page +share/help/fr/geary/limits.page +share/help/fr/geary/overview.page +share/help/fr/geary/preferences.page +share/help/fr/geary/search.page +share/help/fr/geary/shortcuts.page +share/help/fr/geary/star.page +share/help/fr/geary/write.page +share/help/it/geary/accounts.page +share/help/it/geary/archive.page +share/help/it/geary/bugs.page +share/help/it/geary/contributing.page +share/help/it/geary/figures/geary.svg +share/help/it/geary/index.page +share/help/it/geary/label.page +share/help/it/geary/limits.page +share/help/it/geary/overview.page +share/help/it/geary/preferences.page +share/help/it/geary/search.page +share/help/it/geary/shortcuts.page +share/help/it/geary/star.page +share/help/it/geary/write.page +share/help/pl/geary/accounts.page +share/help/pl/geary/archive.page +share/help/pl/geary/bugs.page +share/help/pl/geary/contributing.page +share/help/pl/geary/figures/geary.svg +share/help/pl/geary/index.page +share/help/pl/geary/label.page +share/help/pl/geary/limits.page +share/help/pl/geary/overview.page +share/help/pl/geary/preferences.page +share/help/pl/geary/search.page +share/help/pl/geary/shortcuts.page +share/help/pl/geary/star.page +share/help/pl/geary/write.page +share/help/pt_BR/geary/accounts.page +share/help/pt_BR/geary/archive.page +share/help/pt_BR/geary/bugs.page +share/help/pt_BR/geary/contributing.page +share/help/pt_BR/geary/figures/geary.svg +share/help/pt_BR/geary/index.page +share/help/pt_BR/geary/label.page +share/help/pt_BR/geary/limits.page +share/help/pt_BR/geary/overview.page +share/help/pt_BR/geary/preferences.page +share/help/pt_BR/geary/search.page +share/help/pt_BR/geary/shortcuts.page +share/help/pt_BR/geary/star.page +share/help/pt_BR/geary/write.page +share/help/sv/geary/accounts.page +share/help/sv/geary/archive.page +share/help/sv/geary/bugs.page +share/help/sv/geary/contributing.page +share/help/sv/geary/figures/geary.svg +share/help/sv/geary/index.page +share/help/sv/geary/label.page +share/help/sv/geary/limits.page +share/help/sv/geary/overview.page +share/help/sv/geary/preferences.page +share/help/sv/geary/search.page +share/help/sv/geary/shortcuts.page +share/help/sv/geary/star.page +share/help/sv/geary/write.page +share/help/tr/geary/accounts.page +share/help/tr/geary/archive.page +share/help/tr/geary/bugs.page +share/help/tr/geary/contributing.page +share/help/tr/geary/figures/geary.svg +share/help/tr/geary/index.page +share/help/tr/geary/label.page +share/help/tr/geary/limits.page +share/help/tr/geary/overview.page +share/help/tr/geary/preferences.page +share/help/tr/geary/search.page +share/help/tr/geary/shortcuts.page +share/help/tr/geary/star.page +share/help/tr/geary/write.page share/icons/hicolor/16x16/apps/org.gnome.Geary.png share/icons/hicolor/24x24/apps/org.gnome.Geary.png share/icons/hicolor/256x256/apps/org.gnome.Geary.png share/icons/hicolor/32x32/apps/org.gnome.Geary.png share/icons/hicolor/48x48/apps/org.gnome.Geary.png share/icons/hicolor/512x512/apps/org.gnome.Geary.png share/icons/hicolor/scalable/actions/close-symbolic.svg share/icons/hicolor/scalable/actions/detach-symbolic.svg share/icons/hicolor/scalable/actions/edit-symbolic.svg +share/icons/hicolor/scalable/actions/format-ordered-list-symbolic-rtl.svg +share/icons/hicolor/scalable/actions/format-ordered-list-symbolic.svg share/icons/hicolor/scalable/actions/format-text-remove-symbolic.svg +share/icons/hicolor/scalable/actions/format-unordered-list-symbolic-rtl.svg +share/icons/hicolor/scalable/actions/format-unordered-list-symbolic.svg share/icons/hicolor/scalable/actions/mail-archive-symbolic.svg share/icons/hicolor/scalable/actions/mail-drafts-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-drafts-symbolic.svg share/icons/hicolor/scalable/actions/mail-forward-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-forward-symbolic.svg share/icons/hicolor/scalable/actions/mail-inbox-symbolic.svg share/icons/hicolor/scalable/actions/mail-outbox-symbolic.svg share/icons/hicolor/scalable/actions/mail-reply-all-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-reply-all-symbolic.svg share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-reply-sender-symbolic.svg share/icons/hicolor/scalable/actions/mail-sent-symbolic-rtl.svg share/icons/hicolor/scalable/actions/mail-sent-symbolic.svg share/icons/hicolor/scalable/actions/marker-symbolic.svg share/icons/hicolor/scalable/actions/tag-symbolic-rtl.svg share/icons/hicolor/scalable/actions/tag-symbolic.svg share/icons/hicolor/scalable/actions/text-x-generic-symbolic.svg share/icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg share/locale/ar/LC_MESSAGES/geary.mo +share/locale/be/LC_MESSAGES/geary.mo share/locale/bs/LC_MESSAGES/geary.mo share/locale/ca/LC_MESSAGES/geary.mo share/locale/cs/LC_MESSAGES/geary.mo share/locale/da/LC_MESSAGES/geary.mo share/locale/de/LC_MESSAGES/geary.mo share/locale/el/LC_MESSAGES/geary.mo share/locale/en_CA/LC_MESSAGES/geary.mo share/locale/en_GB/LC_MESSAGES/geary.mo share/locale/eo/LC_MESSAGES/geary.mo share/locale/es/LC_MESSAGES/geary.mo share/locale/et/LC_MESSAGES/geary.mo share/locale/eu/LC_MESSAGES/geary.mo share/locale/fa/LC_MESSAGES/geary.mo share/locale/fi/LC_MESSAGES/geary.mo share/locale/fr/LC_MESSAGES/geary.mo share/locale/gl/LC_MESSAGES/geary.mo share/locale/he/LC_MESSAGES/geary.mo share/locale/hi/LC_MESSAGES/geary.mo share/locale/hr/LC_MESSAGES/geary.mo share/locale/hu/LC_MESSAGES/geary.mo share/locale/id/LC_MESSAGES/geary.mo share/locale/it/LC_MESSAGES/geary.mo share/locale/ja/LC_MESSAGES/geary.mo share/locale/kk/LC_MESSAGES/geary.mo share/locale/km/LC_MESSAGES/geary.mo share/locale/lt/LC_MESSAGES/geary.mo share/locale/ms/LC_MESSAGES/geary.mo share/locale/nb/LC_MESSAGES/geary.mo share/locale/nl/LC_MESSAGES/geary.mo share/locale/oc/LC_MESSAGES/geary.mo share/locale/pl/LC_MESSAGES/geary.mo share/locale/pt/LC_MESSAGES/geary.mo share/locale/pt_BR/LC_MESSAGES/geary.mo share/locale/ro/LC_MESSAGES/geary.mo share/locale/ru/LC_MESSAGES/geary.mo share/locale/sk/LC_MESSAGES/geary.mo share/locale/sl/LC_MESSAGES/geary.mo share/locale/sr/LC_MESSAGES/geary.mo share/locale/sr@latin/LC_MESSAGES/geary.mo share/locale/sv/LC_MESSAGES/geary.mo share/locale/te/LC_MESSAGES/geary.mo share/locale/tr/LC_MESSAGES/geary.mo share/locale/uk/LC_MESSAGES/geary.mo share/locale/vi/LC_MESSAGES/geary.mo share/locale/zh_CN/LC_MESSAGES/geary.mo share/locale/zh_TW/LC_MESSAGES/geary.mo +share/metainfo/org.gnome.Geary.appdata.xml