ports/184007: graphics/shotwell : upgrade to 0.15, enable staging

Christoph Moench-Tegeder cmt at burggraben.net
Fri Nov 15 19:40:01 UTC 2013 

>Number:         184007
>Category:       ports
>Synopsis:       graphics/shotwell : upgrade to 0.15, enable staging
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 15 19:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Moench-Tegeder
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD elch.exwg.net 9.2-RELEASE FreeBSD 9.2-RELEASE #11 r255911: Fri Sep 27 17:09:40 CEST 2013 cmt at elch.exwg.net:/usr/obj/usr/src/sys/ELCH amd64

	graphics/shotwell shotwell-0.14.1

>Description:
	Shotwell 0.15 is out.
	While at it, enable stageing support and convert to new LIB_DEPENDS.
>How-To-Repeat:
	http://www.yorba.org/projects/shotwell/install/
>Fix:
	Via HTTP: http://burggraben.net/tmp/shotwell.diff.gz

Index: Makefile
===================================================================
--- Makefile	(revision 333309)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.14.1
+PORTVERSION=	0.15.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.yorba.org/download/shotwell/${PORTVERSION:R}/
 
@@ -14,16 +14,16 @@
 BUILD_DEPENDS=	vala>=0.18.0:${PORTSDIR}/lang/vala \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		gee:${PORTSDIR}/devel/libgee06 \
-		json-glib-1.0:${PORTSDIR}/devel/json-glib \
-		soup-2.4:${PORTSDIR}/devel/libsoup \
-		gexiv2:${PORTSDIR}/graphics/gexiv2 \
-		exif:${PORTSDIR}/graphics/libexif \
-		gphoto2:${PORTSDIR}/graphics/libgphoto2 \
-		webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
-		raw:${PORTSDIR}/graphics/libraw \
-		rest:${PORTSDIR}/devel/librest
+		libgee.so:${PORTSDIR}/devel/libgee06 \
+		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
+		libexif.so:${PORTSDIR}/graphics/libexif \
+		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
+		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
+		libraw.so:${PORTSDIR}/graphics/libraw \
+		librest-0.7.so:${PORTSDIR}/devel/librest
 
 USE_XZ=		yes
 USES=		shebangfix gettext desktop-file-utils gmake pkgconfig
@@ -39,7 +39,6 @@
 
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
-NO_STAGE=	yes
 post-configure:
 	@${REINPLACE_CMD} -E \
 		-e 's|share/shotwell|${DATADIR_REL}|g' \
Index: distinfo
===================================================================
--- distinfo	(revision 333309)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef
-SIZE (shotwell-0.14.1.tar.xz) = 1624784
+SHA256 (shotwell-0.15.0.tar.xz) = ece985360c6b5b4fc090b513bc844f0f17754b236b86cf559f36a2d8a5298a1d
+SIZE (shotwell-0.15.0.tar.xz) = 1676992
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 333309)
+++ files/patch-Makefile	(working copy)
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-04-03 16:16:24.000000000 -0300
-+++ Makefile	2013-06-12 22:39:11.000000000 -0300
-@@ -300,7 +300,6 @@
+--- Makefile.orig	2013-11-09 18:33:15.000000000 +0100
++++ Makefile	2013-11-09 18:46:05.000000000 +0100
+@@ -315,7 +315,6 @@
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
@@ -8,15 +8,15 @@
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
-@@ -332,7 +331,6 @@
+@@ -347,7 +346,6 @@
  	gstreamer-plugins-base-1.0 >= 1.0.0 \
  	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.0.11 \
+ 	gtk+-3.0 >= 3.6.0 \
 -	gudev-1.0 >= 145 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -453,6 +451,9 @@
+@@ -461,6 +459,9 @@
  # Required for gudev-1.0
  CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
  
@@ -23,10 +23,10 @@
 +# do not forget about libintl
 +LDFLAGS += -lintl
 +
