Update to 3.4.0

PR:		199236
Submitted by:	tkato432 at yahoo.com

3 files changed, 69 insertions, 57 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index ef5f313e3b1d..f7bed07d18df 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.3.2
-PORTREVISION=	1
+PORTVERSION=	3.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,8 +17,8 @@ BUILD_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-s
 		itstool:${PORTSDIR}/textproc/itstool
 RUN_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		bison compiler:c++11-lib desktop-file-utils gettext gmake libtool pathfix \
-		pkgconfig tar:xz
+USES=		bison compiler:c++11-lib desktop-file-utils gettext gmake \
+		libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30 librsvg2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
@@ -30,11 +29,10 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-CFLAGS+=	-Wno-error=return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	GTHUMB_VER="3.3"
+PLIST_SUB=	GTHUMB_VER="3.4"
 
 GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.comments.gschema.xml \
@@ -95,7 +93,9 @@ YELP_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^[[:blank:]]zlib/d ; \
-		 s|-Wl,--as-needed||' ${WRKSRC}/configure
+		's|"GNU strip"|"strip"| ; \
+		 s|-Wl,--as-needed|| ; \
+		 /^[[:blank:]]zlib/d ; \
+		 /webkit2gtk/s|-4.0|-3.0|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 73fa755ab155..1b2a31b2d9a7 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gthumb-3.3.2.tar.xz) = 66f6c6824fb209f7f2ae43a6923f3c796c1e06f451a1ab7d0d2988fe727e7a80
-SIZE (gnome3/gthumb-3.3.2.tar.xz) = 3282832
+SHA256 (gnome3/gthumb-3.4.0.tar.xz) = abd1afe457c65289af31c6db7037452faa3838356480857d8cdc19f0ecde4933
+SIZE (gnome3/gthumb-3.4.0.tar.xz) = 3366284
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index e92e888e6e64..fa49a3aff224 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -5,6 +5,7 @@ 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
@@ -14,6 +15,7 @@ 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-scale.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-delete-task.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-dumb-notebook.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-duplicable.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-empty-list.h
@@ -32,6 +34,7 @@ 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
@@ -278,57 +281,64 @@ share/applications/gthumb.desktop
 %%DATADIR%%/contactsheetthemes/minimalist.cst
 %%DATADIR%%/contactsheetthemes/rainbow.cst
 %%DATADIR%%/icons/filmholes.png
+%%DATADIR%%/icons/hicolor/16x16/actions/change-date-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/color-profile.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/comment-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/convert-format-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/curves-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/edit-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/emblem-flag-blue.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/emblem-flag-gray.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/emblem-flag-green.svg
+%%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/file-catalog-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/file-library-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/file-search-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/filter-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/format-linear-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/format-logarithmic-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/histogram-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-adjust-colors-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-adjust-contrast-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-crop-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-equalize-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-flip-horizontal-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-flip-vertical-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-grayscale-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-invert-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-navigator-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-red-eye-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-resize-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/image-rotate-left-symbolic.svg
+%%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/map-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/palette-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
 %%DATADIR%%/icons/hicolor/16x16/actions/site-photobucket.png
 %%DATADIR%%/icons/hicolor/16x16/actions/site-picasaweb.png
 %%DATADIR%%/icons/hicolor/16x16/actions/site-twentythree.png
-%%DATADIR%%/icons/hicolor/scalable/actions/change-date-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/comment-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/convert-format-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/edit-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-blue.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-gray.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-green.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-red.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/export-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/file-catalog-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/file-library-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/file-search-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/filter-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/format-linear-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/format-logarithmic-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/histogram-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-adjust-colors-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-adjust-contrast-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-crop-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-equalize-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-flip-horizontal-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-flip-vertical-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-grayscale-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-invert-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-navigator-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-red-eye-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-resize-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-left-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-right-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/image-sharpen-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/map-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/palette-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/special-effects-symbolic.svg
+%%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/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
+%%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-fit-width-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-in-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-original-symbolic.svg
+%%DATADIR%%/icons/hicolor/16x16/actions/view-zoom-out-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/slideshow-pause.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/swap-values-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/tag-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/tools-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-presentation-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-fit-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-fit-width-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-in-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-original-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-out-symbolic.svg
 %%DATADIR%%/ui/add-to-catalog.ui
 %%DATADIR%%/ui/adjust-colors-options.ui
