Update to 3.10.0

4 files changed, 195 insertions, 231 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 4df093fe28a6..64af2646a45c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/graphics/gthumb/Makefile 19823 2014-08-20 09:28:14Z gusi $
 
 PORTNAME=	gthumb
-PORTVERSION=	3.6.1
-PORTREVISION=	11
+PORTVERSION=	3.10.0
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -24,24 +23,22 @@ LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter \
 		liboauth.so:net/liboauth \
 		libpng.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
-		libtiff.so:graphics/tiff
+		libtiff.so:graphics/tiff \
+		libcolord.so:graphics/colord
 RUN_DEPENDS=	gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
 
-USES=		bison compiler:c++11-lib desktop-file-utils gettext gl gmake \
-		gnome jpeg libtool localbase pathfix pkgconfig tar:xz xorg
+USES=		bison compiler:c++11-lib desktop-file-utils gettext gl \
+		gnome jpeg localbase:ldflags meson pkgconfig tar:xz xorg
 USE_GL=		egl
 USE_GNOME=	cairo gtk30 intltool librsvg2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrandr xi
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_lib_jpeg_jpeg_destroy_decompress=yes \
-		ac_cv_lib_tiff_TIFFWriteScanline=yes
-CONFIGURE_ARGS=	--disable-libchamplain \
-		--enable-librsvg
+MESON_ARGS=	-Dlibrsvg=true \
+		-Dlibchamplain=false
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-PLIST_SUB=	GTHUMB_VER="3.6"
+PLIST_SUB=	GTHUMB_VER="3.10"
 
 GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.comments.gschema.xml \
@@ -65,7 +62,9 @@ GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.resize.gschema.xml \
 		org.gnome.gthumb.rotate.gschema.xml \
 		org.gnome.gthumb.slideshow.gschema.xml \
-		org.gnome.gthumb.webalbums.gschema.xml
+		org.gnome.gthumb.webalbums.gschema.xml \
+		org.gnome.gthumb.catalogs.gschema.xml \
+		org.gnome.gthumb.terminal.gschema.xml
 
 OPTIONS_DEFINE=		BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \
 			WEBP WEBSERVICES YELP
@@ -75,32 +74,29 @@ OPTIONS_SUB=		yes
 
 BRASERO_DESC=		Write galleries to CD/DVD (large dependency)
 BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
-BRASERO_CONFIGURE_ENABLE=	libbrasero
+BRASERO_MESON_TRUE=	libbrasero
 CLUTTER_DESC=		Fancy slideshows
 CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3
-CLUTTER_CONFIGURE_ENABLE=	clutter
+CLUTTER_MESON_TRUE=	clutter
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
-EXIV2_CONFIGURE_ENABLE=	exiv2
+EXIV2_MESON_TRUE=	exiv2
 GSTREAMER_USE=		gstreamer1=yes
-GSTREAMER_CONFIGURE_ENABLE=	gstreamer
+GSTREAMER_MESON_TRUE=	gstreamer
 RAW_DESC=		Raw image support via libraw
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
-RAW_CONFIGURE_ENABLE=	libraw
+RAW_MESON_TRUE=		libraw
 SECRET_DESC=		Libsecret support for storing passwords
 SECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
-SECRET_CONFIGURE_ENABLE=	libsecret
+SECRET_MESON_TRUE=	libsecret
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-WEBP_CONFIGURE_ENABLE=	libwebp
+WEBP_MESON_TRUE=	libwebp
 WEBSERVICES_DESC=	Web services
 WEBSERVICES_LIB_DEPENDS=\
 			libjson-glib-1.0.so:devel/json-glib \
 			libsoup-gnome-2.4.so:devel/libsoup-gnome \
 			libwebkit2gtk-4.0.so:www/webkit2-gtk3