- define check_valadate_version
- 	@ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater.  You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 )
- endef
-@@ -570,8 +571,8 @@
+ all: pkgcheck valacheck desktop
+ 
+ ifdef ENABLE_BUILD_FOR_GLADE
+@@ -591,8 +592,8 @@
  	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
  endif
  ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
Index: files/patch-src-camera-CameraTable.vala
===================================================================
--- files/patch-src-camera-CameraTable.vala	(revision 333309)
+++ files/patch-src-camera-CameraTable.vala	(working copy)
@@ -1,5 +1,5 @@
---- ./src/camera/CameraTable.vala.orig	2013-04-20 21:27:30.000000000 +0200
-+++ ./src/camera/CameraTable.vala	2013-04-20 21:31:02.000000000 +0200
+--- src/camera/CameraTable.vala.orig	2013-11-09 18:20:35.000000000 +0100
++++ src/camera/CameraTable.vala	2013-11-09 18:24:57.000000000 +0100
 @@ -26,7 +26,6 @@
      
      private static CameraTable instance = null;
@@ -8,7 +8,7 @@
      private OneShotScheduler camera_update_scheduler = null;
      private GPhoto.Context null_context = new GPhoto.Context();
      private GPhoto.CameraAbilitiesList abilities_list;
-@@ -44,7 +43,6 @@
+@@ -43,7 +42,6 @@
              on_update_cameras);
          
          // listen for interesting events on the specified subsystems
@@ -16,11 +16,10 @@
          volume_monitor = VolumeMonitor.get();
          volume_monitor.volume_changed.connect(on_volume_changed);
          volume_monitor.volume_added.connect(on_volume_changed);
-@@ -111,32 +109,7 @@
-     
+@@ -111,31 +109,7 @@
      private string[] get_all_usb_cameras() {
          string[] cameras = new string[0];
--        
+         
 -        GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
 -        foreach (GUdev.Device device in device_list) {
 -            string device_file = device.get_device_file();
@@ -46,11 +45,11 @@
 -            }
 -        }
 -        
-+		// this would require udev, so we'll just return an empty array
++        // this would require udev, so we'll just return an empty array
          return cameras;
      }
      
-@@ -213,23 +186,7 @@
+@@ -212,23 +186,7 @@
              "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
      }
      
@@ -71,11 +70,11 @@
 -        }
 -        return null;
 -    }
-+	// get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)
++    // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)
  
      private void update_camera_table() throws GPhotoError {
          // need to do this because virtual ports come and go in the USB world (and probably others)
-@@ -336,22 +293,7 @@
+@@ -334,22 +292,7 @@
              }
              
              // Get display name for camera.
@@ -95,11 +94,11 @@
 -                    display_name = device.get_property("ID_MODEL");
 -                }
 -            }
-+			// we use a default name, as everything else requires udev
++            // we use a default name, as everything else requires udev
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -396,13 +338,7 @@
+@@ -394,13 +337,7 @@
          }
      }
      
@@ -110,7 +109,7 @@
 -        // update to occur when they come in all at once
 -        camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
 -    }
-+	// on_udev_event() removed as "udev related"
++    // on_udev_event() removed as "udev related"
      
      public void on_volume_changed(Volume volume) {
          camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 333309)
+++ pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 bin/shotwell
-bin/shotwell-video-thumbnailer
 lib/shotwell/plugins/builtin/f-spot-24.png
 lib/shotwell/plugins/builtin/facebook.png
 lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
@@ -7,8 +6,6 @@
 lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
 lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/picasa.png
-lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade
-lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade
 lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/piwigo.png
 lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
@@ -23,6 +20,8 @@
 lib/shotwell/plugins/builtin/youtube.png
 lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade
 libexec/shotwell/shotwell-settings-migrator
+libexec/shotwell/shotwell-video-thumbnailer
+share/appdata/shotwell.appdata.xml
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
 share/gnome/help/shotwell/C/edit-adjustments.page