+%%DATADIR%%/ui/adjust-contrast-options.ui
+%%DATADIR%%/ui/browser-preferences.ui
 %%BRASERO%%%%DATADIR%%/ui/burn-disc-options.ui
 %%BRASERO%%%%DATADIR%%/ui/burn-source-selector.ui
 %%DATADIR%%/ui/catalog-properties.ui
@@ -339,20 +349,21 @@ share/applications/gthumb.desktop
 %%DATADIR%%/ui/contact-sheet.ui
 %%DATADIR%%/ui/convert-format.ui
 %%DATADIR%%/ui/crop-options.ui
+%%DATADIR%%/ui/curve-preset-editor.ui
+%%DATADIR%%/ui/curves-options.ui
 %%DATADIR%%/ui/edit-comment-page.ui
 %%EXIV2%%%%DATADIR%%/ui/edit-exiv2-page.ui
+%%DATADIR%%/ui/effects-options.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/export-to-facebook.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/export-to-flickr.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/export-to-photobucket.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/export-to-picasaweb.ui
 %%DATADIR%%/ui/extensions-preferences.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/facebook-album-properties.ui
-%%WEBSERVICES%%%%DATADIR%%/ui/facebook-export-completed.ui
 %%DATADIR%%/ui/filter-editor.ui
 %%DATADIR%%/ui/find-duplicates-choose-folders.ui
 %%DATADIR%%/ui/find-duplicates-dialog.ui
 %%DATADIR%%/ui/find-duplicates.ui
-%%WEBSERVICES%%%%DATADIR%%/ui/flicker-export-completed.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/flickr-ask-authorization-old.ui
 %%DATADIR%%/ui/grayscale-options.ui
 %%DATADIR%%/ui/histogram-info.ui
@@ -364,6 +375,7 @@ share/applications/gthumb.desktop
 %%DATADIR%%/ui/import-preferences.ui
 %%DATADIR%%/ui/jpeg-options.ui
 %%DATADIR%%/ui/location.ui
+%%GSTREAMER%%%%DATADIR%%/ui/media-viewer-preferences.ui
 %%GSTREAMER%%%%DATADIR%%/ui/mediabar.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/oauth-account-chooser.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/oauth-account-manager.ui
@@ -373,9 +385,7 @@ share/applications/gthumb.desktop
 %%DATADIR%%/ui/overwrite-dialog.ui
 %%DATADIR%%/ui/personalize-filters.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/photobucket-album-properties.ui
-%%WEBSERVICES%%%%DATADIR%%/ui/photobucket-export-completed.ui
 %%WEBSERVICES%%%%DATADIR%%/ui/picasa-web-album-properties.ui
-%%WEBSERVICES%%%%DATADIR%%/ui/picasa-web-export-completed.ui
 %%DATADIR%%/ui/png-options.ui
 %%DATADIR%%/ui/preferences.ui
 %%DATADIR%%/ui/print-layout.ui
@@ -891,6 +901,7 @@ 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
@@ -900,6 +911,7 @@ share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
 share/locale/az/LC_MESSAGES/gthumb.mo
 share/locale/bg/LC_MESSAGES/gthumb.mo
+share/locale/bs/LC_MESSAGES/gthumb.mo
 share/locale/ca/LC_MESSAGES/gthumb.mo
 share/locale/ca@valencia/LC_MESSAGES/gthumb.mo
 share/locale/cs/LC_MESSAGES/gthumb.mo