svn commit: r408220 - in head/graphics/shotwell: . files

Fri Feb 5 16:35:00 UTC 2016

Author: kwm
Date: Fri Feb  5 16:34:59 2016
New Revision: 408220
URL: https://svnweb.freebsd.org/changeset/ports/408220

Log:
  Update shotwell to a git snapshot.
  
  Update to a snapshot, to fix ssl cert validation. Sadly it doesn't
  look upstream shotwell is still active so we need to update to a
  snapshot. Also to fix this, they had to port it to webkit2gtk3.
  
  PR:		206807
  Approved by:	ports-secteam (feld)
  MFH:		2016Q1

Modified:
  head/graphics/shotwell/Makefile
  head/graphics/shotwell/distinfo
  head/graphics/shotwell/files/patch-Makefile
  head/graphics/shotwell/pkg-plist

Modified: head/graphics/shotwell/Makefile
==============================================================================

--- head/graphics/shotwell/Makefile	Fri Feb  5 16:32:09 2016	(r408219)
+++ head/graphics/shotwell/Makefile	Fri Feb  5 16:34:59 2016	(r408220)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.22.0
-PORTREVISION=	2
+PORTVERSION=	0.22.0.99
 CATEGORIES=	graphics gnome
-MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
+#MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
+MASTER_SITES=	http://rainbow-runner.nl/freebsd/
 
 MAINTAINER=	cmt at burggraben.net
 COMMENT=	Open source photo manager for GNOME
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
 		libexif.so:${PORTSDIR}/graphics/libexif \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
+		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
 		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
 		libraw.so:${PORTSDIR}/graphics/libraw \
 		librest-0.7.so:${PORTSDIR}/devel/librest

Modified: head/graphics/shotwell/distinfo
==============================================================================
--- head/graphics/shotwell/distinfo	Fri Feb  5 16:32:09 2016	(r408219)
+++ head/graphics/shotwell/distinfo	Fri Feb  5 16:34:59 2016	(r408220)
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.22.0.tar.xz) = 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831
-SIZE (shotwell-0.22.0.tar.xz) = 1872952
+SHA256 (shotwell-0.22.0.99.tar.xz) = 598840f4d9cdf2aea40f293095e0078328a1990fb83b1730d6263cf19605cf80
+SIZE (shotwell-0.22.0.99.tar.xz) = 1888016

Modified: head/graphics/shotwell/files/patch-Makefile
==============================================================================
--- head/graphics/shotwell/files/patch-Makefile	Fri Feb  5 16:32:09 2016	(r408219)
+++ head/graphics/shotwell/files/patch-Makefile	Fri Feb  5 16:34:59 2016	(r408220)
@@ -1,15 +1,15 @@
---- Makefile.orig	2015-03-24 01:38:31.000000000 +0100
-+++ Makefile	2015-04-14 13:06:36.396704000 +0200
+--- Makefile.orig	2016-01-29 16:01:18.000000000 +0100
++++ Makefile	2016-01-29 16:05:58.158292000 +0100
 @@ -13,7 +13,7 @@
  VALAC := $(shell which $(VALAC))
  endif
  
 -VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
 +VALAC_VERSION := `$(VALAC) --version | cut -d' ' -f2`
- MIN_VALAC_VERSION := 0.20.1
+ MIN_VALAC_VERSION := 0.28.0
  INSTALL_PROGRAM := install
  INSTALL_DATA := install -m 644
-@@ -263,7 +263,6 @@
+@@ -261,7 +261,6 @@
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
@@ -17,7 +17,7 @@
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
-@@ -295,7 +294,6 @@
+@@ -293,7 +292,6 @@
  	gstreamer-plugins-base-1.0 >= 1.0.0 \
  	gstreamer-pbutils-1.0 >= 1.0.0 \
  	gtk+-3.0 >= 3.12.2 \
@@ -25,7 +25,7 @@
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -541,11 +539,11 @@
+@@ -539,11 +537,11 @@
  	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
  	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
  ifndef DISABLE_SCHEMAS_COMPILE

Modified: head/graphics/shotwell/pkg-plist
==============================================================================
--- head/graphics/shotwell/pkg-plist	Fri Feb  5 16:32:09 2016	(r408219)
+++ head/graphics/shotwell/pkg-plist	Fri Feb  5 16:34:59 2016	(r408220)
@@ -266,6 +266,44 @@ share/gnome/help/shotwell/hu/share-uploa
 share/gnome/help/shotwell/hu/view-displaying.page
 share/gnome/help/shotwell/hu/view-information.page
 share/gnome/help/shotwell/hu/view-sidebar.page
+share/gnome/help/shotwell/sv/edit-adjustments.page
+share/gnome/help/shotwell/sv/edit-crop.page
+share/gnome/help/shotwell/sv/edit-enhance.page
+share/gnome/help/shotwell/sv/edit-external.page
+share/gnome/help/shotwell/sv/edit-nondestructive.page
+share/gnome/help/shotwell/sv/edit-redeye.page
+share/gnome/help/shotwell/sv/edit-rotate.page
+share/gnome/help/shotwell/sv/edit-straighten.page
+share/gnome/help/shotwell/sv/edit-time-date.page
+share/gnome/help/shotwell/sv/edit-undo.page
+share/gnome/help/shotwell/sv/formats.page
+share/gnome/help/shotwell/sv/import-camera.page
+share/gnome/help/shotwell/sv/import-f-spot.page
+share/gnome/help/shotwell/sv/import-file.page
+share/gnome/help/shotwell/sv/import-memorycard.page
+share/gnome/help/shotwell/sv/index.page
+share/gnome/help/shotwell/sv/organize-event.page
+share/gnome/help/shotwell/sv/organize-flag.page
+share/gnome/help/shotwell/sv/organize-rating.page
+share/gnome/help/shotwell/sv/organize-remove.page
+share/gnome/help/shotwell/sv/organize-search.page
+share/gnome/help/shotwell/sv/organize-tag.page
+share/gnome/help/shotwell/sv/organize-title.page
+share/gnome/help/shotwell/sv/other-files.page
+share/gnome/help/shotwell/sv/other-missing.page
+share/gnome/help/shotwell/sv/other-multiple.page
+share/gnome/help/shotwell/sv/other-plugins.page
+share/gnome/help/shotwell/sv/raw.page
+share/gnome/help/shotwell/sv/running.page
+share/gnome/help/shotwell/sv/share-background.page
+share/gnome/help/shotwell/sv/share-export.page
+share/gnome/help/shotwell/sv/share-print.page
+share/gnome/help/shotwell/sv/share-send.page
+share/gnome/help/shotwell/sv/share-slideshow.page
+share/gnome/help/shotwell/sv/share-upload.page
+share/gnome/help/shotwell/sv/view-displaying.page
+share/gnome/help/shotwell/sv/view-information.page
+share/gnome/help/shotwell/sv/view-sidebar.page
 share/icons/hicolor/16x16/apps/shotwell.svg
 share/icons/hicolor/24x24/apps/shotwell.svg
 share/icons/hicolor/scalable/apps/shotwell.svg