@@ -72,6 +71,7 @@
 share/icons/hicolor/24x24/apps/shotwell.svg
 share/icons/hicolor/scalable/apps/shotwell.svg
 share/locale/af/LC_MESSAGES/shotwell.mo
+share/locale/af_ZA/LC_MESSAGES/shotwell.mo
 share/locale/ar/LC_MESSAGES/shotwell-extras.mo
 share/locale/ar/LC_MESSAGES/shotwell.mo
 share/locale/as/LC_MESSAGES/shotwell-extras.mo
@@ -82,6 +82,8 @@
 share/locale/bg/LC_MESSAGES/shotwell.mo
 share/locale/bn/LC_MESSAGES/shotwell-extras.mo
 share/locale/bn/LC_MESSAGES/shotwell.mo
+share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo
+share/locale/bn_IN/LC_MESSAGES/shotwell.mo
 share/locale/ca/LC_MESSAGES/shotwell-extras.mo
 share/locale/ca/LC_MESSAGES/shotwell.mo
 share/locale/cs/LC_MESSAGES/shotwell-extras.mo
@@ -107,6 +109,7 @@
 share/locale/fr/LC_MESSAGES/shotwell.mo
 share/locale/gl/LC_MESSAGES/shotwell-extras.mo
 share/locale/gl/LC_MESSAGES/shotwell.mo
+share/locale/gu/LC_MESSAGES/shotwell-extras.mo
 share/locale/gu/LC_MESSAGES/shotwell.mo
 share/locale/he/LC_MESSAGES/shotwell-extras.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
@@ -119,6 +122,8 @@
 share/locale/ia/LC_MESSAGES/shotwell.mo
 share/locale/id/LC_MESSAGES/shotwell-extras.mo
 share/locale/id/LC_MESSAGES/shotwell.mo
+share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo
+share/locale/id_ID/LC_MESSAGES/shotwell.mo
 share/locale/it/LC_MESSAGES/shotwell-extras.mo
 share/locale/it/LC_MESSAGES/shotwell.mo
 share/locale/ja/LC_MESSAGES/shotwell-extras.mo
@@ -130,6 +135,7 @@
 share/locale/kn/LC_MESSAGES/shotwell.mo
 share/locale/ko/LC_MESSAGES/shotwell-extras.mo
 share/locale/ko/LC_MESSAGES/shotwell.mo
+share/locale/ky/LC_MESSAGES/shotwell.mo
 share/locale/lt/LC_MESSAGES/shotwell-extras.mo
 share/locale/lt/LC_MESSAGES/shotwell.mo
 share/locale/lv/LC_MESSAGES/shotwell-extras.mo
@@ -144,6 +150,8 @@
 share/locale/nb/LC_MESSAGES/shotwell.mo
 share/locale/nl/LC_MESSAGES/shotwell-extras.mo
 share/locale/nl/LC_MESSAGES/shotwell.mo
+share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo
+share/locale/nn_NO/LC_MESSAGES/shotwell.mo
 share/locale/or/LC_MESSAGES/shotwell-extras.mo
 share/locale/or/LC_MESSAGES/shotwell.mo
 share/locale/pa/LC_MESSAGES/shotwell-extras.mo
@@ -168,14 +176,19 @@
 share/locale/sv/LC_MESSAGES/shotwell.mo
 share/locale/ta/LC_MESSAGES/shotwell-extras.mo
 share/locale/ta/LC_MESSAGES/shotwell.mo
+share/locale/ta_IN/LC_MESSAGES/shotwell.mo
 share/locale/te/LC_MESSAGES/shotwell-extras.mo
 share/locale/te/LC_MESSAGES/shotwell.mo
+share/locale/te_IN/LC_MESSAGES/shotwell.mo
 share/locale/th/LC_MESSAGES/shotwell-extras.mo
 share/locale/th/LC_MESSAGES/shotwell.mo
 share/locale/tr/LC_MESSAGES/shotwell-extras.mo
 share/locale/tr/LC_MESSAGES/shotwell.mo
+share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo
+share/locale/tr_TR/LC_MESSAGES/shotwell.mo
 share/locale/uk/LC_MESSAGES/shotwell-extras.mo
 share/locale/uk/LC_MESSAGES/shotwell.mo
+share/locale/vi/LC_MESSAGES/shotwell-extras.mo
 share/locale/vi/LC_MESSAGES/shotwell.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
@@ -205,6 +218,7 @@
 %%DATADIR%%/icons/merge.svg
 %%DATADIR%%/icons/multiple-events.png
 %%DATADIR%%/icons/multiple-tags.png
+%%DATADIR%%/icons/no-event.png
 %%DATADIR%%/icons/noninterpretable-video.png
 %%DATADIR%%/icons/one-event.png
 %%DATADIR%%/icons/one-star-filter-plus.svg
@@ -255,20 +269,138 @@
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+ at dirrmtry share/locale/zh_TW/LC_MESSAGES
+ at dirrmtry share/locale/zh_TW
+ at dirrmtry share/locale/zh_CN/LC_MESSAGES
+ at dirrmtry share/locale/zh_CN
+ at dirrmtry share/locale/vi/LC_MESSAGES
+ at dirrmtry share/locale/vi
+ at dirrmtry share/locale/uk/LC_MESSAGES
+ at dirrmtry share/locale/uk
+ at dirrmtry share/locale/tr_TR/LC_MESSAGES
+ at dirrmtry share/locale/tr_TR
+ at dirrmtry share/locale/tr/LC_MESSAGES
+ at dirrmtry share/locale/tr
+ at dirrmtry share/locale/th/LC_MESSAGES
+ at dirrmtry share/locale/th
+ at dirrmtry share/locale/te_IN/LC_MESSAGES
+ at dirrmtry share/locale/te_IN
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+ at dirrmtry share/locale/ta_IN/LC_MESSAGES
+ at dirrmtry share/locale/ta_IN
+ at dirrmtry share/locale/ta/LC_MESSAGES
+ at dirrmtry share/locale/ta
+ at dirrmtry share/locale/sv/LC_MESSAGES
+ at dirrmtry share/locale/sv
+ at dirrmtry share/locale/sr/LC_MESSAGES
+ at dirrmtry share/locale/sr
+ at dirrmtry share/locale/sl/LC_MESSAGES
+ at dirrmtry share/locale/sl
+ at dirrmtry share/locale/sk/LC_MESSAGES
+ at dirrmtry share/locale/sk
+ at dirrmtry share/locale/ru/LC_MESSAGES
+ at dirrmtry share/locale/ru
+ at dirrmtry share/locale/ro/LC_MESSAGES
+ at dirrmtry share/locale/ro
+ at dirrmtry share/locale/pt_BR/LC_MESSAGES
+ at dirrmtry share/locale/pt_BR
+ at dirrmtry share/locale/pt/LC_MESSAGES
+ at dirrmtry share/locale/pt
+ at dirrmtry share/locale/pl/LC_MESSAGES
+ at dirrmtry share/locale/pl
+ at dirrmtry share/locale/pa/LC_MESSAGES
+ at dirrmtry share/locale/pa
+ at dirrmtry share/locale/or/LC_MESSAGES
+ at dirrmtry share/locale/or
+ at dirrmtry share/locale/nn_NO/LC_MESSAGES
+ at dirrmtry share/locale/nn_NO
+ at dirrmtry share/locale/nl/LC_MESSAGES
+ at dirrmtry share/locale/nl
+ at dirrmtry share/locale/nb/LC_MESSAGES
+ at dirrmtry share/locale/nb
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+ at dirrmtry share/locale/ml/LC_MESSAGES
+ at dirrmtry share/locale/ml
+ at dirrmtry share/locale/mk/LC_MESSAGES
+ at dirrmtry share/locale/mk
+ at dirrmtry share/locale/lv/LC_MESSAGES
+ at dirrmtry share/locale/lv
+ at dirrmtry share/locale/lt/LC_MESSAGES
+ at dirrmtry share/locale/lt
+ at dirrmtry share/locale/ky/LC_MESSAGES
+ at dirrmtry share/locale/ky
+ at dirrmtry share/locale/ko/LC_MESSAGES
+ at dirrmtry share/locale/ko
+ at dirrmtry share/locale/kn/LC_MESSAGES
+ at dirrmtry share/locale/kn
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
+ at dirrmtry share/locale/ja/LC_MESSAGES
+ at dirrmtry share/locale/ja
+ at dirrmtry share/locale/it/LC_MESSAGES
+ at dirrmtry share/locale/it
+ at dirrmtry share/locale/id_ID/LC_MESSAGES
+ at dirrmtry share/locale/id_ID
+ at dirrmtry share/locale/id/LC_MESSAGES
+ at dirrmtry share/locale/id
 @dirrmtry share/locale/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
