cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to shotwell-0.11.92.20120226, git snapshot to cope with recent

Browse Source 
vala update. This now uses gtk+3.

ok landry@ (maintainer)
This commit is contained in:
ajacoutot 2012-02-27 19:41:55 +00:00
parent 008ea8ea49
commit 598fbe4282
8 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
graphics/shotwell/Makefile
View File

@ -1,11 +1,15 @@
# $OpenBSD: Makefile,v 1.16 2011/12/03 20:30:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2012/02/27 19:41:55 ajacoutot Exp $
# needs to allocate 512M
VMEM_WARNING = Yes
COMMENT = digital photo organizer
DISTNAME = shotwell-0.11.1
REVISION= 2
# git glone
DISTNAME = shotwell-0.11.92.20120226
CATEGORIES = graphics
MASTER_SITES = http://yorba.org/download/shotwell/0.11/
#MASTER_SITES = http://yorba.org/download/shotwell/0.11/
MASTER_SITES = http://distfiles.bsdfrog.org/
HOMEPAGE = http://yorba.org/shotwell/
EXTRACT_SUFX = .tar.bz2
@ -17,31 +21,32 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += drm exif exiv2 expat fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gee gexiv2 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += cairo-gobject drm exif exiv2 expat fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gee gexiv2 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gphoto2 gphoto2_port gstbase-0.10 gstpbutils-0.10
WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 stdc++ unique-1.0 usb webkitgtk-1.0
WANTLIB += xcb xcb-render xcb-shm xml2 z gconf-2
WANTLIB += gstreamer-0.10 gthread-2.0 gtk-3 javascriptcoregtk-3.0
WANTLIB += lcms2 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread pthread-stubs raw rest-0.7 soup-2.4 sqlite3
WANTLIB += stdc++ unique-3.0 usb webkitgtk-3.0 xcb xcb-render
WANTLIB += xcb-shm xml2 z
MODULES = devel/dconf devel/gettext x11/gnome
MODGNOME_TOOLS= yelp
MODGNOME_DESKTOP_FILE = yes
MODGNOME_DESKTOP_FILE = yes
RUN_DEPENDS += x11/gnome/librsvg \
x11/gtk+2,-guic
BUILD_DEPENDS = lang/vala>=0.12
BUILD_DEPENDS = lang/vala>=0.15.2
LIB_DEPENDS = x11/gtk+2 \
graphics/libgexiv2 \
graphics/libraw \
www/webkit>=1.4.0v0 \
devel/libunique \
LIB_DEPENDS = graphics/libgexiv2>=0.3.91 \
graphics/libraw>=0.14.5 \
www/webkit,gtk3>=1.6.1v0 \
devel/libunique3 \
devel/libgee \
graphics/libgphoto2
graphics/libgphoto2 \
net/librest
NO_REGRESS = Yes
# beware : configure is an horrible homemade shell script

10
graphics/shotwell/distinfo
View File

@ -1,5 +1,5 @@
MD5 (shotwell-0.11.1.tar.bz2) = 4sOIv86ZK1Q3KBxPwpNX2Q==
RMD160 (shotwell-0.11.1.tar.bz2) = UbltzP6GZVUftBbXpETF+UsDWKE=
SHA1 (shotwell-0.11.1.tar.bz2) = hMhSkaIr96lfUc8DQdEuoDVfFBU=
SHA256 (shotwell-0.11.1.tar.bz2) = 5FOb1CesGcQMiDcFyqeLZ/d9bRob+8/+kgKzSOVkNkg=
SIZE (shotwell-0.11.1.tar.bz2) = 1545164
MD5 (shotwell-0.11.92.20120226.tar.bz2) = qp2J5zpasAVfWYolt0Rrcg==
RMD160 (shotwell-0.11.92.20120226.tar.bz2) = TFLwi2NAEQE5nq2ax/3nSdVT6w0=
SHA1 (shotwell-0.11.92.20120226.tar.bz2) = nAXII99RIjTzqGbyqpXJuWOCqtc=
SHA256 (shotwell-0.11.92.20120226.tar.bz2) = dNOvKRrZvDX2awHguUq3eFw5iSl0WSHk14VhviZp388=
SIZE (shotwell-0.11.92.20120226.tar.bz2) = 1625656

44
graphics/shotwell/patches/patch-Makefile
View File

@ -1,35 +1,35 @@
$OpenBSD: patch-Makefile,v 1.6 2011/09/12 18:22:19 jasper Exp $
$OpenBSD: patch-Makefile,v 1.7 2012/02/27 19:41:55 ajacoutot Exp $
remove gudev requirement
--- Makefile.orig Thu Sep 8 20:59:29 2011
+++ Makefile Mon Sep 12 19:42:54 2011
@@ -32,7 +32,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv
--- Makefile.orig Sun Feb 26 15:04:33 2012
+++ Makefile Sun Feb 26 15:09:41 2012
@@ -33,7 +33,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
-VALAFLAGS := -g --enable-checking --thread --fatal-warnings $(USER_VALAFLAGS)
+VALAFLAGS := -g --enable-checking --thread -X -I${LOCALBASE}/include $(USER_VALAFLAGS)
-VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
+VALAFLAGS := -g --enable-checking --thread -X -I${LOCALBASE}/include --enable-deprecated $(USER_VALAFLAGS)
ifdef UNITY_SUPPORT
VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
endif
@@ -271,7 +271,6 @@ EXT_PKGS = \
@@ -278,7 +278,6 @@ EXT_PKGS = \
gstreamer-base-0.10 \
gstreamer-pbutils-0.10 \
gtk+-2.0 \
gtk+-3.0 \
- gudev-1.0 \
libexif \
libgphoto2 \
libsoup-2.4 \
@@ -307,7 +306,6 @@ EXT_PKG_VERSIONS = \
gstreamer-base-0.10 >= 0.10.28 \
@@ -314,7 +313,6 @@ EXT_PKG_VERSIONS = \
gstreamer-plugins-base-0.10 >= 0.10.32 \
gstreamer-pbutils-0.10 >= 0.10.32 \
gtk+-2.0 >= 2.18.0 \
gtk+-3.0 >= 3.0.11 \
- gudev-1.0 >= 145 \
libexif >= 0.6.16 \
libgphoto2 >= 2.4.2 \
libsoup-2.4 >= 2.26.0 \
@@ -433,9 +431,8 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
@@ -439,9 +437,8 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
LIBRAW_CONFIG=./libraw-config
define check_valac_version
@ -41,7 +41,7 @@ remove gudev requirement
endef
define check_valadate_version
@@ -554,8 +551,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
@@ -560,8 +557,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
endif
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
@ -52,33 +52,33 @@ remove gudev requirement
endif
ifndef DISABLE_ICON_UPDATE
-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
@@ -675,10 +672,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
@@ -681,10 +678,10 @@ $(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) `pkg-config --cflags raw` $(CFLAGS) -o $@ $<
+ $(CC) -c $(VALA_CFLAGS) `pkg-config --cflags libraw` $(CFLAGS) -o $@ $<
$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
- $(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 $@
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
glib-compile-schemas misc
$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
@@ -707,7 +704,7 @@ docs:
@@ -713,7 +710,7 @@ docs:
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) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@
- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
.PHONY: pkgcheck
pkgcheck:
@@ -719,6 +716,6 @@ ifdef EXT_PKGS
@@ -725,6 +722,6 @@ 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
+ @pkg-config --exists libraw
endif
@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )

8
graphics/shotwell/patches/patch-configure
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.3 2011/09/22 17:34:45 landry Exp $
--- configure.orig Thu Sep 8 20:56:57 2011
+++ configure Thu Sep 22 19:30:57 2011
$OpenBSD: patch-configure,v 1.4 2012/02/27 19:41:55 ajacoutot Exp $
--- configure.orig Sun Feb 26 15:04:33 2012
+++ configure Sun Feb 26 15:07:49 2012
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
# Copyright 2009-2011 Yorba Foundation
# Copyright 2009-2012 Yorba Foundation
#
@@ -129,7 +129,7 @@ do

18
graphics/shotwell/patches/patch-plugins_Makefile_plugin_mk
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.2 2011/09/12 18:22:19 jasper Exp $
--- plugins/Makefile.plugin.mk.orig Thu Sep 8 20:56:57 2011
+++ plugins/Makefile.plugin.mk Mon Sep 12 18:46:08 2011
@@ -32,16 +32,16 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.3 2012/02/27 19:41:55 ajacoutot Exp $
--- plugins/Makefile.plugin.mk.orig Sun Feb 26 15:04:33 2012
+++ plugins/Makefile.plugin.mk Sun Feb 26 15:08:49 2012
@@ -34,16 +34,16 @@ 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)
-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
+CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -I${LOCALBASE}/include -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
all: $(PLUGIN).so
@ -15,9 +15,9 @@ $OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.2 2011/09/12 18:22:19 jasper Exp
.stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
- $(VALAC) -g --enable-checking --fatal-warnings --save-temps --compile \
+ $(VALAC) -g --enable-checking --save-temps --compile \
--vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) \
--vapidir=../ $(foreach pkg,$(PKGS),--pkg=$(pkg)) $(foreach pkg,$(CUSTOM_VAPI_PKGS),--pkg=$(pkg)) \
- -X -I../.. -X -fPIC \
+ -X -I${LOCALBASE}/include -X -I../.. -X -fPIC \
$(foreach dfn,$(DEFINES),-X $(dfn)) \
$(USER_VALAFLAGS) \
$(SRC_FILES)
--vapidir=../../vapi \

19
graphics/shotwell/patches/patch-src_camera_CameraTable_vala
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_camera_CameraTable_vala,v 1.1 2011/09/12 18:22:19 jasper Exp $
--- src/camera/CameraTable.vala.orig Mon Sep 12 18:36:24 2011
+++ src/camera/CameraTable.vala Mon Sep 12 18:38:06 2011
$OpenBSD: patch-src_camera_CameraTable_vala,v 1.2 2012/02/27 19:41:55 ajacoutot Exp $
--- src/camera/CameraTable.vala.orig Sun Feb 26 15:04:33 2012
+++ src/camera/CameraTable.vala Sun Feb 26 15:09:13 2012
@@ -26,7 +26,6 @@ public class CameraTable {
private static CameraTable instance = null;
@ -49,13 +49,13 @@ $OpenBSD: patch-src_camera_CameraTable_vala,v 1.1 2011/09/12 18:22:19 jasper Exp
return cameras;
}
@@ -204,24 +177,8 @@ public class CameraTable {
@@ -206,24 +179,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) {
- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
- return volume.get_name();
- }
- }
@ -64,18 +64,17 @@ $OpenBSD: patch-src_camera_CameraTable_vala,v 1.1 2011/09/12 18:22:19 jasper Exp
-
- 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) {
- if (volume.get_identifier(VolumeIdentifier.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 +268,6 @@ public class CameraTable {
@@ -313,23 +268,6 @@ public class CameraTable {
continue;
}
@ -99,7 +98,7 @@ $OpenBSD: patch-src_camera_CameraTable_vala,v 1.1 2011/09/12 18:22:19 jasper Exp
if (null == display_name) {
// Default to GPhoto detected name.
display_name = name;
@@ -365,13 +305,7 @@ public class CameraTable {
@@ -367,13 +305,7 @@ public class CameraTable {
}
}

3
graphics/shotwell/pkg/PFRAG.shared
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2011/04/05 18:43:43 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2012/02/27 19:41:55 ajacoutot Exp $
lib/shotwell/plugins/builtin/shotwell-data-imports.so
lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
lib/shotwell/plugins/builtin/shotwell-publishing.so
lib/shotwell/plugins/builtin/shotwell-transitions.so

16
graphics/shotwell/pkg/PLIST
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.6 2011/12/03 20:30:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/02/27 19:41:55 ajacoutot Exp $
%%SHARED%%
@bin bin/shotwell
@bin bin/shotwell-video-thumbnailer
lib/shotwell/
lib/shotwell/plugins/
lib/shotwell/plugins/builtin/
lib/shotwell/plugins/builtin/f-spot-24.png
lib/shotwell/plugins/builtin/facebook.png
lib/shotwell/plugins/builtin/flickr.png
lib/shotwell/plugins/builtin/picasa.png
@ -66,14 +67,8 @@ 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/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/shotwell.svg
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/shotwell.svg
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/shotwell.svg
share/locale/ar/LC_MESSAGES/shotwell-extras.mo
share/locale/ar/LC_MESSAGES/shotwell.mo
@ -163,6 +158,8 @@ share/locale/tr/LC_MESSAGES/shotwell-extras.mo
share/locale/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
share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
@ -174,6 +171,7 @@ 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/faces-tool.png
share/shotwell/icons/filter-flagged.png
share/shotwell/icons/filter-photos.png
share/shotwell/icons/filter-raw.png
@ -189,11 +187,13 @@ share/shotwell/icons/image-adjust.svg
share/shotwell/icons/import-all.png
share/shotwell/icons/import.svg
share/shotwell/icons/make-primary.svg
share/shotwell/icons/many-faces.png
share/shotwell/icons/merge.svg
share/shotwell/icons/multiple-events.png
share/shotwell/icons/multiple-tags.png
share/shotwell/icons/noninterpretable-video.png
share/shotwell/icons/one-event.png
share/shotwell/icons/one-face.png
share/shotwell/icons/one-star-filter-plus.svg
share/shotwell/icons/one-star.svg
share/shotwell/icons/one-tag.png
@ -210,6 +210,7 @@ share/shotwell/icons/shotwell.ico
share/shotwell/icons/shotwell.svg
share/shotwell/icons/slideshow-extension-point.png
share/shotwell/icons/sprocket.png
share/shotwell/icons/straighten.svg
share/shotwell/icons/three-star-filter-plus.svg
share/shotwell/icons/three-stars.svg
share/shotwell/icons/two-star-filter-plus.svg
@ -222,6 +223,7 @@ share/shotwell/ui/collection.ui
share/shotwell/ui/direct.ui
share/shotwell/ui/event.ui
share/shotwell/ui/events_directory.ui
share/shotwell/ui/faces.ui
share/shotwell/ui/fullscreen.ui
share/shotwell/ui/import.ui
share/shotwell/ui/import_queue.ui