-WEBSERVICES_CONFIGURE_ENABLE=	libjson-glib libsoup webkit2
+WEBSERVICES_MESON_TRUE=	webservices
 YELP_DESC=		Viewer for built-in help system
 YELP_RUN_DEPENDS=	yelp:x11/yelp
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Wl,--as-needed||' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 694115b37739..64f5780fb727 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522143212
-SHA256 (gnome3/gthumb-3.6.1.tar.xz) = 9cabf9e17f8feab1012836f6371e32a555f030bd3c912a565dc49795f83342ee
-SIZE (gnome3/gthumb-3.6.1.tar.xz) = 3415564
+TIMESTAMP = 1592255472
+SHA256 (gnome3/gthumb-3.10.0.tar.xz) = 3e71f8395a01acfc80af4126fca99d99e7b227aed750bafd64734f08c9edec48
+SIZE (gnome3/gthumb-3.10.0.tar.xz) = 7550040
diff --git a/graphics/gthumb/files/patch-gentoo_2bd8b9 b/graphics/gthumb/files/patch-gentoo_2bd8b9
deleted file mode 100644
index 29685bd88b3c..000000000000
--- a/graphics/gthumb/files/patch-gentoo_2bd8b9
+++ /dev/null
@@ -1,34 +0,0 @@
-Patch kindly borrowed from Mageia.
-
-* asturm@gentoo.org: Dropped unnecessary and backwards incompatible
-xmp_exiv2.hpp include.
-
-https://gitlab.gnome.org/GNOME/gthumb/issues/30
-
-diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
---- extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
-+++ extensions/exiv2_tools/exiv2-utils.cpp	2018-12-31 15:51:50.912329232 +0100
-@@ -32,7 +32,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gthumb.h>
- #include "exiv2-utils.h"
- 
-@@ -1073,7 +1073,11 @@
- 
- 	try {
- 		if (exifData.empty()) {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
-+#else
- 			throw Exiv2::Error(1, " No Exif data found in the file");
-+#endif
- 		}
- 		Exiv2::ExifData::const_iterator end = exifData.end();
- 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
-
-
-
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index f0c4c5a82ab2..bf3a83e55dda 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -1,114 +1,163 @@
 bin/gthumb
-include/gthumb-%%GTHUMB_VER%%/gthumb.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/cairo-scale.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/cairo-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/color-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/dom.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gfixed.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gimp-op.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gio-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/glib-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gnome-desktop-thumbnail.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gsignature.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-accel-button.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-async-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-auto-paned.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-browser.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-buffer-data.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-color-manager.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-color-scale.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-delete-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-duplicable.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-empty-list.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-enum-types.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-error.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-extensions.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-chooser-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-data.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-list.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-properties.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-selection.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source-vfs.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-store.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-tool.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-view.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-editor-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-file.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-grid.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filterbar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-folder-tree.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-grid-view.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram-view.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-hook.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icc-profile.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icon-cache.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-dragger.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-history.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-list-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-loader.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-navigator.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-overview.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-preloader.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-saver.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-selector.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-task-chain.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer-tool.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-info-bar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-load-file-data-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-location-bar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-location-chooser.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-main.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-marshal.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-menu-manager.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-chooser.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-provider.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-monitor.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-multipage.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-overwrite-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-paned.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-preferences.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-progress-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-request-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-save-file-data-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-save-image-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-screensaver.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-sidebar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-source-tree.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-statusbar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-string-list.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-entry.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-file.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-aspect-ratio.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-category.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-chain.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-selector.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-simple.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-thumb-loader.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time-selector.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toolbox.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-uri-list.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-user-dir.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-viewer-page.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-window.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gtk-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gvaluehash.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/main.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-cache.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-io.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-utils.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/typedefs.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/zlib-utils.h
+share/help/nl/gthumb/sharing-social.page
+share/help/nl/gthumb/slideshow.page
+share/help/nl/gthumb/sorting.page
+share/help/nl/gthumb/strftime.page
+share/help/nl/gthumb/thumbnail-pane.page
+share/help/nl/gthumb/thumbnails.page
+share/help/nl/gthumb/viewer.page
+share/help/nl/gthumb/wallpaper.page
+share/metainfo/org.gnome.gThumb.appdata.xml
+share/help/nl/gthumb/attributes.page
+share/help/nl/gthumb/batch-change-date.page
+share/help/nl/gthumb/batch-convert-format.page
+share/help/nl/gthumb/batch-resize.page
+share/help/nl/gthumb/batch-rotate.page
+share/help/nl/gthumb/batch-scripts.page
+share/help/nl/gthumb/bookmarks.page
+share/help/nl/gthumb/browser.page
+share/help/nl/gthumb/edit-colors.page
+share/help/nl/gthumb/edit-redeye.page
+share/help/nl/gthumb/edit-resize-crop.page
+share/help/nl/gthumb/edit-rotate.page
+share/help/nl/gthumb/edit-save-undo-redo.page
+share/help/nl/gthumb/extensions.page
+share/help/nl/gthumb/figures/general-filter.png
+share/help/nl/gthumb/figures/import-pref-auto-folder.png
+share/help/nl/gthumb/figures/import-pref-custom-format.png
+share/help/nl/gthumb/figures/import.png
+share/help/nl/gthumb/figures/main-win.png
+share/help/nl/gthumb/figures/palette.png
+share/help/nl/gthumb/figures/specific-filter.png
+share/help/nl/gthumb/figures/thumbnail-pane.png
+share/help/nl/gthumb/file-copy-move.page
+share/help/nl/gthumb/filtering.page
+share/help/nl/gthumb/fullscreen.page
+share/help/nl/gthumb/gimp.page
+share/help/nl/gthumb/import.page
+share/help/nl/gthumb/index.page
+share/help/nl/gthumb/introduction.page
+share/help/nl/gthumb/legal.xml
+share/help/nl/gthumb/printing.page
+share/help/nl/gthumb/rename-series.page
+share/help/nl/gthumb/sharing-disc.page
+include/gthumb/cairo-scale.h
+include/gthumb/cairo-utils.h
+include/gthumb/color-utils.h
+include/gthumb/dom.h
+include/gthumb/gfixed.h
+include/gthumb/gimp-op.h
+include/gthumb/gio-utils.h
+include/gthumb/glib-utils.h
+include/gthumb/gnome-desktop-thumbnail.h
+include/gthumb/gsignature.h
+include/gthumb/gth-accel-button.h
+include/gthumb/gth-accel-dialog.h
+include/gthumb/gth-async-task.h
+include/gthumb/gth-auto-paned.h
+include/gthumb/gth-browser.h
+include/gthumb/gth-buffer-data.h
+include/gthumb/gth-color-manager.h
+include/gthumb/gth-color-scale.h
+include/gthumb/gth-delete-task.h
+include/gthumb/gth-duplicable.h
+include/gthumb/gth-empty-list.h
+include/gthumb/gth-enum-types.h
+include/gthumb/gth-error.h
+include/gthumb/gth-extensions.h
+include/gthumb/gth-file-chooser-dialog.h
+include/gthumb/gth-file-data.h
+include/gthumb/gth-file-list.h
+include/gthumb/gth-file-properties.h
+include/gthumb/gth-file-selection-info.h
+include/gthumb/gth-file-selection.h
+include/gthumb/gth-file-source-vfs.h
+include/gthumb/gth-file-source.h
+include/gthumb/gth-file-store.h
+include/gthumb/gth-file-tool.h
+include/gthumb/gth-file-view.h
+include/gthumb/gth-filter-editor-dialog.h
+include/gthumb/gth-filter-file.h
+include/gthumb/gth-filter-grid.h
+include/gthumb/gth-filter.h
+include/gthumb/gth-filterbar.h
+include/gthumb/gth-folder-tree.h
+include/gthumb/gth-grid-view.h
+include/gthumb/gth-histogram-view.h
+include/gthumb/gth-histogram.h
+include/gthumb/gth-hook.h
+include/gthumb/gth-icc-profile.h
+include/gthumb/gth-icon-cache.h
+include/gthumb/gth-image-dragger.h
+include/gthumb/gth-image-history.h
+include/gthumb/gth-image-list-task.h
+include/gthumb/gth-image-loader.h
+include/gthumb/gth-image-navigator.h
+include/gthumb/gth-image-overview.h
+include/gthumb/gth-image-preloader.h
+include/gthumb/gth-image-saver.h
+include/gthumb/gth-image-selector.h
+include/gthumb/gth-image-task-chain.h
+include/gthumb/gth-image-task.h
+include/gthumb/gth-image-utils.h
+include/gthumb/gth-image-viewer-tool.h
+include/gthumb/gth-image-viewer.h
+include/gthumb/gth-image.h
+include/gthumb/gth-info-bar.h
+include/gthumb/gth-load-file-data-task.h
+include/gthumb/gth-location-bar.h
+include/gthumb/gth-location-chooser-dialog.h
+include/gthumb/gth-location-chooser.h
+include/gthumb/gth-main.h
+include/gthumb/gth-marshal.h
+include/gthumb/gth-menu-manager.h
+include/gthumb/gth-metadata-chooser.h
+include/gthumb/gth-metadata-provider.h
+include/gthumb/gth-metadata.h
+include/gthumb/gth-monitor.h
+include/gthumb/gth-overwrite-dialog.h
+include/gthumb/gth-paned.h
+include/gthumb/gth-preferences.h
+include/gthumb/gth-progress-dialog.h
+include/gthumb/gth-property-view.h
+include/gthumb/gth-request-dialog.h
+include/gthumb/gth-save-file-data-task.h
+include/gthumb/gth-save-image-task.h
+include/gthumb/gth-screensaver.h
+include/gthumb/gth-shortcut.h
+include/gthumb/gth-sidebar-section.h
+include/gthumb/gth-sidebar.h
+include/gthumb/gth-statusbar.h
+include/gthumb/gth-string-list.h
+include/gthumb/gth-tags-entry.h
+include/gthumb/gth-tags-file.h
+include/gthumb/gth-task.h
+include/gthumb/gth-test-aspect-ratio.h
+include/gthumb/gth-test-category.h
+include/gthumb/gth-test-chain.h
+include/gthumb/gth-test-selector.h
+include/gthumb/gth-test-simple.h
+include/gthumb/gth-test.h
+include/gthumb/gth-thumb-loader.h
+include/gthumb/gth-time-selector.h
+include/gthumb/gth-time.h
+include/gthumb/gth-toolbox.h
+include/gthumb/gth-uri-list.h
+include/gthumb/gth-user-dir.h
+include/gthumb/gth-vfs-tree.h
+include/gthumb/gth-viewer-page.h
+include/gthumb/gth-window.h
+include/gthumb/gthumb.h
+include/gthumb/gtk-utils.h
+include/gthumb/gvaluehash.h
+include/gthumb/main.h
+include/gthumb/pixbuf-cache.h
+include/gthumb/pixbuf-io.h
+include/gthumb/pixbuf-utils.h
+include/gthumb/str-utils.h
+include/gthumb/typedefs.h
+include/gthumb/uri-utils.h
+include/gthumb/zlib-utils.h
 %%WEBSERVICES%%lib/gthumb/extensions/23hq.extension
 lib/gthumb/extensions/bookmarks.extension
 %%BRASERO%%lib/gthumb/extensions/burn_disc.extension
@@ -136,83 +185,45 @@ lib/gthumb/extensions/image_rotation.extension
 lib/gthumb/extensions/image_viewer.extension
 lib/gthumb/extensions/importer.extension
 lib/gthumb/extensions/jpeg_utils.extension
-%%WEBSERVICES%%lib/gthumb/extensions/lib23hq.a
 %%WEBSERVICES%%lib/gthumb/extensions/lib23hq.so
-lib/gthumb/extensions/libbookmarks.a
 lib/gthumb/extensions/libbookmarks.so
-%%BRASERO%%lib/gthumb/extensions/libburn_disc.a
 %%BRASERO%%lib/gthumb/extensions/libburn_disc.so
-lib/gthumb/extensions/libcairo_io.a
 lib/gthumb/extensions/libcairo_io.so
-lib/gthumb/extensions/libcatalogs.a
 lib/gthumb/extensions/libcatalogs.so
-lib/gthumb/extensions/libchange_date.a
 lib/gthumb/extensions/libchange_date.so
-lib/gthumb/extensions/libcomments.a
 lib/gthumb/extensions/libcomments.so
-lib/gthumb/extensions/libcontact_sheet.a
 lib/gthumb/extensions/libcontact_sheet.so
-lib/gthumb/extensions/libconvert_format.a
 lib/gthumb/extensions/libconvert_format.so
-lib/gthumb/extensions/libdesktop_background.a
 lib/gthumb/extensions/libdesktop_background.so
-lib/gthumb/extensions/libedit_metadata.a
 lib/gthumb/extensions/libedit_metadata.so
-%%EXIV2%%lib/gthumb/extensions/libexiv2_tools.a
 %%EXIV2%%lib/gthumb/extensions/libexiv2_tools.so
-lib/gthumb/extensions/libexport_tools.a
 lib/gthumb/extensions/libexport_tools.so
-%%WEBSERVICES%%lib/gthumb/extensions/libfacebook.a
 %%WEBSERVICES%%lib/gthumb/extensions/libfacebook.so
-lib/gthumb/extensions/libfile_manager.a
 lib/gthumb/extensions/libfile_manager.so
-lib/gthumb/extensions/libfile_tools.a
 lib/gthumb/extensions/libfile_tools.so
-lib/gthumb/extensions/libfile_viewer.a
 lib/gthumb/extensions/libfile_viewer.so
-lib/gthumb/extensions/libfind_duplicates.a
 lib/gthumb/extensions/libfind_duplicates.so
-%%WEBSERVICES%%lib/gthumb/extensions/libflicker.a
 %%WEBSERVICES%%lib/gthumb/extensions/libflicker.so
-%%WEBSERVICES%%lib/gthumb/extensions/libflicker_utils.a
 %%WEBSERVICES%%lib/gthumb/extensions/libflicker_utils.so
-%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.a
 %%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.so
-%%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.a
 %%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.so
-lib/gthumb/extensions/libimage_print.a
 lib/gthumb/extensions/libimage_print.so
-lib/gthumb/extensions/libimage_rotation.a
 lib/gthumb/extensions/libimage_rotation.so
-lib/gthumb/extensions/libimage_viewer.a
 lib/gthumb/extensions/libimage_viewer.so
-lib/gthumb/extensions/libimporter.a
 lib/gthumb/extensions/libimporter.so
-lib/gthumb/extensions/libjpeg_utils.a
 lib/gthumb/extensions/libjpeg_utils.so
-lib/gthumb/extensions/liblist_tools.a
 lib/gthumb/extensions/liblist_tools.so
-%%WEBSERVICES%%lib/gthumb/extensions/liboauth.a
 %%WEBSERVICES%%lib/gthumb/extensions/liboauth.so
-lib/gthumb/extensions/libphoto_importer.a
 lib/gthumb/extensions/libphoto_importer.so
-%%WEBSERVICES%%lib/gthumb/extensions/libpicasaweb.a
 %%WEBSERVICES%%lib/gthumb/extensions/libpicasaweb.so
-lib/gthumb/extensions/libraw_files.a
 lib/gthumb/extensions/libraw_files.so
-lib/gthumb/extensions/libred_eye_removal.a
 lib/gthumb/extensions/libred_eye_removal.so
-lib/gthumb/extensions/librename_series.a
 lib/gthumb/extensions/librename_series.so
-lib/gthumb/extensions/libresize_images.a
 lib/gthumb/extensions/libresize_images.so
-lib/gthumb/extensions/libsearch.a
 lib/gthumb/extensions/libsearch.so
-lib/gthumb/extensions/libselections.a
 lib/gthumb/extensions/libselections.so
-lib/gthumb/extensions/libslideshow.a
 lib/gthumb/extensions/libslideshow.so
-lib/gthumb/extensions/libwebalbums.a
+lib/gthumb/extensions/libterminal.so
 lib/gthumb/extensions/libwebalbums.so
 lib/gthumb/extensions/list_tools.extension
 %%WEBSERVICES%%lib/gthumb/extensions/oauth.extension
@@ -225,12 +236,11 @@ lib/gthumb/extensions/resize_images.extension
 lib/gthumb/extensions/search.extension
 lib/gthumb/extensions/selections.extension
 lib/gthumb/extensions/slideshow.extension
+lib/gthumb/extensions/terminal.extension
 lib/gthumb/extensions/webalbums.extension
 libdata/pkgconfig/gthumb-%%GTHUMB_VER%%.pc
 man/man1/gthumb.1.gz
 share/aclocal/gthumb.m4
-share/appdata/org.gnome.gThumb.appdata.xml
-share/applications/org.gnome.gThumb.Import.desktop
 share/applications/org.gnome.gThumb.desktop
 %%DATADIR%%/albumthemes/Classic/back.png
 %%DATADIR%%/albumthemes/Classic/bot.png
@@ -292,6 +302,7 @@ share/applications/org.gnome.gThumb.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/emblem-flag-red.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/emblem-flag-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/export-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/extension-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/eyedropper-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/file-catalog-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/file-library-symbolic.svg
@@ -315,8 +326,10 @@ share/applications/org.gnome.gThumb.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/image-rotate-right-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/image-rotate-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/image-sharpen-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/lock-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/map-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/palette-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/pinned-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/presets-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/site-facebook.png
 %%DATADIR%%/icons/hicolor/16x16/actions/site-flickr.png
@@ -327,6 +340,7 @@ share/applications/org.gnome.gThumb.desktop
 %%DATADIR%%/icons/hicolor/16x16/actions/swap-values-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/tag-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/tools-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/transparency-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/view-presentation-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-fit-height-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-fit-symbolic.svg
@@ -360,6 +374,8 @@ share/applications/org.gnome.gThumb.desktop
 %%WEBSERVICES%%%%DATADIR%%/ui/export-to-picasaweb.ui
 %%DATADIR%%/ui/extensions-preferences.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/facebook-album-properties.ui
+%%DATADIR%%/ui/favorite-properties.ui
+%%DATADIR%%/ui/file-selection-info.ui
 %%DATADIR%%/ui/filter-editor.ui
 %%DATADIR%%/ui/find-duplicates-choose-folders.ui
 %%DATADIR%%/ui/find-duplicates-dialog.ui
@@ -396,12 +412,13 @@ share/applications/org.gnome.gThumb.desktop
 %%DATADIR%%/ui/save-options-preferences.ui
 %%DATADIR%%/ui/search-editor.ui
 %%DATADIR%%/ui/sharpen-options.ui
+%%DATADIR%%/ui/shortcuts-preferences.ui
 %%DATADIR%%/ui/slideshow-preferences.ui
 %%DATADIR%%/ui/sort-order.ui
 %%DATADIR%%/ui/tag-chooser.ui
+%%DATADIR%%/ui/terminal-preferences.ui
 %%DATADIR%%/ui/tga-options.ui
 %%DATADIR%%/ui/tiff-options.ui
-%%DATADIR%%/ui/toolbar-zoom-menu.ui
 %%DATADIR%%/ui/web-album-exporter.ui
 %%DATADIR%%/ui/webp-options.ui
 share/help/C/gthumb/attributes.page
@@ -438,7 +455,6 @@ share/help/C/gthumb/printing.page
 share/help/C/gthumb/rename-series.page
 share/help/C/gthumb/sharing-disc.page
 share/help/C/gthumb/sharing-social.page
-share/help/C/gthumb/shortcuts.page
 share/help/C/gthumb/slideshow.page
 share/help/C/gthumb/sorting.page
 share/help/C/gthumb/strftime.page
@@ -480,7 +496,6 @@ share/help/cs/gthumb/printing.page
 share/help/cs/gthumb/rename-series.page
 share/help/cs/gthumb/sharing-disc.page
 share/help/cs/gthumb/sharing-social.page
-share/help/cs/gthumb/shortcuts.page
 share/help/cs/gthumb/slideshow.page
 share/help/cs/gthumb/sorting.page
 share/help/cs/gthumb/strftime.page
@@ -522,7 +537,6 @@ share/help/de/gthumb/printing.page
 share/help/de/gthumb/rename-series.page
 share/help/de/gthumb/sharing-disc.page
 share/help/de/gthumb/sharing-social.page
-share/help/de/gthumb/shortcuts.page
 share/help/de/gthumb/slideshow.page
 share/help/de/gthumb/sorting.page
 share/help/de/gthumb/strftime.page
@@ -564,7 +578,6 @@ share/help/el/gthumb/printing.page
 share/help/el/gthumb/rename-series.page
 share/help/el/gthumb/sharing-disc.page
 share/help/el/gthumb/sharing-social.page
-share/help/el/gthumb/shortcuts.page
 share/help/el/gthumb/slideshow.page
 share/help/el/gthumb/sorting.page
 share/help/el/gthumb/strftime.page
@@ -606,7 +619,6 @@ share/help/es/gthumb/printing.page
 share/help/es/gthumb/rename-series.page
 share/help/es/gthumb/sharing-disc.page
 share/help/es/gthumb/sharing-social.page
-share/help/es/gthumb/shortcuts.page
 share/help/es/gthumb/slideshow.page
 share/help/es/gthumb/sorting.page
 share/help/es/gthumb/strftime.page
@@ -648,7 +660,6 @@ share/help/eu/gthumb/printing.page
 share/help/eu/gthumb/rename-series.page
 share/help/eu/gthumb/sharing-disc.page
 share/help/eu/gthumb/sharing-social.page
-share/help/eu/gthumb/shortcuts.page
 share/help/eu/gthumb/slideshow.page
 share/help/eu/gthumb/sorting.page
 share/help/eu/gthumb/strftime.page
@@ -690,7 +701,6 @@ share/help/fr/gthumb/printing.page
 share/help/fr/gthumb/rename-series.page
 share/help/fr/gthumb/sharing-disc.page
 share/help/fr/gthumb/sharing-social.page
-share/help/fr/gthumb/shortcuts.page
 share/help/fr/gthumb/slideshow.page
 share/help/fr/gthumb/sorting.page
 share/help/fr/gthumb/strftime.page
@@ -732,7 +742,6 @@ share/help/hu/gthumb/printing.page
 share/help/hu/gthumb/rename-series.page
 share/help/hu/gthumb/sharing-disc.page
 share/help/hu/gthumb/sharing-social.page
-share/help/hu/gthumb/shortcuts.page
 share/help/hu/gthumb/slideshow.page
 share/help/hu/gthumb/sorting.page
 share/help/hu/gthumb/strftime.page
@@ -774,7 +783,6 @@ share/help/oc/gthumb/printing.page
 share/help/oc/gthumb/rename-series.page
 share/help/oc/gthumb/sharing-disc.page
 share/help/oc/gthumb/sharing-social.page
-share/help/oc/gthumb/shortcuts.page
 share/help/oc/gthumb/slideshow.page
 share/help/oc/gthumb/sorting.page
 share/help/oc/gthumb/strftime.page
@@ -816,7 +824,6 @@ share/help/sl/gthumb/printing.page
 share/help/sl/gthumb/rename-series.page
 share/help/sl/gthumb/sharing-disc.page
 share/help/sl/gthumb/sharing-social.page
-share/help/sl/gthumb/shortcuts.page
 share/help/sl/gthumb/slideshow.page
 share/help/sl/gthumb/sorting.page
 share/help/sl/gthumb/strftime.page
@@ -858,7 +865,6 @@ share/help/sv/gthumb/printing.page
 share/help/sv/gthumb/rename-series.page
 share/help/sv/gthumb/sharing-disc.page
 share/help/sv/gthumb/sharing-social.page
-share/help/sv/gthumb/shortcuts.page
 share/help/sv/gthumb/slideshow.page
 share/help/sv/gthumb/sorting.page
 share/help/sv/gthumb/strftime.page
@@ -900,7 +906,6 @@ share/help/zh_CN/gthumb/printing.page
 share/help/zh_CN/gthumb/rename-series.page
 share/help/zh_CN/gthumb/sharing-disc.page
 share/help/zh_CN/gthumb/sharing-social.page
-share/help/zh_CN/gthumb/shortcuts.page
 share/help/zh_CN/gthumb/slideshow.page
 share/help/zh_CN/gthumb/sorting.page
 share/help/zh_CN/gthumb/strftime.page
@@ -908,13 +913,10 @@ share/help/zh_CN/gthumb/thumbnail-pane.page
 share/help/zh_CN/gthumb/thumbnails.page
 share/help/zh_CN/gthumb/viewer.page
 share/help/zh_CN/gthumb/wallpaper.page
-share/icons/hicolor/16x16/apps/gthumb.png
-share/icons/hicolor/16x16/apps/gthumb-symbolic.svg
-share/icons/hicolor/22x22/apps/gthumb.png
-share/icons/hicolor/256x256/apps/gthumb.png
-share/icons/hicolor/32x32/apps/gthumb.png
-share/icons/hicolor/48x48/apps/gthumb.png
-share/icons/hicolor/scalable/apps/gthumb.svg
+share/icons/hicolor/16x16/apps/org.gnome.gThumb-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.gThumb.png
+share/icons/hicolor/256x256/apps/org.gnome.gThumb.png
+share/icons/hicolor/scalable/apps/org.gnome.gThumb.svg
 share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
 share/locale/az/LC_MESSAGES/gthumb.mo