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

Update to shotwell-0.14.0.

Browse Source
This commit is contained in:
ajacoutot 2013-03-23 15:19:45 +00:00
parent 357edb24fe
commit 464b07b745
6 changed files with 70 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
graphics/shotwell/Makefile
View File

@ -1,61 +1,58 @@
# $OpenBSD: Makefile,v 1.28 2013/03/11 11:10:55 espie Exp $
# $OpenBSD: Makefile,v 1.29 2013/03/23 15:19:45 ajacoutot Exp $
# needs to allocate 512M
VMEM_WARNING = Yes
COMMENT = digital photo organizer
DISTNAME = shotwell-0.13.1
CATEGORIES = graphics
MASTER_SITES = http://yorba.org/download/shotwell/stable/
HOMEPAGE = http://yorba.org/shotwell/
V = 0.14.0
DISTNAME = shotwell-${V}
EXTRACT_SUFX = .tar.xz
REVISION = 0
CATEGORIES = graphics
MASTER_SITES = http://yorba.org/download/shotwell/${V:C/^([0-9]+\.[0-9]+).*/\1/}/
HOMEPAGE = http://yorba.org/shotwell/
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += cairo-gobject drm exif exiv2 expat fontconfig freetype
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 c
WANTLIB += cairo cairo-gobject exif exiv2 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-3 javascriptcoregtk-3.0
WANTLIB += lcms2 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs raw rest-0.7 soup-2.4
WANTLIB += sqlite3 stdc++ unique-3.0 webkitgtk-3.0 xcb xcb-render
WANTLIB += xcb-shm xml2 z atk-bridge-2.0 harfbuzz json-glib-1.0
WANTLIB += gobject-2.0 gphoto2 gphoto2_port gstbase-1.0 gstpbutils-1.0
WANTLIB += gstreamer-1.0 gthread-2.0 gtk-3 harfbuzz javascriptcoregtk-3.0
WANTLIB += json-glib-1.0 lcms2 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs raw rest-0.7
WANTLIB += soup-2.4 sqlite3 stdc++ 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_TOOLS = yelp
MODGNOME_DESKTOP_FILE = Yes
MODGNOME_ICON_CACHE = Yes
RUN_DEPENDS += x11/gnome/librsvg \
x11/gtk+2,-guic
RUN_DEPENDS = x11/gnome/librsvg
BUILD_DEPENDS = lang/vala>=0.16.0
BUILD_DEPENDS = lang/vala
LIB_DEPENDS = devel/json-glib \
devel/libgee06 \
devel/libunique3 \
graphics/libgexiv2>=0.4.1 \
graphics/libgphoto2>=2.5.0 \
graphics/libraw>=0.14.5 \
graphics/libgexiv2>=0.6.1 \
graphics/libgphoto2 \
graphics/libraw \
multimedia/gstreamer1/plugins-base \
net/librest \
www/webkit,gtk3>=1.6.1v0
www/webkit,gtk3
NO_TEST = Yes
# beware: configure is an horrible homemade shell script
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --disable-schemas-compile \
--disable-desktop-update \
CONFIGURE_ARGS = --disable-desktop-update \
--disable-icon-update
pre-configure:
${SUBST_CMD} ${WRKSRC}/Makefile \
${WRKSRC}/plugins/Makefile.plugin.mk
${SUBST_CMD} ${WRKSRC}/plugins/Makefile.plugin.mk
.include <bsd.port.mk>

4
graphics/shotwell/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (shotwell-0.13.1.tar.xz) = 5UjDJ0QQ4Glv/NBR6r04yipQcDHza3IDweaJZoFfpzU=
SIZE (shotwell-0.13.1.tar.xz) = 1497664
SHA256 (shotwell-0.14.0.tar.xz) = BSmkG/n84B2fGm2W6cSxhMbybeg1ayCr0rnhnh9AYrU=
SIZE (shotwell-0.14.0.tar.xz) = 1523280

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

