Merge from vendor branch FIX_VENDOR:

Import shotwell 0.7.2 : Shotwell is a digital photo organizer. It allows you to import photos from disk or camera, organize them in various ways, view them in full-window or fullscreen mode, and export them to share with others. ok ajacoutot@
avsm · Oct 28, 2010 · ac58df5 · ac58df5
2 parents 8b59b16 + eb2360d
commit ac58df5
Show file tree

Hide file tree

Showing 7 changed files with 389 additions and 0 deletions.
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
@@ -0,0 +1,53 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
+
+COMMENT =	digital photo organizer
+
+DISTNAME =	shotwell-0.7.2
+CATEGORIES =	graphics
+MASTER_SITES =	http://yorba.org/download/shotwell/0.7/
+HOMEPAGE =	http://yorba.org/shotwell/
+EXTRACT_SUFX =	.tar.bz2
+
+# LGPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+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 \
+		xcb-render xml2 exiv2 stdc++ gee gphoto2 \
+		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
+
+MODULES =	devel/gettext x11/gnome devel/gconf2
+
+MODGNOME_HELP_FILES =	Yes
+DESKTOP_FILES =		yes
+
+RUN_DEPENDS +=	::x11/gnome/librsvg
+
+BUILD_DEPENDS =	:vala->=0.10:lang/vala
+
+LIB_DEPENDS =	::x11/gtk+2 \
+		::graphics/libgexiv2 \
+		::graphics/libraw \
+		::www/webkit \
+		::devel/libunique \
+		::devel/libgee \
+		::graphics/libgphoto2
+
+NO_REGRESS =	Yes
+# beware : configure is an horrible homemade shell script
+CONFIGURE_STYLE =	simple
+CONFIGURE_ARGS =	--disable-schemas-install \
+			--disable-desktop-update \
+			--disable-icon-update
+
+MODGCONF2_SCHEMAS_DIR =	shotwell
+
+.include <bsd.port.mk>
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
@@ -0,0 +1,5 @@
+MD5 (shotwell-0.7.2.tar.bz2) = B1sE+XI73f/8loEDhLlSSg==
+RMD160 (shotwell-0.7.2.tar.bz2) = S55qv9pvtHmnyzdjQMIm+hA1foY=
+SHA1 (shotwell-0.7.2.tar.bz2) = iSroUumQq5gVEItBuBUe5+9/Edk=
+SHA256 (shotwell-0.7.2.tar.bz2) = i0E5QH1Zuty+E+I9sHDgoHCezA+a2AYzWIg4Luv136M=
+SIZE (shotwell-0.7.2.tar.bz2) = 1064127
diff --git a/graphics/shotwell/patches/patch-Makefile b/graphics/shotwell/patches/patch-Makefile
@@ -0,0 +1,105 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
+remove gudev requirements
+add gmodule to fix http://trac.yorba.org/ticket/2726
+--- Makefile.orig	Sat Sep 11 00:55:54 2010
++++ Makefile	Wed Oct 27 18:49:26 2010
+@@ -124,11 +124,6 @@ SRC_FILES = \
+ 	FSpotDatabaseDriver.vala \
+ 	FSpotDatabaseTables.vala
+
+-ifndef LINUX
+-SRC_FILES += \
+-	GConf.vala
+-endif
+-
+ VAPI_FILES = \
+ 	libexif.vapi \
+ 	libgphoto2.vapi \
+@@ -268,6 +263,7 @@ EXT_PKGS = \
+ 	gee-1.0 \
+ 	gtk+-2.0 \
+ 	glib-2.0 \
++	gmodule-2.0 \
+ 	libexif \
+ 	sqlite3 \
+ 	gexiv2
+@@ -275,7 +271,6 @@ EXT_PKGS = \
+ LIBRAW_PKG = \
+ 	libraw
+
+-ifdef LINUX
+ EXT_PKGS += \
+ 	gconf-2.0 \
+ 	libgphoto2 \
+@@ -283,10 +278,8 @@ EXT_PKGS += \
+ 	libxml-2.0 \
+ 	unique-1.0 \
+ 	webkit-1.0 \
+-	gudev-1.0 \
+ 	dbus-glib-1 \
+ 	gdk-x11-2.0
+-endif
+
+ # libraw is handled separately (see note below); when libraw-config is no longer needed, the version
+ # should be added to this list
+@@ -301,7 +294,6 @@ EXT_PKG_VERSIONS = \
+ LIBRAW_VERSION = \
+ 	0.9.0
+
+-ifdef LINUX
+ EXT_PKG_VERSIONS += \
+ 	gconf-2.0 >= 2.22.0 \
+ 	libgphoto2 >= 2.4.2 \
+@@ -309,9 +301,7 @@ EXT_PKG_VERSIONS += \
+ 	libxml-2.0 >= 2.6.32 \
+ 	unique-1.0 >= 1.0.0 \
+ 	webkit-1.0 >= 1.1.5 \
+-	gudev-1.0 >= 145 \
+ 	dbus-glib-1 >= 0.80
+-endif
+
+ PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
+
+@@ -470,7 +460,6 @@ endif
+ ifndef DISABLE_DESKTOP_UPDATE
+ 	-update-desktop-database || :
+ endif
+-ifdef LINUX
+ ifndef DISABLE_SCHEMAS_INSTALL
+ 	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas
+ else
+@@ -487,7 +476,6 @@ ifndef DISABLE_HELP_INSTALL
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
+ 	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
+ endif
+-endif
+ 	-$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
+         $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
+             $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
+@@ -518,7 +506,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)'
+@@ -546,15 +533,15 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+ 	@
+
+ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
+-	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
++	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags raw` -o $@ $<
+
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -o $@
+
+ glade: lib$(PROGRAM).so
+
+ lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@
+
+ shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
+ 	iscc windows\winstall.iss
diff --git a/graphics/shotwell/patches/patch-configure b/graphics/shotwell/patches/patch-configure
@@ -0,0 +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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # Copyright 2009 Yorba Foundation
+ #
diff --git a/graphics/shotwell/patches/patch-src_CameraTable_vala b/graphics/shotwell/patches/patch-src_CameraTable_vala
@@ -0,0 +1,68 @@
+$OpenBSD: patch-src_CameraTable_vala,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
+We don't have gudev.. won't be able to detect cameras
+--- src/CameraTable.vala.orig	Wed Jun 30 20:44:30 2010
++++ src/CameraTable.vala	Thu Jul  1 23:19:30 2010
+@@ -24,7 +24,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;
+@@ -40,9 +39,6 @@ public class CameraTable {
+         camera_update_scheduler = new OneShotScheduler("CameraTable update scheduler",
+             on_update_cameras);
+
+-        // listen for interesting events on the specified subsystems
+-        client.uevent.connect(on_udev_event);
+-        
+         // because loading the camera abilities list takes a bit of time and slows down app
+         // startup, delay loading it (and notifying any observers) for a small period of time,
+         // after the dust has settled
+@@ -99,31 +95,6 @@ public class CameraTable {
+     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();
+-            if(
+-                // only keep devices that have a non-null device file and that
+-                // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
+-                (device_file != null) &&
+-                (device.has_property("ID_GPHOTO2")) &&
+-                (device.has_property("GPHOTO2_DRIVER"))
+-            ) {
+-                int camera_bus, camera_device;
+-                // extract the bus and device IDs from the device file string
+-                // TODO: is it safe to parse the absolute path or should we be
+-                // smarter and use a regex to only pick up the end of the path?
+-                if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
+-                    critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
+-                    
+-                    continue;
+-                }
+-                string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
+-                debug("USB camera detected at %s", camera);
+-                cameras += camera;
+-            }
+-        }
+-        
+         return cameras;
+     }
+
+@@ -311,13 +282,6 @@ public class CameraTable {
+         }
+     }
+
+-    private void on_udev_event(string action, GUdev.Device device) {
+-        debug("udev event: %s on %s", action, device.get_name());
+-        
+-        // Device add/removes often arrive in pairs; this allows for a single
+-        // update to occur when they come in all at once
+-        camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
+-    }
+
+     private void on_update_cameras() {
+         try {
diff --git a/graphics/shotwell/pkg/DESCR b/graphics/shotwell/pkg/DESCR
@@ -0,0 +1,4 @@
+Shotwell is a digital photo organizer designed for the GNOME desktop
+environment.  It allows you to import photos from disk or camera,
+organize them in various ways, view them in full-window or fullscreen
+mode, and export them to share with others.
diff --git a/graphics/shotwell/pkg/PLIST b/graphics/shotwell/pkg/PLIST
@@ -0,0 +1,145 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/10/28 12:36:10 landry Exp $
+@bin bin/shotwell
+share/applications/shotwell-viewer.desktop
+share/applications/shotwell.desktop
+share/gnome/help/shotwell/
+share/gnome/help/shotwell/C/
+share/gnome/help/shotwell/C/edit-adjustments.page
+share/gnome/help/shotwell/C/edit-crop.page
+share/gnome/help/shotwell/C/edit-enhance.page
+share/gnome/help/shotwell/C/edit-external.page
+share/gnome/help/shotwell/C/edit-nondestructive.page
+share/gnome/help/shotwell/C/edit-redeye.page
+share/gnome/help/shotwell/C/edit-rotate.page
+share/gnome/help/shotwell/C/edit-time-date.page
+share/gnome/help/shotwell/C/edit-undo.page
+share/gnome/help/shotwell/C/figures/
+share/gnome/help/shotwell/C/figures/crop_thirds.jpg
+share/gnome/help/shotwell/C/figures/edit_toolbar.png
+share/gnome/help/shotwell/C/figures/editing_overview.png
+share/gnome/help/shotwell/C/figures/shotwell_logo.png
+share/gnome/help/shotwell/C/figures/trash_process.png
+share/gnome/help/shotwell/C/formats.page
+share/gnome/help/shotwell/C/import-camera.page
+share/gnome/help/shotwell/C/import-f-spot.page
+share/gnome/help/shotwell/C/import-file.page
+share/gnome/help/shotwell/C/import-memorycard.page
+share/gnome/help/shotwell/C/index.page
+share/gnome/help/shotwell/C/organize-event.page
+share/gnome/help/shotwell/C/organize-rating.page
+share/gnome/help/shotwell/C/organize-remove.page
+share/gnome/help/shotwell/C/organize-tag.page
+share/gnome/help/shotwell/C/organize-title.page
+share/gnome/help/shotwell/C/other-missing.page
+share/gnome/help/shotwell/C/other-multiple.page
+share/gnome/help/shotwell/C/running.page
+share/gnome/help/shotwell/C/share-background.page
+share/gnome/help/shotwell/C/share-export.page
+share/gnome/help/shotwell/C/share-print.page
+share/gnome/help/shotwell/C/share-slideshow.page
+share/gnome/help/shotwell/C/share-upload.page
+share/gnome/help/shotwell/C/view-displaying.page
+share/gnome/help/shotwell/C/view-information.page
+share/gnome/help/shotwell/C/view-sidebar.page
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/shotwell.svg
+share/locale/ar/LC_MESSAGES/shotwell.mo
+share/locale/ast/LC_MESSAGES/shotwell.mo
+share/locale/bg/LC_MESSAGES/shotwell.mo
+share/locale/bn/LC_MESSAGES/shotwell.mo
+share/locale/ca/LC_MESSAGES/shotwell.mo
+share/locale/cs/LC_MESSAGES/shotwell.mo
+share/locale/da/LC_MESSAGES/shotwell.mo
+share/locale/de/LC_MESSAGES/shotwell.mo
+share/locale/el/LC_MESSAGES/shotwell.mo
+share/locale/en_GB/LC_MESSAGES/shotwell.mo
+share/locale/es/LC_MESSAGES/shotwell.mo
+share/locale/et/LC_MESSAGES/shotwell.mo
+share/locale/fi/LC_MESSAGES/shotwell.mo
+share/locale/fr/LC_MESSAGES/shotwell.mo
+share/locale/gl/LC_MESSAGES/shotwell.mo
+share/locale/hr/LC_MESSAGES/shotwell.mo
+share/locale/hu/LC_MESSAGES/shotwell.mo
+share/locale/id/LC_MESSAGES/shotwell.mo
+share/locale/it/LC_MESSAGES/shotwell.mo
+share/locale/ja/LC_MESSAGES/shotwell.mo
+share/locale/kk/LC_MESSAGES/shotwell.mo
+share/locale/ko/LC_MESSAGES/shotwell.mo
+share/locale/lt/LC_MESSAGES/shotwell.mo
+share/locale/lv/LC_MESSAGES/shotwell.mo
+share/locale/nb/LC_MESSAGES/shotwell.mo
+share/locale/nl/LC_MESSAGES/shotwell.mo
+share/locale/pa/LC_MESSAGES/shotwell.mo
+share/locale/pl/LC_MESSAGES/shotwell.mo
+share/locale/pt/LC_MESSAGES/shotwell.mo
+share/locale/ro/LC_MESSAGES/shotwell.mo
+share/locale/ru/LC_MESSAGES/shotwell.mo
+share/locale/sk/LC_MESSAGES/shotwell.mo
+share/locale/sl/LC_MESSAGES/shotwell.mo
+share/locale/sr/LC_MESSAGES/shotwell.mo
+share/locale/sv/LC_MESSAGES/shotwell.mo
+share/locale/th/LC_MESSAGES/shotwell.mo
+share/locale/tr/LC_MESSAGES/shotwell.mo
+share/locale/uk/LC_MESSAGES/shotwell.mo
+share/locale/zh_CN/LC_MESSAGES/shotwell.mo
+share/locale/zh_TW/LC_MESSAGES/shotwell.mo
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/shotwell.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+share/shotwell/
+share/shotwell/icons/
+share/shotwell/icons/all-rejected.png
+share/shotwell/icons/crop-pivot-reticle.png
+share/shotwell/icons/crop.svg
+share/shotwell/icons/drag_nub.png
+share/shotwell/icons/enhance.png
+share/shotwell/icons/five-star-filter.svg
+share/shotwell/icons/five-stars.svg
+share/shotwell/icons/four-star-filter-plus.svg
+share/shotwell/icons/four-stars.svg
+share/shotwell/icons/image-adjust.svg
+share/shotwell/icons/import-all.png
+share/shotwell/icons/import.svg
+share/shotwell/icons/last-import-roll.png
+share/shotwell/icons/make-primary.svg
+share/shotwell/icons/merge.svg
+share/shotwell/icons/multiple-events.png
+share/shotwell/icons/multiple-tags.png
+share/shotwell/icons/one-event.png
+share/shotwell/icons/one-star-filter-plus.svg
+share/shotwell/icons/one-star.svg
+share/shotwell/icons/one-tag.png
+share/shotwell/icons/pin-toolbar.svg
+share/shotwell/icons/publish.png
+share/shotwell/icons/redeye.png
+share/shotwell/icons/rejected.svg
+share/shotwell/icons/shotwell-16.svg
+share/shotwell/icons/shotwell-24.svg
+share/shotwell/icons/shotwell-street.jpg
+share/shotwell/icons/shotwell.ico
+share/shotwell/icons/shotwell.svg
+share/shotwell/icons/three-star-filter-plus.svg
+share/shotwell/icons/three-stars.svg
+share/shotwell/icons/two-star-filter-plus.svg
+share/shotwell/icons/two-stars.svg
+share/shotwell/icons/zoom-in.png
+share/shotwell/icons/zoom-out.png
+share/shotwell/ui/
+share/shotwell/ui/collection.ui
+share/shotwell/ui/direct.ui
+share/shotwell/ui/event.ui
+share/shotwell/ui/events_directory.ui
+share/shotwell/ui/fullscreen.ui
+share/shotwell/ui/import.ui
+share/shotwell/ui/import_queue.ui
+share/shotwell/ui/offline.ui
+share/shotwell/ui/photo.ui
+share/shotwell/ui/shotwell.glade
+share/shotwell/ui/tags.ui
+share/shotwell/ui/trash.ui
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database