diffstat of debian/ for shotwell_0.25.4+really0.24.5-0.1 shotwell_0.26.3-1ubuntu1 README.source | 18 changelog | 58 control | 35 copyright | 4 menu | 2 patches/0001-appstream.patch | 52 patches/0001-buildflags.patch | 20 patches/0005-hardening.patch | 38 patches/0010-libexec.patch | 16 patches/0100-ios8.patch | 6 patches/0500-Port-to-webkit2gtk-40.patch | 1026 ---------- patches/0501-Dont-pack-webview-into-a-scrolled-window.patch | 44 patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch | 39 patches/0503-facebook-Dont-disable-XSS-auditor.patch | 25 patches/0510-Delay_size_request.patch | 26 patches/0515-Fix_background_color_drawing.patch | 32 patches/0600-remove_wrong_marco.patch | 17 patches/505-fix-viewer-desktop-file.patch | 27 patches/series | 11 replace_thumbnailer.sh | 21 rules | 33 shotwell-common.install | 5 shotwell-common.postrm | 18 shotwell-dbg.README.Debian | 8 shotwell.1 | 14 shotwell.README.Debian | 25 shotwell.docs | 1 shotwell.install | 2 shotwell.postrm | 15 watch | 3 30 files changed, 165 insertions(+), 1476 deletions(-) diff -Nru shotwell-0.25.4+really0.24.5/debian/README.source shotwell-0.26.3/debian/README.source --- shotwell-0.25.4+really0.24.5/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.26.3/debian/README.source 2017-09-22 21:26:18.000000000 +0000 @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff -Nru shotwell-0.25.4+really0.24.5/debian/changelog shotwell-0.26.3/debian/changelog --- shotwell-0.25.4+really0.24.5/debian/changelog 2017-02-14 17:47:24.000000000 +0000 +++ shotwell-0.26.3/debian/changelog 2017-09-22 21:26:18.000000000 +0000 @@ -1,3 +1,53 @@ +shotwell (0.26.3-1ubuntu1) artful; urgency=medium + + * Sync with Debian git packaging (LP: #1710270). Remaining changes: + - debian/control, debian/rules: + + Build-depend on and run dh-translations + + Build with Unity support. + + Build-Depends on libunity-dev. + + Build with scour for SVG optimization. + + Build-Depends on python-scour. + - clean out thumbnailer hacks, that's not user friendly and not + something that should be recommended doing + - Don't clutter up debian/ with old, disabled patches + * Drop Ubuntu's autopkgtest since the required umockdev data hasn't been + updated for 5 months. + * Fix Breaks/Replaces for file move + * Add 0001-appstream.patch and modify shotwell.install: + - Fix install of appstream metadata + + -- Jeremy Bicha Fri, 22 Sep 2017 17:26:18 -0400 + +shotwell (0.26.3-1) unstable; urgency=medium + + * New upstream release (Closes: #855681, Closes: #841859). + - debian/control: Add new appstream-util, libappstream-glib-dev and + libgdata-dev to Build-Depends. + - debian/shotwell.install: Drop now empty directory usr/share/appdata. + * New README.source to explain the branching model used. + * Use the automatic debug symbol packages: + - Remove shotwell-dbg section from debian/control. + - Remove override_dh_strip, override_dh_compress and some lines + on dh_install from debian/rules. + - Remove debian/shotwell-dbg.README.Debian. + * Use the upstream ChangeLog as changelog and add NEWS to docs. + * Remove debian/shotwell.1 to use the upstream man page. + * Don't install man page at shotwell-common. + * Remove unnecessary debian/menu. + * Some packaging improvements (Closes:# 856708): + - Move .desktop and appstream metadata from shotwell-common to shotwell. + - debian/rules: + + Use dh_auto_configure instead of ./configure. + + Update rm paths for multiarch. + + Don't install the .a file either. + - Remove build-depend m4 since debhelper version 10 use autoconf. + - Thanks to Jeremy Bicha + * debian/watch: + Rewrite to find only stable releases. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). + + -- Jörg Frings-Fürst Sun, 13 Aug 2017 16:34:08 +0200 + shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium * Revert to last stable release 0.24.5 (Closes: #850149). @@ -12,6 +62,14 @@ -- Richard B. Kreckel Sun, 05 Jan 2017 18:43:12 +0100 +shotwell (0.25.4-1) unstable; urgency=medium + + * New upstream release (Closes: #849688, #851711). + * debian/copyright: + - Update copyright years for 2017. + + -- Jörg Frings-Fürst Fri, 03 Feb 2017 14:23:16 +0100 + shotwell (0.25.1-1) unstable; urgency=medium * New upstream release. diff -Nru shotwell-0.25.4+really0.24.5/debian/control shotwell-0.26.3/debian/control --- shotwell-0.25.4+really0.24.5/debian/control 2016-10-29 22:43:51.000000000 +0000 +++ shotwell-0.26.3/debian/control 2017-09-22 21:26:18.000000000 +0000 @@ -1,14 +1,19 @@ Source: shotwell Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jörg Frings-Fürst Build-Depends: + appstream-util, debhelper (>= 10), desktop-file-utils, + dh-translations, gnome-doc-utils, itstool, + libappstream-glib-dev, libexif-dev (>= 0.6.16), libgcr-3-dev, + libgdata-dev, libgee-0.8-dev (>= 0.10), libgexiv2-dev (>= 0.10.4), libglib2.0-dev (>= 2.40), @@ -23,24 +28,27 @@ librest-dev (>= 0.7), libsoup2.4-dev (>= 2.26.0), libsqlite3-dev (>= 3.5.9), + libunity-dev, libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), - m4, + python-scour, valac (>= 0.22.0) -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ Package: shotwell Architecture: linux-any -Depends: +Depends: ${shlibs:Depends}, ${misc:Depends}, shotwell-common (= ${source:Version}), dconf-cli, default-dbus-session-bus | dbus-session-bus, librsvg2-common +Breaks: shotwell-common (<< 0.26.3-1) +Replaces: shotwell-common (<< 0.26.3-1) Description: digital photo organizer Shotwell is a digital photo organizer designed for the GNOME desktop environment. It allows you to import photos, pictures, images and videos @@ -55,6 +63,7 @@ Architecture: all Depends: ${misc:Depends} Recommends: shotwell +Breaks: shotwell (<< 0.26.2-1) Description: digital photo organizer - common files Shotwell is a digital photo organizer designed for the GNOME desktop environment. It allows you to import photos, pictures, images and videos @@ -66,21 +75,3 @@ to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. . This package provides image files and documentation for Shotwell. - -Package: shotwell-dbg -Priority: extra -Section: debug -Architecture: linux-any -Depends: ${misc:Depends}, - shotwell (= ${binary:Version}) -Description: digital photo organizer - debugging symbols - Shotwell is a digital photo organizer designed for the GNOME desktop - environment. It allows you to import photos, pictures, images and videos - from disk or camera. Shotwell can organize them in collections and in other - various ways. The viewer shows them in full-window or fullscreen mode and - presents them as galleries or slideshows. The integrated editor can rotate, - flip, crop and tag the photos, adjust the colors und remove red eyes. Export - is possible to facebook, Flickr or Youtube to share with others. It is able - to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2. - . - This package contains the debugging symbols for Shotwell. diff -Nru shotwell-0.25.4+really0.24.5/debian/copyright shotwell-0.26.3/debian/copyright --- shotwell-0.25.4+really0.24.5/debian/copyright 2016-06-05 08:50:38.000000000 +0000 +++ shotwell-0.26.3/debian/copyright 2017-09-22 21:26:18.000000000 +0000 @@ -8,12 +8,12 @@ 2010 Evgeniy Polyakov 2010 Maxim Kartashev 2013 Jens Bav - 2016 Software Freedom Conservancy Inc. + 2016-2017 Software Freedom Conservancy Inc. License: LGPL-2.1 Files: debian/* Copyright: 2009-2011 Devid Antonio Filoni - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-2+ Files: icons/pin-toolbar.svg diff -Nru shotwell-0.25.4+really0.24.5/debian/menu shotwell-0.26.3/debian/menu --- shotwell-0.25.4+really0.24.5/debian/menu 2010-01-23 19:43:03.000000000 +0000 +++ shotwell-0.26.3/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(shotwell):needs="X11" section="Applications/Viewers"\ - title="Shotwell" command="/usr/bin/shotwell" diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0001-appstream.patch shotwell-0.26.3/debian/patches/0001-appstream.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0001-appstream.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0001-appstream.patch 2017-09-22 21:26:18.000000000 +0000 @@ -0,0 +1,52 @@ +From 15cc83b25c44939571d42210cbb02a7825756b8c Mon Sep 17 00:00:00 2001 +From: Thomas Moschny +Date: Sun, 13 Aug 2017 09:47:00 +0000 +Subject: Fix rules for appstream files + +The appdata file is neither created nor installed, as the rules in +@APPSTREAM_XML_RULES@ expect files to be listed in $(appstream_XML) +rather than in $(appdata_XML). + +https://bugzilla.gnome.org/show_bug.cgi?id=784883 +--- + misc/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/misc/Makefile.am b/misc/Makefile.am +index 711b06f..aa9a2bd 100644 +--- a/misc/Makefile.am ++++ b/misc/Makefile.am +@@ -2,14 +2,14 @@ gsettings_SCHEMAS = \ + org.yorba.shotwell.gschema.xml \ + org.yorba.shotwell-extras.gschema.xml + +-appdata_in_files = $(srcdir)/shotwell.appdata.xml.in +-appdata_XML = \ ++appstream_in_files = $(srcdir)/shotwell.appdata.xml.in ++appstream_XML = \ + shotwell.appdata.xml + + desktopdir = $(datadir)/applications + desktop_DATA = shotwell.desktop shotwell-viewer.desktop + +-$(appdata_XML) : $(appdata_in_files) ++$(appstream_XML) : $(appstream_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ + + %.desktop.in : %.desktop.in.in +@@ -21,12 +21,12 @@ $(appdata_XML) : $(appdata_in_files) + @GSETTINGS_RULES@ + @APPSTREAM_XML_RULES@ + +-CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files) ++CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files) + + dist_noinst_DATA = \ + $(srcdir)/shotwell.desktop.in.in \ + $(srcdir)/shotwell-viewer.desktop.in.in \ + $(gsettings_SCHEMAS) \ +- $(appdata_in_files) ++ $(appstream_in_files) + + -include $(top_srcdir)/git.mk + diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0001-buildflags.patch shotwell-0.26.3/debian/patches/0001-buildflags.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0001-buildflags.patch 2016-06-26 06:41:28.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0001-buildflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Description: Poke requested Debian buildflags for hardening into Makefile -Author: Jörg Frings-Fürst -Last-Update: 2015-01-07 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -385,8 +385,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe - endif - endif - --CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) --PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -+CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -fstack-protector-strong -+PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQUIRED_CFLAGS) -fPIC -fno-stack-protector - - # Required for gudev-1.0 - CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0005-hardening.patch shotwell-0.26.3/debian/patches/0005-hardening.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0005-hardening.patch 2016-06-26 06:41:39.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0005-hardening.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -Description: pass compiler flags set in debian/rules to compiler -Author: Devid Antonio Filoni - -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -35,7 +35,7 @@ CORE_SUPPORTED_LANGUAGES=$(shell cat po/ - LOCAL_LANG_DIR=locale-langpack - SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale - --VALAFLAGS := -g --enable-checking --target-glib=2.32 --thread --fatal-warnings --enable-experimental --enable-deprecated $(USER_VALAFLAGS) -+VALAFLAGS := $(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) --enable-checking --target-glib=2.32 --thread --enable-experimental --enable-deprecated $(USER_VALAFLAGS) - ifdef UNITY_SUPPORT - VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT - endif -@@ -661,7 +661,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) - @ - - $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile -- $(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $< -+ $(CC) -c $(VALA_CFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) misc/gschemas.compiled $(DOC_LANG_STAMP) - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@ -Index: trunk/plugins/Makefile.plugin.mk -=================================================================== ---- trunk.orig/plugins/Makefile.plugin.mk -+++ trunk/plugins/Makefile.plugin.mk -@@ -42,7 +42,7 @@ PLUGIN_EXTRAFLAGS ?= --vapidir=../common - PLUGIN_EXTRALINKFLAGS ?= -L../common/ -lshotwell-plugin-common - - .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES) -- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --ccode --enable-deprecated \ -+ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --ccode --enable-deprecated \ - --vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \ - $(USER_VALAFLAGS) \ - $(PLUGIN_EXTRAFLAGS) \ diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0010-libexec.patch shotwell-0.26.3/debian/patches/0010-libexec.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0010-libexec.patch 2014-02-16 13:18:44.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0010-libexec.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: do not install files in libexec directory -Author: Luca Falavigna - -Index: shotwell-0.15.0/Makefile -=================================================================== ---- shotwell-0.15.0.orig/Makefile 2013-10-13 09:51:58.893357001 +0200 -+++ shotwell-0.15.0/Makefile 2013-10-13 09:54:33.885361749 +0200 -@@ -27,7 +27,7 @@ - - -include configure.mk - ifndef LIBEXECDIR --LIBEXECDIR=$(PREFIX)/libexec/shotwell -+LIBEXECDIR=$(PREFIX)/share/shotwell - endif - - CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS) diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0100-ios8.patch shotwell-0.26.3/debian/patches/0100-ios8.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0100-ios8.patch 2017-02-05 17:49:31.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0100-ios8.patch 2017-09-22 21:26:18.000000000 +0000 @@ -5,8 +5,10 @@ Last-Update: 2016-11-25 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/camera/ImportPage.vala -+++ b/src/camera/ImportPage.vala +Index: trunk/src/camera/ImportPage.vala +=================================================================== +--- trunk.orig/src/camera/ImportPage.vala ++++ trunk/src/camera/ImportPage.vala @@ -773,6 +773,15 @@ public class ImportPage : CheckerboardPa ~ImportPage() { LibraryPhoto.global.contents_altered.disconnect(on_media_added_removed); diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0500-Port-to-webkit2gtk-40.patch shotwell-0.26.3/debian/patches/0500-Port-to-webkit2gtk-40.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0500-Port-to-webkit2gtk-40.patch 2015-12-13 07:57:45.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0500-Port-to-webkit2gtk-40.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1026 +0,0 @@ -From afc5e103d2dd414f0d028565097d86c7e85fadbc Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Tue, 30 Jun 2015 10:43:15 +0100 -Subject: [PATCH] Port to webkit2gtk-4.0 - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - Makefile | 8 +- - debian/control | 2 +- - plugins/common/RESTSupport.vala | 24 +- - plugins/shotwell-publishing-extras/Makefile | 2 +- - .../YandexPublishing.vala | 67 ++- - .../shotwell-publishing/FacebookPublishing.vala | 36 +- - plugins/shotwell-publishing/Makefile | 2 +- - vapi/webkitgtk-3.0.deps | 8 - - vapi/webkitgtk-3.0.vapi | 653 --------------------- - 9 files changed, 97 insertions(+), 705 deletions(-) - delete mode 100644 vapi/webkitgtk-3.0.deps - delete mode 100644 vapi/webkitgtk-3.0.vapi - -diff --git a/Makefile b/Makefile -index fe354a7..1ce5668 100644 ---- a/Makefile -+++ b/Makefile -@@ -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 - -@@ -271,7 +269,7 @@ EXT_PKGS = \ - libsoup-2.4 \ - libxml-2.0 \ - sqlite3 \ -- webkitgtk-3.0 -+ webkit2gtk-4.0 - ifdef UNITY_SUPPORT - EXT_PKGS += unity - endif -@@ -303,7 +301,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 = -diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala -index fdde409..a4a0621 100644 ---- a/plugins/common/RESTSupport.vala -+++ b/plugins/common/RESTSupport.vala -@@ -741,10 +741,9 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - - 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); -@@ -754,7 +753,7 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - 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 +771,22 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - } - } - -- 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 +797,7 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher { - } - - public void on_pane_installed() { -- webview.open(auth_sequence_start_url); -+ webview.load_uri(auth_sequence_start_url); - } - - public void on_pane_uninstalled() { -diff --git a/plugins/shotwell-publishing-extras/Makefile b/plugins/shotwell-publishing-extras/Makefile -index 9259fbb..91452cf 100644 ---- a/plugins/shotwell-publishing-extras/Makefile -+++ b/plugins/shotwell-publishing-extras/Makefile -@@ -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 -diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala -index 36a3ede..ec99c2b 100644 ---- a/plugins/shotwell-publishing-extras/YandexPublishing.vala -+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala -@@ -120,43 +120,70 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object { - - 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.DialogPane, GLib.Object { - } - - public void on_pane_installed() { -- webview.open(login_url); -+ webview.load_uri(login_url); - } - - public void on_pane_uninstalled() { -diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala -index 1dd793d..4efe7f7 100644 ---- a/plugins/shotwell-publishing/FacebookPublishing.vala -+++ b/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -535,7 +535,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object { - 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,15 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_default_context_menu = false; -+ webview.get_settings().enable_xss_auditor = 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 +945,11 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - 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 +961,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - // 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 +972,24 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - } - } - -- 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 +1003,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object { - } - - public void on_pane_installed() { -- webview.open(get_login_url()); -+ webview.load_uri(get_login_url()); - } - - public void on_pane_uninstalled() { -@@ -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); -diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile -index 639fa88..6b3945b 100644 ---- a/plugins/shotwell-publishing/Makefile -+++ b/plugins/shotwell-publishing/Makefile -@@ -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 \ -diff --git a/vapi/webkitgtk-3.0.deps b/vapi/webkitgtk-3.0.deps -deleted file mode 100644 -index 91b1dfe..0000000 ---- a/vapi/webkitgtk-3.0.deps -+++ /dev/null -@@ -1,8 +0,0 @@ --atk --gio-2.0 --cairo --pango --gdk-pixbuf-2.0 --gdk-3.0 --gtk+-3.0 --libsoup-2.4 -diff --git a/vapi/webkitgtk-3.0.vapi b/vapi/webkitgtk-3.0.vapi -deleted file mode 100644 -index 9e0d347..0000000 ---- a/vapi/webkitgtk-3.0.vapi -+++ /dev/null -@@ -1,653 +0,0 @@ --/* webkit-1.0.vapi generated by vapigen, do not modify. */ -- --[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")] --namespace WebKit { -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class Download : GLib.Object { -- [CCode (has_construct_function = false)] -- public Download (WebKit.NetworkRequest request); -- public void cancel (); -- public uint64 get_current_size (); -- public unowned string get_destination_uri (); -- public double get_elapsed_time (); -- public unowned WebKit.NetworkRequest get_network_request (); -- public unowned WebKit.NetworkResponse get_network_response (); -- public double get_progress (); -- public WebKit.DownloadStatus get_status (); -- public unowned string get_suggested_filename (); -- public uint64 get_total_size (); -- public unowned string get_uri (); -- public void set_destination_uri (string destination_uri); -- public void start (); -- public uint64 current_size { get; } -- public string destination_uri { get; set; } -- public WebKit.NetworkRequest network_request { get; construct; } -- public WebKit.NetworkResponse network_response { get; construct; } -- public double progress { get; } -- public WebKit.DownloadStatus status { get; } -- public string suggested_filename { get; } -- public uint64 total_size { get; } -- public virtual signal bool error (int p0, int p1, string p2); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class GeolocationPolicyDecision : GLib.Object { -- [CCode (has_construct_function = false)] -- protected GeolocationPolicyDecision (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class HitTestResult : GLib.Object { -- [CCode (has_construct_function = false)] -- protected HitTestResult (); -- [NoAccessorMethod] -- public WebKit.HitTestResultContext context { get; construct; } -- [NoAccessorMethod] -- public string image_uri { owned get; construct; } -- [NoAccessorMethod] -- public string link_uri { owned get; construct; } -- [NoAccessorMethod] -- public string media_uri { owned get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class NetworkRequest : GLib.Object { -- [CCode (has_construct_function = false)] -- public NetworkRequest (string uri); -- public unowned Soup.Message get_message (); -- public unowned string get_uri (); -- public void set_uri (string uri); -- public Soup.Message message { get; construct; } -- public string uri { get; set; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class NetworkResponse : GLib.Object { -- [CCode (has_construct_function = false)] -- public NetworkResponse (string uri); -- public unowned Soup.Message get_message (); -- public unowned string get_uri (); -- public void set_uri (string uri); -- public Soup.Message message { get; construct; } -- public string uri { get; set; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class SecurityOrigin : GLib.Object { -- [CCode (has_construct_function = false)] -- protected SecurityOrigin (); -- public unowned GLib.List get_all_web_databases (); -- public unowned string get_host (); -- public uint get_port (); -- public unowned string get_protocol (); -- public uint64 get_web_database_quota (); -- public uint64 get_web_database_usage (); -- public void set_web_database_quota (uint64 quota); -- public string host { get; } -- public uint port { get; } -- public string protocol { get; } -- public uint64 web_database_quota { get; set; } -- public uint64 web_database_usage { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class SoupAuthDialog : GLib.Object, Soup.SessionFeature { -- [CCode (has_construct_function = false)] -- protected SoupAuthDialog (); -- public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebBackForwardList : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebBackForwardList (); -- public void add_item (WebKit.WebHistoryItem history_item); -- public void clear (); -- public bool contains_item (WebKit.WebHistoryItem history_item); -- public unowned WebKit.WebHistoryItem get_back_item (); -- public int get_back_length (); -- public unowned GLib.List get_back_list_with_limit (int limit); -- public unowned WebKit.WebHistoryItem get_current_item (); -- public unowned WebKit.WebHistoryItem get_forward_item (); -- public int get_forward_length (); -- public unowned GLib.List get_forward_list_with_limit (int limit); -- public int get_limit (); -- public unowned WebKit.WebHistoryItem get_nth_item (int index); -- public void go_back (); -- public void go_forward (); -- public void go_to_item (WebKit.WebHistoryItem history_item); -- public void set_limit (int limit); -- [CCode (has_construct_function = false)] -- public WebBackForwardList.with_web_view (WebKit.WebView web_view); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebDataSource : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebDataSource (); -- public unowned GLib.StringBuilder get_data (); -- public unowned string get_encoding (); -- public unowned WebKit.NetworkRequest get_initial_request (); -- public unowned WebKit.WebResource get_main_resource (); -- public unowned WebKit.NetworkRequest get_request (); -- public unowned GLib.List get_subresources (); -- public unowned string get_unreachable_uri (); -- public unowned WebKit.WebFrame get_web_frame (); -- public bool is_loading (); -- [CCode (has_construct_function = false)] -- public WebDataSource.with_request (WebKit.NetworkRequest request); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebDatabase : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebDatabase (); -- public unowned string get_display_name (); -- public uint64 get_expected_size (); -- public unowned string get_filename (); -- public unowned string get_name (); -- public unowned WebKit.SecurityOrigin get_security_origin (); -- public uint64 get_size (); -- public void remove (); -- public string display_name { get; } -- public uint64 expected_size { get; } -- public string filename { get; } -- public string name { get; construct; } -- public WebKit.SecurityOrigin security_origin { get; construct; } -- public uint64 size { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebFrame : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebFrame (WebKit.WebView web_view); -- public unowned WebKit.WebFrame find_frame (string name); -- public unowned WebKit.WebDataSource get_data_source (); -- public Gtk.PolicyType get_horizontal_scrollbar_policy (); -- public WebKit.LoadStatus get_load_status (); -- public unowned string get_name (); -- public unowned WebKit.NetworkResponse get_network_response (); -- public unowned WebKit.WebFrame get_parent (); -- public unowned WebKit.WebDataSource get_provisional_data_source (); -- public unowned WebKit.SecurityOrigin get_security_origin (); -- public unowned string get_title (); -- public unowned string get_uri (); -- public Gtk.PolicyType get_vertical_scrollbar_policy (); -- public unowned WebKit.WebView get_web_view (); -- public void load_alternate_string (string content, string base_url, string unreachable_url); -- public void load_request (WebKit.NetworkRequest request); -- public void load_string (string content, string mime_type, string encoding, string base_uri); -- public void load_uri (string uri); -- public void print (); -- public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error; -- public void reload (); -- public void stop_loading (); -- public Gtk.PolicyType horizontal_scrollbar_policy { get; } -- public WebKit.LoadStatus load_status { get; } -- public string name { get; } -- public string title { get; } -- public string uri { get; } -- public Gtk.PolicyType vertical_scrollbar_policy { get; } -- public virtual signal void cleared (); -- public virtual signal void hovering_over_link (string p0, string p1); -- public virtual signal void load_committed (); -- public virtual signal void load_done (bool p0); -- public virtual signal bool scrollbars_policy_changed (); -- public virtual signal void title_changed (string p0); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebHistoryItem : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebHistoryItem (); -- public unowned WebKit.WebHistoryItem copy (); -- public unowned string get_alternate_title (); -- public double get_last_visited_time (); -- public unowned string get_original_uri (); -- public unowned string get_title (); -- public unowned string get_uri (); -- public void set_alternate_title (string title); -- [CCode (has_construct_function = false)] -- public WebHistoryItem.with_data (string uri, string title); -- public string alternate_title { get; set; } -- public double last_visited_time { get; } -- public string original_uri { get; } -- public string title { get; } -- public string uri { get; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebInspector : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebInspector (); -- public void close (); -- public unowned string get_inspected_uri (); -- public unowned WebKit.WebView get_web_view (); -- public void inspect_coordinates (double x, double y); -- public void show (); -- public string inspected_uri { get; } -- [NoAccessorMethod] -- public bool javascript_profiling_enabled { get; set; } -- [NoAccessorMethod] -- public bool timeline_profiling_enabled { get; set; } -- public WebKit.WebView web_view { get; } -- public virtual signal bool attach_window (); -- public virtual signal bool close_window (); -- public virtual signal bool detach_window (); -- public virtual signal void finished (); -- public virtual signal unowned WebKit.WebView inspect_web_view (WebKit.WebView p0); -- public virtual signal bool show_window (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebNavigationAction : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebNavigationAction (); -- public int get_button (); -- public int get_modifier_state (); -- public unowned string get_original_uri (); -- public WebKit.WebNavigationReason get_reason (); -- public unowned string get_target_frame (); -- public void set_original_uri (string originalUri); -- public void set_reason (WebKit.WebNavigationReason reason); -- public int button { get; construct; } -- public int modifier_state { get; construct; } -- public string original_uri { get; set construct; } -- public WebKit.WebNavigationReason reason { get; set construct; } -- public string target_frame { get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebPolicyDecision : GLib.Object { -- [CCode (has_construct_function = false)] -- protected WebPolicyDecision (); -- public void download (); -- public void ignore (); -- public void use (); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebResource : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name); -- public unowned GLib.StringBuilder get_data (); -- public unowned string get_encoding (); -- public unowned string get_frame_name (); -- public unowned string get_mime_type (); -- public unowned string get_uri (); -- public string encoding { get; } -- public string frame_name { get; } -- public string mime_type { get; } -- public string uri { get; construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebSettings : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebSettings (); -- public WebKit.WebSettings copy (); -- public unowned string get_user_agent (); -- [NoAccessorMethod] -- public bool auto_load_images { get; set construct; } -- [NoAccessorMethod] -- public bool auto_resize_window { get; set construct; } -- [NoAccessorMethod] -- public bool auto_shrink_images { get; set construct; } -- [NoAccessorMethod] -- public string cursive_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string default_encoding { owned get; set construct; } -- [NoAccessorMethod] -- public string default_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public int default_font_size { get; set construct; } -- [NoAccessorMethod] -- public int default_monospace_font_size { get; set construct; } -- [NoAccessorMethod] -- public WebKit.EditingBehavior editing_behavior { get; set construct; } -- [NoAccessorMethod] -- public bool enable_caret_browsing { get; set construct; } -- [NoAccessorMethod] -- public bool enable_default_context_menu { get; set construct; } -- [NoAccessorMethod] -- public bool enable_developer_extras { get; set construct; } -- [NoAccessorMethod] -- public bool enable_dom_paste { get; set construct; } -- [NoAccessorMethod] -- public bool enable_file_access_from_file_uris { get; set construct; } -- [NoAccessorMethod] -- public bool enable_html5_database { get; set construct; } -- [NoAccessorMethod] -- public bool enable_html5_local_storage { get; set construct; } -- [NoAccessorMethod] -- public bool enable_java_applet { get; set construct; } -- [NoAccessorMethod] -- public bool enable_offline_web_application_cache { get; set construct; } -- [NoAccessorMethod] -- public bool enable_page_cache { get; set construct; } -- [NoAccessorMethod] -- public bool enable_plugins { get; set construct; } -- [NoAccessorMethod] -- public bool enable_private_browsing { get; set construct; } -- [NoAccessorMethod] -- public bool enable_scripts { get; set construct; } -- [NoAccessorMethod] -- public bool enable_site_specific_quirks { get; set construct; } -- [NoAccessorMethod] -- public bool enable_spatial_navigation { get; set construct; } -- [NoAccessorMethod] -- public bool enable_spell_checking { get; set construct; } -- [NoAccessorMethod] -- public bool enable_universal_access_from_file_uris { get; set construct; } -- [NoAccessorMethod] -- public bool enable_xss_auditor { get; set construct; } -- [NoAccessorMethod] -- public bool enforce_96_dpi { get; set construct; } -- [NoAccessorMethod] -- public string fantasy_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public bool javascript_can_access_clipboard { get; set construct; } -- [NoAccessorMethod] -- public bool javascript_can_open_windows_automatically { get; set construct; } -- [NoAccessorMethod] -- public int minimum_font_size { get; set construct; } -- [NoAccessorMethod] -- public int minimum_logical_font_size { get; set construct; } -- [NoAccessorMethod] -- public string monospace_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public bool print_backgrounds { get; set construct; } -- [NoAccessorMethod] -- public bool resizable_text_areas { get; set construct; } -- [NoAccessorMethod] -- public string sans_serif_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string serif_font_family { owned get; set construct; } -- [NoAccessorMethod] -- public string spell_checking_languages { owned get; set construct; } -- [NoAccessorMethod] -- public bool tab_key_cycles_through_elements { get; set construct; } -- [NoAccessorMethod] -- public string user_agent { owned get; set construct; } -- [NoAccessorMethod] -- public string user_stylesheet_uri { owned get; set construct; } -- [NoAccessorMethod] -- public float zoom_step { get; set construct; } -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable { -- [CCode (type = "GtkWidget*", has_construct_function = false)] -- public WebView (); -- public bool can_copy_clipboard (); -- public bool can_cut_clipboard (); -- public bool can_go_back (); -- public bool can_go_back_or_forward (int steps); -- public bool can_go_forward (); -- public bool can_paste_clipboard (); -- public bool can_redo (); -- public bool can_show_mime_type (string mime_type); -- public bool can_undo (); -- [NoWrapper] -- public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file); -- public void delete_selection (); -- public void execute_script (string script); -- public unowned WebKit.WebBackForwardList get_back_forward_list (); -- public unowned Gtk.TargetList get_copy_target_list (); -- public unowned string get_custom_encoding (); -- public bool get_editable (); -- public unowned string get_encoding (); -- public unowned WebKit.WebFrame get_focused_frame (); -- public bool get_full_content_zoom (); -- public unowned WebKit.HitTestResult get_hit_test_result (Gdk.EventButton event); -- public unowned string get_icon_uri (); -- public unowned WebKit.WebInspector get_inspector (); -- public WebKit.LoadStatus get_load_status (); -- public unowned WebKit.WebFrame get_main_frame (); -- public unowned Gtk.TargetList get_paste_target_list (); -- public double get_progress (); -- public unowned WebKit.WebSettings get_settings (); -- public unowned string get_title (); -- public bool get_transparent (); -- public unowned string get_uri (); -- public bool get_view_source_mode (); -- public unowned WebKit.WebWindowFeatures get_window_features (); -- public float get_zoom_level (); -- public void go_back (); -- public void go_back_or_forward (int steps); -- public void go_forward (); -- public bool go_to_back_forward_item (WebKit.WebHistoryItem item); -- public bool has_selection (); -- public void load_html_string (string content, string base_uri); -- public void load_request (WebKit.NetworkRequest request); -- public void load_string (string content, string mime_type, string encoding, string base_uri); -- public void load_uri (string uri); -- public uint mark_text_matches (string str, bool case_sensitive, uint limit); -- public void open (string uri); -- public void reload (); -- public void reload_bypass_cache (); -- public bool search_text (string text, bool case_sensitive, bool forward, bool wrap); -- public void set_custom_encoding (string encoding); -- public void set_editable (bool flag); -- public void set_full_content_zoom (bool full_content_zoom); -- public void set_highlight_text_matches (bool highlight); -- public void set_maintains_back_forward_list (bool flag); -- public void set_settings (WebKit.WebSettings settings); -- public void set_transparent (bool flag); -- public void set_view_source_mode (bool view_source_mode); -- public void set_zoom_level (float zoom_level); -- public void stop_loading (); -- public void unmark_text_matches (); -- public void zoom_in (); -- public void zoom_out (); -- public Gtk.TargetList copy_target_list { get; } -- public string custom_encoding { get; set; } -- public bool editable { get; set; } -- public string encoding { get; } -- public bool full_content_zoom { get; set; } -- public string icon_uri { get; } -- [NoAccessorMethod] -- public Gtk.IMContext im_context { owned get; } -- public WebKit.LoadStatus load_status { get; } -- public Gtk.TargetList paste_target_list { get; } -- public double progress { get; } -- public WebKit.WebSettings settings { get; set; } -- public string title { get; } -- public bool transparent { get; set; } -- public string uri { get; } -- [NoAccessorMethod] -- public WebKit.WebInspector web_inspector { owned get; } -- [NoAccessorMethod] -- public WebKit.WebWindowFeatures window_features { owned get; set; } -- public float zoom_level { get; set; } -- public virtual signal bool close_web_view (); -- public virtual signal bool console_message (string message, int line_number, string source_id); -- [HasEmitter] -- public virtual signal void copy_clipboard (); -- public virtual signal unowned Gtk.Widget create_plugin_widget (string p0, string p1, GLib.HashTable p2); -- public virtual signal WebKit.WebView create_web_view (WebKit.WebFrame web_frame); -- [HasEmitter] -- public virtual signal void cut_clipboard (); -- public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1); -- public virtual signal void document_load_finished (WebKit.WebFrame p0); -- public virtual signal bool download_requested (GLib.Object p0); -- public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0); -- public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1); -- public virtual signal void hovering_over_link (string? p0, string p1); -- public virtual signal void icon_loaded (string p0); -- public virtual signal void load_committed (WebKit.WebFrame p0); -- public virtual signal bool load_error (WebKit.WebFrame p0, string p1, GLib.Error p2); -- public virtual signal void load_finished (WebKit.WebFrame p0); -- public virtual signal void load_progress_changed (int p0); -- public virtual signal void load_started (WebKit.WebFrame p0); -- public virtual signal bool mime_type_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, string p2, WebKit.WebPolicyDecision p3); -- [HasEmitter] -- public virtual signal bool move_cursor (Gtk.MovementStep step, int count); -- public virtual signal bool navigation_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); -- public virtual signal WebKit.NavigationResponse navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request); -- public virtual signal bool new_window_policy_decision_requested (WebKit.WebFrame p0, WebKit.NetworkRequest p1, WebKit.WebNavigationAction p2, WebKit.WebPolicyDecision p3); -- [HasEmitter] -- public virtual signal void paste_clipboard (); -- public virtual signal void populate_popup (Gtk.Menu p0); -- public virtual signal bool print_requested (WebKit.WebFrame p0); -- [HasEmitter] -- public virtual signal void redo (); -- public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3); -- public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message); -- public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm); -- public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value); -- [HasEmitter] -- public virtual signal void select_all (); -- public virtual signal void selection_changed (); -- public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); -- public virtual signal void status_bar_text_changed (string p0); -- public virtual signal void title_changed (WebKit.WebFrame p0, string p1); -- [HasEmitter] -- public virtual signal void undo (); -- public virtual signal bool web_view_ready (); -- public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object); -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public class WebWindowFeatures : GLib.Object { -- [CCode (has_construct_function = false)] -- public WebWindowFeatures (); -- public bool equal (WebKit.WebWindowFeatures features2); -- [NoAccessorMethod] -- public bool fullscreen { get; set construct; } -- [NoAccessorMethod] -- public int height { get; set construct; } -- [NoAccessorMethod] -- public bool locationbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool menubar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool scrollbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool statusbar_visible { get; set construct; } -- [NoAccessorMethod] -- public bool toolbar_visible { get; set construct; } -- [NoAccessorMethod] -- public int width { get; set construct; } -- [NoAccessorMethod] -- public int x { get; set construct; } -- [NoAccessorMethod] -- public int y { get; set construct; } -- } -- [CCode (cprefix = "WEBKIT_CACHE_MODEL_", cheader_filename = "webkit/webkit.h")] -- public enum CacheModel { -- DOCUMENT_VIEWER, -- WEB_BROWSER -- } -- [CCode (cprefix = "WEBKIT_DOWNLOAD_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum DownloadError { -- CANCELLED_BY_USER, -- DESTINATION, -- NETWORK -- } -- [CCode (cprefix = "WEBKIT_DOWNLOAD_STATUS_", cheader_filename = "webkit/webkit.h")] -- public enum DownloadStatus { -- ERROR, -- CREATED, -- STARTED, -- CANCELLED, -- FINISHED -- } -- [CCode (cprefix = "WEBKIT_EDITING_BEHAVIOR_", cheader_filename = "webkit/webkit.h")] -- public enum EditingBehavior { -- MAC, -- WINDOWS -- } -- [CCode (cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_", cheader_filename = "webkit/webkit.h")] -- [Flags] -- public enum HitTestResultContext { -- DOCUMENT, -- LINK, -- IMAGE, -- MEDIA, -- SELECTION, -- EDITABLE -- } -- [CCode (cprefix = "WEBKIT_LOAD_", cheader_filename = "webkit/webkit.h")] -- public enum LoadStatus { -- PROVISIONAL, -- COMMITTED, -- FINISHED, -- FIRST_VISUALLY_NON_EMPTY_LAYOUT, -- FAILED -- } -- [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")] -- public enum NavigationResponse { -- ACCEPT, -- IGNORE, -- DOWNLOAD -- } -- [CCode (cprefix = "WEBKIT_NETWORK_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum NetworkError { -- FAILED, -- TRANSPORT, -- UNKNOWN_PROTOCOL, -- CANCELLED, -- FILE_DOES_NOT_EXIST -- } -- [CCode (cprefix = "WEBKIT_PLUGIN_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum PluginError { -- FAILED, -- CANNOT_FIND_PLUGIN, -- CANNOT_LOAD_PLUGIN, -- JAVA_UNAVAILABLE, -- CONNECTION_CANCELLED, -- WILL_HANDLE_LOAD -- } -- [CCode (cprefix = "WEBKIT_POLICY_ERROR_", cheader_filename = "webkit/webkit.h")] -- public enum PolicyError { -- FAILED, -- CANNOT_SHOW_MIME_TYPE, -- CANNOT_SHOW_URL, -- FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, -- CANNOT_USE_RESTRICTED_PORT -- } -- [CCode (cprefix = "WEBKIT_WEB_NAVIGATION_REASON_", cheader_filename = "webkit/webkit.h")] -- public enum WebNavigationReason { -- LINK_CLICKED, -- FORM_SUBMITTED, -- BACK_FORWARD, -- RELOAD, -- FORM_RESUBMITTED, -- OTHER -- } -- [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")] -- public enum WebViewTargetInfo { -- HTML, -- TEXT, -- IMAGE, -- URI_LIST, -- NETSCAPE_URL -- } -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MAJOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MICRO_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int MINOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int USER_AGENT_MAJOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public const int USER_AGENT_MINOR_VERSION; -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static bool check_version (uint major, uint minor, uint micro); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static WebKit.CacheModel get_cache_model (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static unowned Soup.Session get_default_session (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint64 get_default_web_database_quota (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static unowned string get_web_database_directory_path (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint major_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint micro_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static uint minor_version (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark network_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark plugin_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static GLib.Quark policy_error_quark (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void remove_all_web_databases (); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_cache_model (WebKit.CacheModel cache_model); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_default_web_database_quota (uint64 defaultQuota); -- [CCode (cheader_filename = "webkit/webkit.h")] -- public static void set_web_database_directory_path (string path); --} --- -2.5.0 \ No newline at end of file diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch shotwell-0.26.3/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch 2015-12-13 08:00:50.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0501-Dont-pack-webview-into-a-scrolled-window.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From 130ebe6f1eda9564e89ab617bdfa30a50f828e47 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 17:33:43 +0100 -Subject: [PATCH] Don't pack webview into a scrolled window - -The scrollbar is drawn by WebKitWebView in WK2. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/common/RESTSupport.vala | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -Index: trunk/plugins/common/RESTSupport.vala -=================================================================== ---- trunk.orig/plugins/common/RESTSupport.vala -+++ trunk/plugins/common/RESTSupport.vala -@@ -725,7 +725,6 @@ public abstract class GooglePublisher : - - 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,18 +734,13 @@ public abstract class GooglePublisher : - - 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.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() { diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch shotwell-0.26.3/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch 2015-12-13 08:00:58.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0502-Have-all-soup-sessions-validate-TLS-certificates.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From ac6efab13554d1ef39eb8b86744234d72773c2da Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 17:34:17 +0100 -Subject: [PATCH] Have all soup sessions validate TLS certificates - -Note that this commit is *not* sufficient to fix certificate verification -on its own. The port to WK2 is also required, else WebKit's soup session -will not verify certificates. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/common/RESTSupport.vala | 1 + - plugins/shotwell-publishing/FacebookPublishing.vala | 1 + - 2 files changed, 2 insertions(+) - -Index: trunk/plugins/common/RESTSupport.vala -=================================================================== ---- trunk.orig/plugins/common/RESTSupport.vala -+++ trunk/plugins/common/RESTSupport.vala -@@ -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) { -Index: trunk/plugins/shotwell-publishing/FacebookPublishing.vala -=================================================================== ---- trunk.orig/plugins/shotwell-publishing/FacebookPublishing.vala -+++ trunk/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -1473,6 +1473,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() { diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch shotwell-0.26.3/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch 2015-12-13 08:01:05.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0503-facebook-Dont-disable-XSS-auditor.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From 2a1dd48e702b0e8524a4ed212252aa4c49c6b0f0 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 4 Dec 2015 18:08:54 +0100 -Subject: [PATCH] facebook: Don't disable XSS auditor - -This is a separate commit to make it possible to revert easily, as -I don't know why it was disabled. - -https://bugzilla.gnome.org/show_bug.cgi?id=751709 ---- - plugins/shotwell-publishing/FacebookPublishing.vala | 1 - - 1 file changed, 1 deletion(-) - -Index: trunk/plugins/shotwell-publishing/FacebookPublishing.vala -=================================================================== ---- trunk.orig/plugins/shotwell-publishing/FacebookPublishing.vala -+++ trunk/plugins/shotwell-publishing/FacebookPublishing.vala -@@ -829,7 +829,6 @@ internal class WebAuthenticationPane : S - - webview = new WebKit.WebView(); - webview.get_settings().enable_plugins = false; -- webview.get_settings().enable_xss_auditor = false; - - webview.load_changed.connect(on_page_load_changed); - webview.context_menu.connect(() => { return true; }); diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0510-Delay_size_request.patch shotwell-0.26.3/debian/patches/0510-Delay_size_request.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0510-Delay_size_request.patch 2016-06-05 20:11:59.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0510-Delay_size_request.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: Delay size_request -Author: Jens Georg -Origin: https://git.gnome.org/browse/shotwell/commit/?id=4a70d87 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 -Forwarded: not-needed -Last-Update: 2015-06-05 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/CheckerboardLayout.vala -=================================================================== ---- trunk.orig/src/CheckerboardLayout.vala -+++ trunk/src/CheckerboardLayout.vala -@@ -911,7 +911,11 @@ public class CheckerboardLayout : Gtk.Dr - debug("on_viewport_resized: due_to_reflow=%s set_size_request %dx%d", - size_allocate_due_to_reflow.to_string(), parent_allocation.width, req.height); - #endif -- set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); -+ // But if the current height is 0, don't request a size yet. Delay -+ // it to do_reflow (bgo#766864) -+ if (req.height != 0) { -+ set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); -+ } - } else { - // set the layout's width and height to always match the parent's - set_size_request(parent_allocation.width, parent_allocation.height); diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0515-Fix_background_color_drawing.patch shotwell-0.26.3/debian/patches/0515-Fix_background_color_drawing.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0515-Fix_background_color_drawing.patch 2016-06-05 20:15:10.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0515-Fix_background_color_drawing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Description: Fix background color drawing -Author: Jens Georg -Origin: https://git.gnome.org/browse/shotwell/commit/?id=7361b3f -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 -Forwarded: not-needed -Last-Update: 2015-06-05 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/CheckerboardLayout.vala -=================================================================== ---- trunk.orig/src/CheckerboardLayout.vala -+++ trunk/src/CheckerboardLayout.vala -@@ -1812,6 +1812,10 @@ public class CheckerboardLayout : Gtk.Dr - // we want switched_to() to be the final call in the process (indicating that the page is - // now in place and should do its thing to update itself), have to be be prepared for - // GTK/GDK calls between the widgets being actually present on the screen and "switched to" -+ -+ Gtk.Allocation allocation; -+ get_allocation(out allocation); -+ get_style_context().render_background (ctx, 0, 0, allocation.width, allocation.height); - - // watch for message mode - if (message == null) { -@@ -1833,7 +1837,6 @@ public class CheckerboardLayout : Gtk.Dr - int text_width, text_height; - pango_layout.get_pixel_size(out text_width, out text_height); - -- Gtk.Allocation allocation; - get_allocation(out allocation); - - int x = allocation.width - text_width; diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/0600-remove_wrong_marco.patch shotwell-0.26.3/debian/patches/0600-remove_wrong_marco.patch --- shotwell-0.25.4+really0.24.5/debian/patches/0600-remove_wrong_marco.patch 2017-02-05 17:49:15.000000000 +0000 +++ shotwell-0.26.3/debian/patches/0600-remove_wrong_marco.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Remove wrong macro 'R' from manpage -Author: Jörg Frings-Fürst -Last-Update: 2016-08-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/help/shotwell.1 -+++ b/help/shotwell.1 -@@ -13,7 +13,8 @@ import photos from disk or camera, organ - - .SH "OPTIONS" - .B \-h, \-\-help --.R Show help options -+Show help options -+.RE - - .B \-d, \-\-datadir=DIRECTORY - .RS diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/505-fix-viewer-desktop-file.patch shotwell-0.26.3/debian/patches/505-fix-viewer-desktop-file.patch --- shotwell-0.25.4+really0.24.5/debian/patches/505-fix-viewer-desktop-file.patch 2015-04-03 12:10:57.000000000 +0000 +++ shotwell-0.26.3/debian/patches/505-fix-viewer-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Description: Fix viewer desktop file - A typo in the Makefile, probably due to a quick copy/paste, results in an - incorrectly generated desktop file for the photo viewer. -Author: Raphaël Halimi -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776745 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743799 -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=743799 -Applied-Upstream: 0.22.0, https://git.gnome.org/browse/shotwell/commit/?id=2ecda59a5562565967647b6c3d44dd99a48a04ef -Last-Update: 2015-04-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/Makefile -=================================================================== ---- trunk.orig/Makefile -+++ trunk/Makefile -@@ -493,9 +493,8 @@ endif - misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES) - cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop - $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \ -- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \ -- echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ -- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \ -+ LANGUAGE=$(lang) gettext --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` \ -+ >> misc/shotwell-viewer.desktop ; \ - echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \ - --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;) - ifndef DISABLE_DESKTOP_VALIDATE diff -Nru shotwell-0.25.4+really0.24.5/debian/patches/series shotwell-0.26.3/debian/patches/series --- shotwell-0.25.4+really0.24.5/debian/patches/series 2016-08-20 18:04:02.000000000 +0000 +++ shotwell-0.26.3/debian/patches/series 2017-09-22 21:26:18.000000000 +0000 @@ -1,11 +1,2 @@ -#0001-buildflags.patch -#0005-hardening.patch -#0010-libexec.patch -#0500-Port-to-webkit2gtk-40.patch -#0501-Dont-pack-webview-into-a-scrolled-window.patch -#0502-Have-all-soup-sessions-validate-TLS-certificates.patch -#0503-facebook-Dont-disable-XSS-auditor.patch -0600-remove_wrong_marco.patch +0001-appstream.patch 0100-ios8.patch -#0510-Delay_size_request.patch -#0515-Fix_background_color_drawing.patch diff -Nru shotwell-0.25.4+really0.24.5/debian/replace_thumbnailer.sh shotwell-0.26.3/debian/replace_thumbnailer.sh --- shotwell-0.25.4+really0.24.5/debian/replace_thumbnailer.sh 2015-01-22 18:05:02.000000000 +0000 +++ shotwell-0.26.3/debian/replace_thumbnailer.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#! /bin/bash - -if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - echo ' /usr/lib/shotwell-video-thumbnailer.org exists!' - echo ' break' - exit 1 -fi - -echo '**** backup ****' -mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - -echo '**** install ffmpegthumbnailer ****' -apt-get install ffmpegthumbnailer -y - -echo '**** install new file ****' -touch /usr/lib/shotwell-video-thumbnailer -chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - -echo '#! /bin/bash' >/usr/lib/shotwell-video-thumbnailer -echo '' >>/usr/lib/shotwell-video-thumbnailer -echo 'ffmpegthumbnailer -i "$1" -o - -c png' >>/usr/lib/shotwell-video-thumbnailer diff -Nru shotwell-0.25.4+really0.24.5/debian/rules shotwell-0.26.3/debian/rules --- shotwell-0.25.4+really0.24.5/debian/rules 2016-08-20 19:10:01.000000000 +0000 +++ shotwell-0.26.3/debian/rules 2017-09-22 21:26:18.000000000 +0000 @@ -7,34 +7,17 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") %: - dh $@ + dh $@ --with scour,translations override_dh_auto_configure: - ./configure --prefix=/usr --libexec=/usr/lib --disable-schemas-compile + dh_auto_configure -- --prefix=/usr \ + --libexec=/usr/lib \ + --disable-schemas-compile \ + --enable-unity-support override_dh_install: dh_install - # Touch the generated C files with mtime of debian/changelog, - # find -type f -name '*.c' -exec touch -r $(CURDIR)/debian/changelog {} \; - # then install these C files required for debugging into the shotwell-dbg package. - mkdir -p debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source - find -type f -name '*.c' -exec cp --parent '{}' debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source/ ';' - cd debian/shotwell-dbg/usr/share/doc/shotwell-dbg && \ - tar --mode=go=rX,u+rw,a-s --mtime="$(B_DATE)" -cJf temp-source.tar.xz temp-source - rm -fr debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source # Remove unwanted la files - rm -f debian/shotwell/usr/lib/shotwell/plugins/builtin/*.la - rm -f debian/shotwell/usr/lib/*.la - -override_dh_installchangelogs: - dh_installchangelogs NEWS - -override_dh_strip: - dh_strip --dbg-package=shotwell-dbg - -override_dh_compress: - dh_compress -X.tar.xz - -override_dh_installman: - dh_installman - rm -fr debian/shotwell-common/usr/share/man + rm -f debian/shotwell/usr/lib/*/shotwell/plugins/builtin/*.la + rm -f debian/shotwell/usr/lib/*/*shotwell*.a + rm -f debian/shotwell/usr/lib/*/*shotwell*.la diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell-common.install shotwell-0.26.3/debian/shotwell-common.install --- shotwell-0.25.4+really0.24.5/debian/shotwell-common.install 2013-05-12 21:22:42.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell-common.install 2017-09-22 21:26:18.000000000 +0000 @@ -1 +1,4 @@ -usr/share +usr/share/glib-2.0 +usr/share/help +usr/share/icons +usr/share/locale diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell-common.postrm shotwell-0.26.3/debian/shotwell-common.postrm --- shotwell-0.25.4+really0.24.5/debian/shotwell-common.postrm 2016-08-20 21:08:13.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell-common.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - - -case "$1" in - purge|remove) - - # - # rebuild icon cache - # - if [ -x gtk-update-icon-cache ] ; then - gtk-update-icon-cache /usr/share/icons/hicolor - fi - -esac - -#DEBHELPER# diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell-dbg.README.Debian shotwell-0.26.3/debian/shotwell-dbg.README.Debian --- shotwell-0.25.4+really0.24.5/debian/shotwell-dbg.README.Debian 2016-04-17 13:58:05.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell-dbg.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ - -For debugging you can copy the files from temp-source.tar.xz into -your source directory (//usr/src/shotwell-VERSION) or you can -set the dircetory for gdb with the commandline parameter --directory=DIR. - -For other debugger please read the docs. - - -- Jörg Frings-Fürst Fri, 03 Apr 2015 13:16:32 +0200 diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell.1 shotwell-0.26.3/debian/shotwell.1 --- shotwell-0.25.4+really0.24.5/debian/shotwell.1 2011-08-21 13:38:20.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -.TH shotwell 1 "December 30, 2009" -.SH NAME -shotwell \- a digital photo organizer -.SH DESCRIPTION -.B shotwell -is a digital photo organizer designed for the GNOME desktop environment. It -allows you to import photos from disk or camera, organize them in various ways, -view them in full-window or fullscreen mode, and export them to share with -others. -.SH AUTHOR -shotwell was written by Jim Nelson, Lucas Beeler and Allison Barlow. -.PP -This manual page was written by Devid Antonio Filoni , -for the Debian project (and may be used by others). diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell.README.Debian shotwell-0.26.3/debian/shotwell.README.Debian --- shotwell-0.25.4+really0.24.5/debian/shotwell.README.Debian 2015-04-06 04:27:22.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -TROUBLESHOOTING ---------------- - -- video-thumbnailer - - On problems with the shotwell-video-thumbnailer you can - switch to the ffmpegthumnailer. Please run as root: - - 1. Backup /usr/lib/shotwell-video-thumbnailer: - * mv /usr/lib/shotwell-video-thumbnailer /usr/lib/shotwell-video-thumbnailer.org - - 2. Install ffmpegthumbnailer: - * apt-get install ffmpegthumbnailer - - 3. Create a new executable file: - * touch /usr/lib/shotwell-video-thumbnailer - * chmod --reference=/usr/lib/shotwell-video-thumbnailer.org /usr/lib/shotwell-video-thumbnailer - - 4. Write into the new file: - * echo "#! /bin/bash" >/usr/lib/shotwell-video-thumbnailer - * echo "ffmpegthumnailer -i \"$1\" -o -b -c png >>/usr/lib/shotwell-video-thumbnailer - - Or you can use the file replace_thumbnail.sh from the examples directory. - - Thanks to Teo Romera diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell.docs shotwell-0.26.3/debian/shotwell.docs --- shotwell-0.25.4+really0.24.5/debian/shotwell.docs 2010-01-23 19:43:03.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell.docs 2017-09-22 21:26:18.000000000 +0000 @@ -1,2 +1,3 @@ README THANKS +NEWS diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell.install shotwell-0.26.3/debian/shotwell.install --- shotwell-0.25.4+really0.24.5/debian/shotwell.install 2016-08-20 14:08:02.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell.install 2017-09-22 21:26:18.000000000 +0000 @@ -1,2 +1,4 @@ usr/bin usr/lib +usr/share/applications +usr/share/appdata diff -Nru shotwell-0.25.4+really0.24.5/debian/shotwell.postrm shotwell-0.26.3/debian/shotwell.postrm --- shotwell-0.25.4+really0.24.5/debian/shotwell.postrm 2016-06-05 12:30:38.000000000 +0000 +++ shotwell-0.26.3/debian/shotwell.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = purge ]; then - - # - # remove backup files - # - if [ -e /usr/lib/shotwell-video-thumbnailer.org ] ; then - rm -f /usr/lib/shotwell-video-thumbnailer.org - fi -fi - -#DEBHELPER# diff -Nru shotwell-0.25.4+really0.24.5/debian/watch shotwell-0.26.3/debian/watch --- shotwell-0.25.4+really0.24.5/debian/watch 2016-06-04 21:16:20.000000000 +0000 +++ shotwell-0.26.3/debian/watch 2017-09-22 21:26:18.000000000 +0000 @@ -1,2 +1,3 @@ version=4 -http://ftp.gnome.org/pub/gnome/sources/shotwell/([\d\.]+)/shotwell-([\d\.]+)\.tar\.xz +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz