cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to shotwell-0.23.0.

Browse Source
This commit is contained in:
ajacoutot 2016-04-26 11:10:56 +00:00
parent 9c16a16e3b
commit 63ba149c3f
11 changed files with 41 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/shotwell/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.54 2016/04/16 10:48:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.55 2016/04/26 11:10:56 ajacoutot Exp $
COMMENT = digital photo organizer
GNOME_VERSION = 0.22.1
GNOME_VERSION = 0.23.0
GNOME_PROJECT = shotwell
CATEGORIES = graphics
@ -42,13 +42,8 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --disable-desktop-update \
--disable-icon-update
# From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
# Subject: Port to webkit2gtk-4.0
post-extract:
rm ${WRKSRC}/vapi/webkitgtk-3.0.deps \
${WRKSRC}/vapi/webkitgtk-3.0.vapi
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/Makefile.plugin.mk
${SUBST_CMD} ${WRKSRC}/Makefile \
${WRKSRC}/plugins/Makefile.plugin.mk
.include <bsd.port.mk>

4
graphics/shotwell/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (shotwell-0.22.1.tar.xz) = cyUMl/WIagoGSqJWaV7tvvdxHEqcdjSQU8+Ze1TqNKk=
SIZE (shotwell-0.22.1.tar.xz) = 1903104
SHA256 (shotwell-0.23.0.tar.xz) = HWS/FFbU2VXI22kiWmPh9rZSq5HzEhoCJIZCh5m78f0=
SIZE (shotwell-0.23.0.tar.xz) = 1929944

78
graphics/shotwell/patches/patch-Makefile
View File