@ -1,47 +1,26 @@
$OpenBSD: patch-Makefile,v 1.10 2013/01/13 15:42:10 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.11 2013/03/23 15:19:45 ajacoutot Exp $
remove gudev requirement
--- Makefile.orig Fri Oct 5 20:07:37 2012
+++ Makefile Sun Jan 13 16:24:12 2013
@@ -37,7 +37,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 --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
@@ -297,7 +297,6 @@ EXT_PKGS = \
gstreamer-base-0.10 \
gstreamer-pbutils-0.10 \
--- Makefile.orig Mon Mar 18 21:32:30 2013
+++ Makefile Sat Mar 23 16:00:19 2013
@@ -298,7 +298,6 @@ EXT_PKGS = \
gstreamer-base-1.0 \
gstreamer-pbutils-1.0 \
gtk+-3.0 \
- gudev-1.0 \
libexif \
libgphoto2 \
json-glib-1.0 \
@@ -330,7 +329,6 @@ EXT_PKG_VERSIONS = \
gstreamer-plugins-base-0.10 >= 0.10.32 \
gstreamer-pbutils-0.10 >= 0.10.32 \
gstreamer-plugins-base-1.0 >= 1.0.0 \
gstreamer-pbutils-1.0 >= 1.0.0 \
gtk+-3.0 >= 3.0.11 \
- gudev-1.0 >= 145 \
libexif >= 0.6.16 \
libgphoto2 >= 2.4.2 \
libraw >= 0.13.2 \
@@ -453,9 +451,8 @@ PLUGIN_CFLAGS += $(REQUIRED_CFLAGS)
CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
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 ),)
+# $(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
define check_valadate_version
@@ -575,8 +572,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
@@ -568,8 +566,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
endif
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
@ -52,3 +31,16 @@ remove gudev requirement
endif
ifndef DISABLE_ICON_UPDATE
-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
@@ -734,9 +732,9 @@ pkgcheck:
.PHONY: valacheck
valacheck:
@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. No valac found in path or $$VALAC.'; exit 1 )
- @ ./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 ),)
+# @ ./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 ),)

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

@ -1,18 +1,18 @@
$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
$OpenBSD: patch-configure,v 1.5 2013/03/23 15:19:45 ajacoutot Exp $
--- configure.orig Mon Mar 18 19:48:16 2013
+++ configure Sat Mar 23 15:57:08 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
# Copyright 2009-2012 Yorba Foundation
# Copyright 2009-2013 Yorba Foundation
#
@@ -129,7 +129,7 @@ do
*) if [ ! $value ]
then
- abort $1
+ echo "$1 is not a valid argument, FAIL"1
fi
variables="${variables}${option}=${value}\n"
@@ -47,8 +47,6 @@ configure_help() {
abort() {
printf "%s: Invalid argument %s\n" $0 $1
- configure_help
- exit 1
}
while [ $# != 0 ]

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

@ -1,7 +1,7 @@
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.4 2012/09/24 20:32:49 jasper Exp $
--- plugins/Makefile.plugin.mk.orig Wed Sep 19 21:08:59 2012
+++ plugins/Makefile.plugin.mk Mon Sep 24 21:32:25 2012
@@ -34,16 +34,16 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
$OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.5 2013/03/23 15:19:45 ajacoutot Exp $
--- plugins/Makefile.plugin.mk.orig Mon Mar 18 19:48:16 2013
+++ plugins/Makefile.plugin.mk Sat Mar 23 16:01:41 2013
@@ -34,7 +34,7 @@ SRC_FILES := ../common/Resources.vala $(SRC_FILES)
CFILES := $(notdir $(SRC_FILES:.vala=.c))
OFILES := $(notdir $(SRC_FILES:.vala=.o))
@ -10,14 +10,3 @@ $OpenBSD: patch-plugins_Makefile_plugin_mk,v 1.4 2012/09/24 20:32:49 jasper Exp
LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
all: $(PLUGIN).so
.stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
- $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --fatal-warnings --save-temps --enable-deprecated --compile \
+ $(VALAC) --target-glib=$(MIN_GLIB_VERSION) -g --enable-checking --save-temps --enable-deprecated --compile \
--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) \
--vapidir=../../vapi \

3
graphics/shotwell/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2013/01/13 15:42:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.14 2013/03/23 15:19:45 ajacoutot Exp $
%%SHARED%%
@bin bin/shotwell
@bin bin/shotwell-video-thumbnailer
@ -19,6 +19,7 @@ lib/shotwell/plugins/builtin/piwigo.png
lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
lib/shotwell/plugins/builtin/slideshow-plugin.png
lib/shotwell/plugins/builtin/tumblr.png
lib/shotwell/plugins/builtin/yandex_publish_model.glade
lib/shotwell/plugins/builtin/youtube.png
lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade