Update to shotwell-0.9.1.

input from and ok landry@ (maintainer)

graphics/shotwell/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2011/01/17 13:05:21 landry Exp $
+# $OpenBSD: Makefile,v 1.5 2011/04/05 18:43:43 ajacoutot Exp $
 
 COMMENT =	digital photo organizer
 
-DISTNAME =	shotwell-0.8.1
+DISTNAME =	shotwell-0.9.1
 CATEGORIES =	graphics
-MASTER_SITES =	http://yorba.org/download/shotwell/0.8/
+MASTER_SITES =	http://yorba.org/download/shotwell/0.9/
 HOMEPAGE =	http://yorba.org/shotwell/
 EXTRACT_SUFX =	.tar.bz2
 
@@ -18,8 +18,8 @@ WANTLIB =	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
 		Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
 		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m \
 		pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
-		pthread-stubs xcb z ORBit-2 dbus-1 dbus-glib-1 exif \
-		gconf-2 gnutls gthread-2.0 pthread soup-2.4 sqlite3 usb \
+		pthread-stubs xcb z ORBit-2 exif json-glib-1.0 gnomevfs-2 \
+		gconf-2 gthread-2.0 pthread soup-2.4 sqlite3 usb \
 		xcb-render xml2 exiv2 stdc++ gee gphoto2 gstbase-0.10 gstreamer-0.10 \
 		gphoto2_port unique-1.0 webkit-1.0 raw gexiv2 gdk-x11-2.0 \
 		gdk_pixbuf-2.0 gtk-x11-2.0 GL Xxf86vm drm xcb-shm
@@ -31,7 +31,7 @@ DESKTOP_FILES =		yes
 
 RUN_DEPENDS +=	x11/gnome/librsvg
 
-BUILD_DEPENDS =	lang/vala>=0.10
+BUILD_DEPENDS =	lang/vala>=0.12
 
 LIB_DEPENDS =	x11/gtk+2 \
 		graphics/libgexiv2 \
@@ -40,7 +40,8 @@ LIB_DEPENDS =	x11/gtk+2 \
 		www/webkit \
 		devel/libunique \
 		devel/libgee \
-		graphics/libgphoto2
+		graphics/libgphoto2 \
+		x11/gnome/vfs2
 
 NO_REGRESS =	Yes
 # beware : configure is an horrible homemade shell script
@@ -51,4 +52,8 @@ CONFIGURE_ARGS =	--disable-schemas-install \
 
 MODGCONF2_SCHEMAS_DIR =	shotwell
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/Makefile \
+		${WRKSRC}/plugins/Makefile.plugin.mk
+
 .include <bsd.port.mk>

graphics/shotwell/distinfo

@@ -1,5 +1,5 @@
-MD5 (shotwell-0.8.1.tar.bz2) = N4Foc1AG3+BzNDHdR/hwxA==
-RMD160 (shotwell-0.8.1.tar.bz2) = VvGtkGpCrGrpRaPL11oddpRSxxg=
-SHA1 (shotwell-0.8.1.tar.bz2) = smsiLjWhbSzL6VkIU9ZvLpnpyfY=
-SHA256 (shotwell-0.8.1.tar.bz2) = lAM0IwCumHq4a+NCunfXXImqo+0N1K+x/vUFvef7Xvw=
-SIZE (shotwell-0.8.1.tar.bz2) = 1317586
+MD5 (shotwell-0.9.1.tar.bz2) = GpjR2llCSmezEMw56K0zaA==
+RMD160 (shotwell-0.9.1.tar.bz2) = gBoXFCRrUddtDEMueqaxg4ED0ME=
+SHA1 (shotwell-0.9.1.tar.bz2) = 49G04XU1IYSixG2gj3ps5Tk5tTQ=
+SHA256 (shotwell-0.9.1.tar.bz2) = z7PnzihecEGjTalTbEz885H82qEHTx3Jkepmm+SqIz4=
+SIZE (shotwell-0.9.1.tar.bz2) = 1456462

graphics/shotwell/patches/patch-Makefile

@@ -1,42 +1,71 @@
-$OpenBSD: patch-Makefile,v 1.2 2011/01/17 13:05:21 landry Exp $
+$OpenBSD: patch-Makefile,v 1.3 2011/04/05 18:43:43 ajacoutot Exp $
 remove gudev requirements
 add gmodule to fix http://trac.yorba.org/ticket/2726
---- Makefile.orig	Tue Jan 11 00:13:03 2011
-+++ Makefile	Mon Jan 17 00:52:50 2011
-@@ -280,7 +280,6 @@ EXT_PKGS = \
+--- Makefile.orig	Tue Apr  5 02:35:38 2011
++++ Makefile	Tue Apr  5 13:30:06 2011
+@@ -18,7 +18,7 @@ LIB=lib
+
+ -include configure.mk
+
+-VALAFLAGS := -g --enable-checking --thread --fatal-warnings $(USER_VALAFLAGS)
++VALAFLAGS := -g --enable-checking --thread --fatal-warnings -X -I${LOCALBASE}/include $(USER_VALAFLAGS)
+ DEFINES := _PREFIX='"$(PREFIX)"' _VERSION='"$(VERSION)"' GETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
+ 	_LANG_SUPPORT_DIR='"$(SYSTEM_LANG_DIR)"' _LIBDIR='"${LIB}"'
+
+@@ -261,7 +261,6 @@ EXT_PKGS = \
+ 	gstreamer-0.10 \
  	gstreamer-base-0.10 \
  	gtk+-2.0 \
- 	glib-2.0 \
 -	gudev-1.0 \
- 	json-glib-1.0 \
  	libexif \
  	libgphoto2 \
-@@ -306,7 +305,6 @@ EXT_PKG_VERSIONS = \
- 	glib-2.0 >= 2.24.0 \
+ 	libsoup-2.4 \
+@@ -288,7 +287,6 @@ EXT_PKG_VERSIONS = \
  	gstreamer-0.10 >= 0.10.28 \
  	gstreamer-base-0.10 >= 0.10.28 \
+ 	gtk+-2.0 >= 2.18.0 \
 -	gudev-1.0 >= 145 \
- 	json-glib-1.0 >= 0.7.6 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
-@@ -504,7 +502,6 @@ endif
-
- $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
- 	$(CONFIG_IN)
--	@ ./minver `$(VALAC) --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  You are running' `$(VALAC) --version` '\b.'; exit 1 )
- ifndef ASSUME_PKGS
- ifdef EXT_PKG_VERSIONS
- 	@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)'
-@@ -512,7 +509,7 @@ else ifdef EXT_PKGS
+ 	libsoup-2.4 >= 2.26.0 \
+@@ -395,7 +393,6 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
+ LIBRAW_CONFIG=./libraw-config
+
+ define check_valac_version
+-	@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 )
+ 	$(if $(MAX_VALAC_VERSION),\
+ 		@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
+ endef
+@@ -568,15 +565,15 @@ ifdef INSTALL_HEADERS
+ endif
+
+ $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
+-	m4 '--define=_VERSION_=$(VERSION)' '--define=_PREFIX_=$(PREFIX)' '--define=_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \
+-		'--define=_LIB_=$(LIB)' $< > $@
++	m4 '-D_VERSION_=$(VERSION)' '-D_PREFIX_=$(PREFIX)' '-D_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \
++		'-D_LIB_=$(LIB)' $< > $@
+
+ $(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4
+ 	@mkdir -p $(UNITIZE_DIR)
+ 	@$(foreach group,$(APP_GROUPS),\
+-		`m4 '--define=_APP_GROUP_=$(group)' '--define=_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '--define=_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`)
++		`m4 '-D_APP_GROUP_=$(group)' '-D_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '-D_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`)
+ 	@$(foreach nm,$(UNIT_NAMESPACES),\
+-		`m4 '--define=_UNIT_NAME_=$(nm)' '--define=_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '--define=_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`)
++		`m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`)
+ 	@touch $@
+
+ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP)
+@@ -592,7 +589,7 @@ else ifdef EXT_PKGS
  	@pkg-config --print-errors --exists $(EXT_PKGS) $(DIRECT_LIBS_VERSIONS)
  endif
  # Check for libraw manually
 -	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
 +	@pkg-config --exists raw
  endif
  	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
- 	mkdir -p $(BUILD_DIR)
-@@ -530,13 +527,13 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+ 	@echo Compiling Vala code...
+@@ -611,10 +608,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
  	@
 
  $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
@@ -47,6 +76,9 @@ add gmodule to fix http://trac.yorba.org/ticket/2726
 -	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
 +	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -o $@
 
+ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR)
+ 	@
+@@ -639,5 +636,5 @@ docs:
  glade: lib$(PROGRAM).so
 
  lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)

graphics/shotwell/patches/patch-configure

@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
---- configure.orig	Thu Aug 26 22:42:39 2010
-+++ configure	Mon Sep  6 21:50:43 2010
+$OpenBSD: patch-configure,v 1.2 2011/04/05 18:43:43 ajacoutot Exp $
+--- configure.orig	Mon Apr  4 19:54:30 2011
++++ configure	Tue Apr  5 10:23:08 2011
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
  #
- # Copyright 2009 Yorba Foundation
+ # Copyright 2009-2011 Yorba Foundation
  #

graphics/shotwell/patches/patch-plugins_Makefile_plugin_mk

@@ -0,0 +1,21 @@
+$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.1 2011/04/05 18:43:43 ajacoutot Exp $
+--- plugins/Makefile.plugin.mk.orig	Mon Apr  4 19:54:27 2011
++++ plugins/Makefile.plugin.mk	Tue Apr  5 11:13:32 2011
+@@ -32,7 +32,7 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
+ CFILES := $(notdir $(SRC_FILES:.vala=.c))
+ OFILES := $(notdir $(SRC_FILES:.vala=.o))
+
+-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
++CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -I${LOCALBASE}/include -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
+ LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS)
+ DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
+
+@@ -41,7 +41,7 @@ all: $(PLUGIN).so
+ .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
+ 	$(VALAC) -g --enable-checking --fatal-warnings --save-temps --compile \
+ 		--vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) \
+-		-X -I../.. -X -fPIC \
++		-X -I${LOCALBASE}/include -X -I../.. -X -fPIC \
+ 		$(foreach dfn,$(DEFINES),-X $(dfn)) \
+ 		$(USER_VALAFLAGS) \
+ 		$(SRC_FILES)

graphics/shotwell/patches/patch-src_CameraTable_vala

@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_CameraTable_vala,v 1.2 2011/01/17 13:05:21 landry Exp $
+$OpenBSD: patch-src_CameraTable_vala,v 1.3 2011/04/05 18:43:43 ajacoutot Exp $
 We don't have gudev.. won't be able to detect cameras
---- src/CameraTable.vala.orig	Tue Jan 11 00:13:03 2011
-+++ src/CameraTable.vala	Mon Jan 17 00:54:28 2011
-@@ -24,7 +24,6 @@ public class CameraTable {
+--- src/CameraTable.vala.orig	Mon Apr  4 19:54:29 2011
++++ src/CameraTable.vala	Tue Apr  5 11:47:42 2011
+@@ -26,7 +26,6 @@ public class CameraTable {
 
      private static CameraTable instance = null;
 
 -    private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
      private OneShotScheduler camera_update_scheduler = null;
      private GPhoto.Context null_context = new GPhoto.Context();
      private GPhoto.CameraAbilitiesList abilities_list;
-@@ -41,8 +40,6 @@ public class CameraTable {
+@@ -43,8 +42,6 @@ public class CameraTable {
          camera_update_scheduler = new OneShotScheduler("CameraTable update scheduler",
              on_update_cameras);
 
@@ -19,7 +19,7 @@ We don't have gudev.. won't be able to detect cameras
          volume_monitor = VolumeMonitor.get();
          volume_monitor.volume_changed.connect(on_volume_changed);
          volume_monitor.volume_added.connect(on_volume_changed);
-@@ -103,31 +100,6 @@ public class CameraTable {
+@@ -105,31 +102,6 @@ public class CameraTable {
      private string[] get_all_usb_cameras() {
          string[] cameras = new string[0];
 
@@ -51,16 +51,44 @@ We don't have gudev.. won't be able to detect cameras
          return cameras;
      }
 
-@@ -300,20 +272,6 @@ public class CameraTable {
+@@ -204,24 +176,6 @@ public class CameraTable {
+             "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
+     }
+
+-    private string? get_name_for_uuid(string uuid) {
+-        foreach (Volume volume in volume_monitor.get_volumes()) {
+-            if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
+-                return volume.get_name();
+-            }
+-        }
+-        return null;
+-    }
+-    
+-    private GLib.Icon? get_icon_for_uuid(string uuid) {
+-        foreach (Volume volume in volume_monitor.get_volumes()) {
+-            if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
+-                return volume.get_icon();
+-            }
+-        }
+-        return null;
+-    }
+-
+     private void update_camera_table() throws GPhotoError {
+         // need to do this because virtual ports come and go in the USB world (and probably others)
+         GPhoto.PortInfoList port_info_list;
+@@ -311,23 +265,6 @@ public class CameraTable {
+                 continue;
              }
 
-             // Get display name for camera.
+-            // Get display name for camera.
 -            string path = get_port_path(port);
 -            if (null != path) {
 -                GUdev.Device device = client.query_by_device_file(path);
 -                string serial = device.get_property("ID_SERIAL_SHORT");
 -                if (null != serial) {
+-                    // Try to get the name and icon.
 -                    display_name = get_name_for_uuid(serial);
+-                    icon = get_icon_for_uuid(serial);
 -                }
 -                if (null == display_name) {
 -                    display_name = device.get_sysfs_attr("product");
@@ -72,7 +100,7 @@ We don't have gudev.. won't be able to detect cameras
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -351,13 +309,6 @@ public class CameraTable {
+@@ -365,13 +302,6 @@ public class CameraTable {
          }
      }
 

graphics/shotwell/pkg/PFRAG.shared

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2011/04/05 18:43:43 ajacoutot Exp $
+lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
+lib/shotwell/plugins/builtin/shotwell-publishing.so
+lib/shotwell/plugins/builtin/shotwell-transitions.so