@ -1,41 +1,10 @@
$OpenBSD: patch-Makefile,v 1.18 2016/01/08 10:28:42 ajacoutot Exp $
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
$OpenBSD: patch-Makefile,v 1.19 2016/04/26 11:10:56 ajacoutot Exp $
remove gudev requirement
--- Makefile.orig Fri Jan 8 11:10:39 2016
+++ Makefile Fri Jan 8 11:10:46 2016
@@ -14,7 +14,7 @@ VALAC := $(shell which $(VALAC))
endif
VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
-MIN_VALAC_VERSION := 0.20.1
+MIN_VALAC_VERSION := 0.28.0
INSTALL_PROGRAM := install
INSTALL_DATA := install -m 644
@@ -120,12 +120,10 @@ VAPI_FILES = \
LConv.vapi \
libexif.vapi \
libraw.vapi \
- webkitgtk-3.0.vapi \
unique-3.0.vapi \
unity.vapi
DEPS_FILES = \
- webkitgtk-3.0.deps \
unique-3.0.deps \
unity.deps
@@ -263,7 +261,6 @@ EXT_PKGS = \
--- Makefile.orig Mon Apr 25 22:46:04 2016
+++ Makefile Tue Apr 26 12:55:52 2016
@@ -261,7 +261,6 @@ EXT_PKGS = \
gstreamer-base-1.0 \
gstreamer-pbutils-1.0 \
gtk+-3.0 \
@ -43,16 +12,7 @@ remove gudev requirement
libexif \
libgphoto2 \
json-glib-1.0 \
@@ -271,7 +268,7 @@ EXT_PKGS = \
libsoup-2.4 \
libxml-2.0 \
sqlite3 \
- webkitgtk-3.0
+ webkit2gtk-4.0
ifdef UNITY_SUPPORT
EXT_PKGS += unity
endif
@@ -295,7 +292,6 @@ EXT_PKG_VERSIONS = \
@@ -293,7 +292,6 @@ EXT_PKG_VERSIONS = \
gstreamer-plugins-base-1.0 >= 1.0.0 \
gstreamer-pbutils-1.0 >= 1.0.0 \
gtk+-3.0 >= 3.12.2 \
@ -60,36 +20,14 @@ remove gudev requirement
libexif >= 0.6.16 \
libgphoto2 >= 2.4.2 \
libraw >= 0.13.2 \
@@ -303,7 +299,7 @@ EXT_PKG_VERSIONS = \
libxml-2.0 >= 2.6.32 \
rest-0.7 >= 0.7 \
sqlite3 >= 3.5.9 \
- webkitgtk-3.0 >= 1.4.0 \
+ webkit2gtk-4.0 \
gnome-doc-utils
DIRECT_LIBS_VERSIONS =
@@ -544,8 +540,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
@@ -542,8 +540,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
endif
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
- mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
+ mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings
+ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings
+ mkdir -p $(DESTDIR)/${TRUEPREFIX}/share/GConf/gsettings
+ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/${TRUEPREFIX}/share/GConf/gsettings
endif
ifndef DISABLE_ICON_UPDATE
-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
@@ -721,9 +717,9 @@ pkgcheck:
.PHONY: valacheck
valacheck:
@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. No valac found in path or $$VALAC.'; exit 1 )
- @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
- $(if $(MAX_VALAC_VERSION),\
- @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
+# @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
+# $(if $(MAX_VALAC_VERSION),\
+# @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)

9
graphics/shotwell/patches/patch-chkver Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-chkver,v 1.1 2016/04/26 11:10:56 ajacoutot Exp $
--- chkver.orig Tue Apr 26 12:50:25 2016
+++ chkver Tue Apr 26 12:50:28 2016
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
#
# Copyright 2009-2015 Yorba Foundation
#

16
graphics/shotwell/patches/patch-plugins_Makefile_plugin_mk
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.6 2015/03/24 08:03:55 ajacoutot Exp $
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.7 2016/04/26 11:10:56 ajacoutot Exp $
drop -nostdlib: shotwell-publishing.so: undefined symbol '__guard_local'
--- plugins/Makefile.plugin.mk.orig Tue Mar 4 23:54:12 2014
+++ plugins/Makefile.plugin.mk Tue Mar 24 08:57:23 2015
@@ -34,7 +34,7 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
CFILES := $(notdir $(SRC_FILES:.vala=.c))
--- plugins/Makefile.plugin.mk.orig Mon Apr 25 22:25:45 2016
+++ plugins/Makefile.plugin.mk Tue Apr 26 12:44:30 2016
@@ -35,7 +35,7 @@ CFILES := $(notdir $(SRC_FILES:.vala=.c))
OFILES := $(notdir $(SRC_FILES:.vala=.o))
-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
+CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -I${LOCALBASE}/include -export-dynamic $(PLUGIN_CFLAGS)
LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
CFLAGS := $(shell pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)) \
- -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
+ -export-dynamic $(PLUGIN_CFLAGS)
LIBS := $(shell pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS))
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'

103
graphics/shotwell/patches/patch-plugins_common_RESTSupport_vala
View File