+ at dirrmtry share/locale/hu/LC_MESSAGES
+ at dirrmtry share/locale/hu
+ at dirrmtry share/locale/hr/LC_MESSAGES
+ at dirrmtry share/locale/hr
+ at dirrmtry share/locale/hi/LC_MESSAGES
+ at dirrmtry share/locale/hi
+ at dirrmtry share/locale/he/LC_MESSAGES
+ at dirrmtry share/locale/he
+ at dirrmtry share/locale/gu/LC_MESSAGES
+ at dirrmtry share/locale/gu
+ at dirrmtry share/locale/gl/LC_MESSAGES
+ at dirrmtry share/locale/gl
+ at dirrmtry share/locale/fr/LC_MESSAGES
+ at dirrmtry share/locale/fr
+ at dirrmtry share/locale/fi/LC_MESSAGES
+ at dirrmtry share/locale/fi
+ at dirrmtry share/locale/eu/LC_MESSAGES
+ at dirrmtry share/locale/eu
+ at dirrmtry share/locale/et/LC_MESSAGES
+ at dirrmtry share/locale/et
+ at dirrmtry share/locale/es/LC_MESSAGES
+ at dirrmtry share/locale/es
+ at dirrmtry share/locale/eo/LC_MESSAGES
+ at dirrmtry share/locale/eo
+ at dirrmtry share/locale/en_GB/LC_MESSAGES
+ at dirrmtry share/locale/en_GB
+ at dirrmtry share/locale/el/LC_MESSAGES
+ at dirrmtry share/locale/el
+ at dirrmtry share/locale/de/LC_MESSAGES
+ at dirrmtry share/locale/de
+ at dirrmtry share/locale/da/LC_MESSAGES
+ at dirrmtry share/locale/da
+ at dirrmtry share/locale/cs/LC_MESSAGES
+ at dirrmtry share/locale/cs
+ at dirrmtry share/locale/ca/LC_MESSAGES
+ at dirrmtry share/locale/ca
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/bn/LC_MESSAGES
+ at dirrmtry share/locale/bn
+ at dirrmtry share/locale/bg/LC_MESSAGES
+ at dirrmtry share/locale/bg
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+ at dirrmtry share/locale/ar/LC_MESSAGES
+ at dirrmtry share/locale/ar
+ at dirrmtry share/locale/af_ZA/LC_MESSAGES
+ at dirrmtry share/locale/af_ZA
+ at dirrmtry share/locale/af/LC_MESSAGES
+ at dirrmtry share/locale/af
 @dirrm share/gnome/help/shotwell/C/figures
 @dirrm share/gnome/help/shotwell/C
 @dirrm share/gnome/help/shotwell

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list