@ -1,103 +0,0 @@
$OpenBSD: patch-plugins_common_RESTSupport_vala,v 1.1 2016/01/08 10:28:42 ajacoutot Exp $
From f045b7a13cc1efbfa3054338d0edf569df51f4e7 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Fri, 4 Dec 2015 17:34:17 +0100
Subject: Have all soup sessions validate TLS certificates
From a2844fbfeb23a0bf6b2489761ab5f51e15dc4efe Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Fri, 4 Dec 2015 17:33:43 +0100
Subject: Don't pack webview into a scrolled window
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
--- plugins/common/RESTSupport.vala.orig Fri Jan 8 11:11:42 2016
+++ plugins/common/RESTSupport.vala Fri Jan 8 11:12:07 2016
@@ -20,6 +20,7 @@ public abstract class Session {
public Session(string? endpoint_url = null) {
this.endpoint_url = endpoint_url;
soup_session = new Soup.SessionAsync();
+ this.soup_session.ssl_use_system_ca_file = true;
}
protected void notify_wire_message_unqueued(Soup.Message message) {
@@ -725,7 +726,6 @@ public abstract class GooglePublisher : Object, Spit.P
private WebKit.WebView webview;
private Gtk.Box pane_widget;
- private Gtk.ScrolledWindow webview_frame;
private string auth_sequence_start_url;
public signal void authorized(string auth_code);
@@ -735,26 +735,20 @@ public abstract class GooglePublisher : Object, Spit.P
pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
- webview_frame = new Gtk.ScrolledWindow(null, null);
- webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN);
- webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-
webview = new WebKit.WebView();
webview.get_settings().enable_plugins = false;
- webview.get_settings().enable_default_context_menu = false;
- webview.load_finished.connect(on_page_load);
- webview.load_started.connect(on_load_started);
+ webview.load_changed.connect(on_page_load_changed);
+ webview.context_menu.connect(() => { return false; });
- webview_frame.add(webview);
- pane_widget.pack_start(webview_frame, true, true, 0);
+ pane_widget.pack_start(webview, true, true, 0);
}
public static bool is_cache_dirty() {
return cache_dirty;
}
- private void on_page_load(WebKit.WebFrame origin_frame) {
+ private void on_page_load() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
string page_title = webview.get_title();
@@ -772,9 +766,22 @@ public abstract class GooglePublisher : Object, Spit.P
}
}
- private void on_load_started(WebKit.WebFrame frame) {
+ private void on_load_started() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
}
+
+ private void on_page_load_changed (WebKit.LoadEvent load_event) {
+ switch (load_event) {
+ case WebKit.LoadEvent.STARTED:
+ on_load_started();
+ break;
+ case WebKit.LoadEvent.FINISHED:
+ on_page_load();
+ break;
+ }
+
+ return;
+ }
public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
return Spit.Publishing.DialogPane.GeometryOptions.NONE;
@@ -785,7 +792,7 @@ public abstract class GooglePublisher : Object, Spit.P
}
public void on_pane_installed() {
- webview.open(auth_sequence_start_url);
+ webview.load_uri(auth_sequence_start_url);
}
public void on_pane_uninstalled() {

22
graphics/shotwell/patches/patch-plugins_shotwell-publishing-extras_Makefile
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-plugins_shotwell-publishing-extras_Makefile,v 1.1 2016/01/08 10:28:42 ajacoutot Exp $
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
--- plugins/shotwell-publishing-extras/Makefile.orig Fri Jan 8 11:11:34 2016
+++ plugins/shotwell-publishing-extras/Makefile Fri Jan 8 11:10:48 2016
@@ -5,7 +5,7 @@ PLUGIN_PKGS := \
gtk+-3.0 \
libsoup-2.4 \
libxml-2.0 \
- webkitgtk-3.0 \
+ webkit2gtk-4.0 \
gee-0.8 \
rest-0.7 \
json-glib-1.0

112
graphics/shotwell/patches/patch-plugins_shotwell-publishing-extras_YandexPublishing_vala
View File

@ -1,112 +0,0 @@
$OpenBSD: patch-plugins_shotwell-publishing-extras_YandexPublishing_vala,v 1.1 2016/01/08 10:28:42 ajacoutot Exp $
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
--- plugins/shotwell-publishing-extras/YandexPublishing.vala.orig Fri Jan 8 11:11:38 2016
+++ plugins/shotwell-publishing-extras/YandexPublishing.vala Fri Jan 8 11:10:48 2016
@@ -120,43 +120,70 @@ internal class WebAuthPane : Spit.Publishing.DialogPan
webview = new WebKit.WebView();
webview.get_settings().enable_plugins = false;
- webview.get_settings().enable_default_context_menu = false;
- webview.load_finished.connect(on_page_load);
- webview.load_started.connect(on_load_started);
- webview.navigation_requested.connect(navigation_requested);
+ webview.load_changed.connect(on_page_load_changed);
+ webview.decide_policy.connect(on_decide_policy);
+ webview.context_menu.connect(() => { return false; });
webview_frame.add(webview);
pane_widget.pack_start(webview_frame, true, true, 0);
}
- private void on_page_load(WebKit.WebFrame origin_frame) {
+ private void on_page_load() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
}
- private WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest req) {
- debug("Navigating to '%s'", req.uri);
+ private bool on_decide_policy (WebKit.PolicyDecision decision,
+ WebKit.PolicyDecisionType type) {
+ switch (type) {
+ case WebKit.PolicyDecisionType.NAVIGATION_ACTION:
+ WebKit.NavigationPolicyDecision n_decision = (WebKit.NavigationPolicyDecision) decision;
+ WebKit.NavigationAction action = n_decision.navigation_action;
+ string uri = action.get_request().uri;
+ debug("Navigating to '%s'", uri);
- MatchInfo info = null;
+ MatchInfo info = null;
- if (re.match(req.uri, 0, out info)) {
- string access_token = info.fetch_all()[2];
+ if (re.match(uri, 0, out info)) {
+ string access_token = info.fetch_all()[2];
- debug("Load completed: %s", access_token);
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
- if (access_token != null) {
- login_succeeded(access_token);
- return WebKit.NavigationResponse.IGNORE;
- } else
- login_failed();
+ debug("Load completed: %s", access_token);
+ pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+ if (access_token != null) {
+ login_succeeded(access_token);
+ decision.ignore();
+ break;
+ } else
+ login_failed();
+ }
+ decision.use();
+ break;
+ case WebKit.PolicyDecisionType.RESPONSE:
+ decision.use();
+ break;
+ default:
+ return false;
}
- return WebKit.NavigationResponse.ACCEPT;
+ return true;
}
- private void on_load_started(WebKit.WebFrame frame) {
+ private void on_load_started() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
}
+ private void on_page_load_changed (WebKit.LoadEvent load_event) {
+ switch (load_event) {
+ case WebKit.LoadEvent.STARTED:
+ on_load_started();
+ break;
+ case WebKit.LoadEvent.FINISHED:
+ on_page_load();
+ break;
+ }
+
+ return;
+ }
+
public Gtk.Widget get_widget() {
return pane_widget;
}
@@ -166,7 +193,7 @@ internal class WebAuthPane : Spit.Publishing.DialogPan
}
public void on_pane_installed() {
- webview.open(login_url);
+ webview.load_uri(login_url);
}
public void on_pane_uninstalled() {

125
graphics/shotwell/patches/patch-plugins_shotwell-publishing_FacebookPublishing_vala
View File

@ -1,125 +0,0 @@
$OpenBSD: patch-plugins_shotwell-publishing_FacebookPublishing_vala,v 1.1 2016/01/08 10:28:42 ajacoutot Exp $
From b6aad5eb1af16acbb4ee4984e58dfeb08597923b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Fri, 4 Dec 2015 18:08:54 +0100
Subject: facebook: Don't disable XSS auditor
From f045b7a13cc1efbfa3054338d0edf569df51f4e7 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Fri, 4 Dec 2015 17:34:17 +0100
Subject: Have all soup sessions validate TLS certificates
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
--- plugins/shotwell-publishing/FacebookPublishing.vala.orig Fri Jan 8 11:11:26 2016
+++ plugins/shotwell-publishing/FacebookPublishing.vala Fri Jan 8 11:12:21 2016
@@ -535,7 +535,7 @@ public class FacebookPublisher : Spit.Publishing.Publi
return;
debug("EVENT: endpoint test transaction failed to detect a connection to the Facebook " +
- "endpoint");
+ "endpoint" + error.message);
on_generic_error(error);
}
@@ -829,15 +829,14 @@ internal class WebAuthenticationPane : Spit.Publishing
webview = new WebKit.WebView();
webview.get_settings().enable_plugins = false;
- webview.get_settings().enable_default_context_menu = false;
- webview.load_finished.connect(on_page_load);
- webview.load_started.connect(on_load_started);
+ webview.load_changed.connect(on_page_load_changed);
+ webview.context_menu.connect(() => { return true; });
webview_frame.add(webview);
pane_widget.pack_start(webview_frame, true, true, 0);
}
-
+
private class LocaleLookup {
public string prefix;
public string translation;
@@ -945,10 +944,11 @@ internal class WebAuthenticationPane : Spit.Publishing
return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&scope=publish_actions,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID);
}
- private void on_page_load(WebKit.WebFrame origin_frame) {
+ private void on_page_load() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
- string loaded_url = origin_frame.get_uri().dup();
+ string loaded_url = webview.uri.dup();
+ debug("loaded url: " + loaded_url);
// strip parameters from the loaded url
if (loaded_url.contains("?")) {
@@ -960,7 +960,7 @@ internal class WebAuthenticationPane : Spit.Publishing
// were we redirected to the facebook login success page?
if (loaded_url.contains("login_success")) {
cache_dirty = true;
- login_succeeded(origin_frame.get_uri());
+ login_succeeded(webview.uri);
return;
}
@@ -971,10 +971,24 @@ internal class WebAuthenticationPane : Spit.Publishing
}
}
- private void on_load_started(WebKit.WebFrame frame) {
+ private void on_load_started() {
pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
}
+ private void on_page_load_changed (WebKit.LoadEvent load_event) {
+ switch (load_event) {
+ case WebKit.LoadEvent.STARTED:
+ case WebKit.LoadEvent.REDIRECTED:
+ on_load_started();
+ break;
+ case WebKit.LoadEvent.FINISHED:
+ on_page_load();
+ break;
+ }
+
+ return;
+ }
+
public static bool is_cache_dirty() {
return cache_dirty;
}
@@ -988,7 +1002,7 @@ internal class WebAuthenticationPane : Spit.Publishing
}
public void on_pane_installed() {
- webview.open(get_login_url());
+ webview.load_uri(get_login_url());
}
public void on_pane_uninstalled() {
@@ -1458,6 +1472,7 @@ internal class GraphSession {
this.soup_session.timeout = 15;
this.access_token = null;
this.current_message = null;
+ this.soup_session.ssl_use_system_ca_file = true;
}
~GraphSession() {
@@ -1527,6 +1542,7 @@ internal class GraphSession {
"Service %s returned HTTP status code %u %s", real_message.get_uri(),
msg.status_code, msg.reason_phrase);
} else {
+ debug(msg.reason_phrase);
error = new Spit.Publishing.PublishingError.NO_ANSWER(
"Failure communicating with %s (error code %u)", real_message.get_uri(),
msg.status_code);

22
graphics/shotwell/patches/patch-plugins_shotwell-publishing_Makefile
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-plugins_shotwell-publishing_Makefile,v 1.1 2016/01/08 10:28:42 ajacoutot Exp $
From 3ae27fc3f41ceb7820f365244e6ae6a4dc65fcaa Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Tue, 30 Jun 2015 10:43:15 +0100
Subject: Port to webkit2gtk-4.0
https://bodhi.fedoraproject.org/updates/FEDORA-2016-902a2b18d8
https://bodhi.fedoraproject.org/updates/FEDORA-2016-191ff70357
https://bugzilla.gnome.org/show_bug.cgi?id=754488
https://bugzilla.gnome.org/show_bug.cgi?id=751709
--- plugins/shotwell-publishing/Makefile.orig Fri Jan 8 11:11:29 2016
+++ plugins/shotwell-publishing/Makefile Fri Jan 8 11:10:48 2016
@@ -5,7 +5,7 @@ PLUGIN_PKGS := \
gtk+-3.0 \
libsoup-2.4 \
libxml-2.0 \
- webkitgtk-3.0 \
+ webkit2gtk-4.0 \
gexiv2 \
rest-0.7 \
gee-0.8 \

19
graphics/shotwell/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2016/04/16 10:48:03 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.24 2016/04/26 11:10:56 ajacoutot Exp $
@bin bin/shotwell
lib/shotwell/
lib/shotwell/plugins/
@ -47,13 +47,13 @@ share/gnome/help/shotwell/
share/gnome/help/shotwell/C/
share/gnome/help/shotwell/C/edit-adjustments.page
share/gnome/help/shotwell/C/edit-crop.page
share/gnome/help/shotwell/C/edit-date-time.page
share/gnome/help/shotwell/C/edit-enhance.page
share/gnome/help/shotwell/C/edit-external.page
share/gnome/help/shotwell/C/edit-nondestructive.page
share/gnome/help/shotwell/C/edit-redeye.page
share/gnome/help/shotwell/C/edit-rotate.page
share/gnome/help/shotwell/C/edit-straighten.page
share/gnome/help/shotwell/C/edit-time-date.page
share/gnome/help/shotwell/C/edit-undo.page
share/gnome/help/shotwell/C/figures/
share/gnome/help/shotwell/C/figures/crop_thirds.jpg
@ -92,13 +92,13 @@ share/gnome/help/shotwell/C/view-sidebar.page
share/gnome/help/shotwell/cs/
share/gnome/help/shotwell/cs/edit-adjustments.page
share/gnome/help/shotwell/cs/edit-crop.page
share/gnome/help/shotwell/cs/edit-date-time.page
share/gnome/help/shotwell/cs/edit-enhance.page
share/gnome/help/shotwell/cs/edit-external.page
share/gnome/help/shotwell/cs/edit-nondestructive.page
share/gnome/help/shotwell/cs/edit-redeye.page
share/gnome/help/shotwell/cs/edit-rotate.page
share/gnome/help/shotwell/cs/edit-straighten.page
share/gnome/help/shotwell/cs/edit-time-date.page
share/gnome/help/shotwell/cs/edit-undo.page
share/gnome/help/shotwell/cs/formats.page
share/gnome/help/shotwell/cs/import-camera.page
@ -131,13 +131,13 @@ share/gnome/help/shotwell/cs/view-sidebar.page
share/gnome/help/shotwell/de/
share/gnome/help/shotwell/de/edit-adjustments.page
share/gnome/help/shotwell/de/edit-crop.page
share/gnome/help/shotwell/de/edit-date-time.page
share/gnome/help/shotwell/de/edit-enhance.page
share/gnome/help/shotwell/de/edit-external.page
share/gnome/help/shotwell/de/edit-nondestructive.page
share/gnome/help/shotwell/de/edit-redeye.page
share/gnome/help/shotwell/de/edit-rotate.page
share/gnome/help/shotwell/de/edit-straighten.page
share/gnome/help/shotwell/de/edit-time-date.page
share/gnome/help/shotwell/de/edit-undo.page
share/gnome/help/shotwell/de/formats.page
share/gnome/help/shotwell/de/import-camera.page
@ -170,13 +170,13 @@ share/gnome/help/shotwell/de/view-sidebar.page
share/gnome/help/shotwell/el/
share/gnome/help/shotwell/el/edit-adjustments.page
share/gnome/help/shotwell/el/edit-crop.page
share/gnome/help/shotwell/el/edit-date-time.page
share/gnome/help/shotwell/el/edit-enhance.page
share/gnome/help/shotwell/el/edit-external.page
share/gnome/help/shotwell/el/edit-nondestructive.page
share/gnome/help/shotwell/el/edit-redeye.page
share/gnome/help/shotwell/el/edit-rotate.page
share/gnome/help/shotwell/el/edit-straighten.page
share/gnome/help/shotwell/el/edit-time-date.page
share/gnome/help/shotwell/el/edit-undo.page
share/gnome/help/shotwell/el/formats.page
share/gnome/help/shotwell/el/import-camera.page
@ -209,13 +209,13 @@ share/gnome/help/shotwell/el/view-sidebar.page
share/gnome/help/shotwell/es/
share/gnome/help/shotwell/es/edit-adjustments.page
share/gnome/help/shotwell/es/edit-crop.page
share/gnome/help/shotwell/es/edit-date-time.page
share/gnome/help/shotwell/es/edit-enhance.page
share/gnome/help/shotwell/es/edit-external.page
share/gnome/help/shotwell/es/edit-nondestructive.page
share/gnome/help/shotwell/es/edit-redeye.page
share/gnome/help/shotwell/es/edit-rotate.page
share/gnome/help/shotwell/es/edit-straighten.page
share/gnome/help/shotwell/es/edit-time-date.page
share/gnome/help/shotwell/es/edit-undo.page
share/gnome/help/shotwell/es/formats.page
share/gnome/help/shotwell/es/import-camera.page
@ -248,13 +248,13 @@ share/gnome/help/shotwell/es/view-sidebar.page
share/gnome/help/shotwell/hu/
share/gnome/help/shotwell/hu/edit-adjustments.page
share/gnome/help/shotwell/hu/edit-crop.page
share/gnome/help/shotwell/hu/edit-date-time.page
share/gnome/help/shotwell/hu/edit-enhance.page
share/gnome/help/shotwell/hu/edit-external.page
share/gnome/help/shotwell/hu/edit-nondestructive.page
share/gnome/help/shotwell/hu/edit-redeye.page
share/gnome/help/shotwell/hu/edit-rotate.page
share/gnome/help/shotwell/hu/edit-straighten.page
share/gnome/help/shotwell/hu/edit-time-date.page
share/gnome/help/shotwell/hu/edit-undo.page
share/gnome/help/shotwell/hu/formats.page
share/gnome/help/shotwell/hu/import-camera.page
@ -287,13 +287,13 @@ share/gnome/help/shotwell/hu/view-sidebar.page
share/gnome/help/shotwell/pt_BR/
share/gnome/help/shotwell/pt_BR/edit-adjustments.page
share/gnome/help/shotwell/pt_BR/edit-crop.page
share/gnome/help/shotwell/pt_BR/edit-date-time.page
share/gnome/help/shotwell/pt_BR/edit-enhance.page
share/gnome/help/shotwell/pt_BR/edit-external.page
share/gnome/help/shotwell/pt_BR/edit-nondestructive.page
share/gnome/help/shotwell/pt_BR/edit-redeye.page
share/gnome/help/shotwell/pt_BR/edit-rotate.page
share/gnome/help/shotwell/pt_BR/edit-straighten.page
share/gnome/help/shotwell/pt_BR/edit-time-date.page
share/gnome/help/shotwell/pt_BR/edit-undo.page
share/gnome/help/shotwell/pt_BR/formats.page
share/gnome/help/shotwell/pt_BR/import-camera.page
@ -326,13 +326,13 @@ share/gnome/help/shotwell/pt_BR/view-sidebar.page
share/gnome/help/shotwell/sv/
share/gnome/help/shotwell/sv/edit-adjustments.page
share/gnome/help/shotwell/sv/edit-crop.page
share/gnome/help/shotwell/sv/edit-date-time.page
share/gnome/help/shotwell/sv/edit-enhance.page
share/gnome/help/shotwell/sv/edit-external.page
share/gnome/help/shotwell/sv/edit-nondestructive.page
share/gnome/help/shotwell/sv/edit-redeye.page
share/gnome/help/shotwell/sv/edit-rotate.page
share/gnome/help/shotwell/sv/edit-straighten.page
share/gnome/help/shotwell/sv/edit-time-date.page
share/gnome/help/shotwell/sv/edit-undo.page
share/gnome/help/shotwell/sv/formats.page
share/gnome/help/shotwell/sv/import-camera.page
@ -409,6 +409,7 @@ share/locale/mr/LC_MESSAGES/shotwell.mo
share/locale/nb/LC_MESSAGES/shotwell.mo
share/locale/nl/LC_MESSAGES/shotwell.mo
share/locale/nn/LC_MESSAGES/shotwell.mo
share/locale/oc/LC_MESSAGES/shotwell.mo
share/locale/or/LC_MESSAGES/shotwell.mo
share/locale/pa/LC_MESSAGES/shotwell.mo
share/locale/pl/LC_MESSAGES/shotwell.mo