Update to f-spot-0.6.2.

This commit is contained in:
ajacoutot 2010-05-15 10:07:46 +00:00
parent fc908f7fe4
commit bcd72867c2
10 changed files with 127 additions and 83 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.28 2010/04/24 16:50:20 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2010/05/15 10:07:46 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= personal photo management application for GNOME
GNOME_VERSION= 0.6.1.5
GNOME_VERSION= 0.6.2
GNOME_PROJECT= f-spot
PKGNAME= ${DISTNAME}p4
CATEGORIES= graphics
SHARED_LIBS += gphoto2glue 0.0 # .0.0
HOMEPAGE= http://www.f-spot.org/
# GPLv2
@ -23,13 +24,13 @@ WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common
WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 cairo
WANTLIB += crypto dbus-1 dbus-glib-1 expat fontconfig freetype
WANTLIB += gailutil gc gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
WANTLIB += gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png popt pthread-stubs ssl util xcb xml2 z
WANTLIB += eggdbus-1 gcrypt gpg-error xcb-render xcb-render-util
WANTLIB += crypto dbus-1 dbus-glib-1 eggdbus-1 expat fontconfig
WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring
WANTLIB += gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0 gpg-error
WANTLIB += gthread-2.0 gtk-x11-2.0 jpeg ltdl m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png popt pthread-stubs ssl
WANTLIB += usb util xcb xcb-render xcb-render-util xml2 z
MODULES= devel/gettext \
lang/mono \
@ -45,30 +46,32 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \
::shells/bash \
::x11/gnome/screensaver
RUN_DEPENDS= ::graphics/libgphoto2 \
::x11/gnome/mono-gnome
::x11/gnome/mono-gnome \
::sysutils/ndesk-dbus-glib
LIB_DEPENDS+= exif::graphics/libexif \
lcms::graphics/lcms \
mono::lang/mono
gphoto2.>=3,gphoto2_port.>=6::graphics/libgphoto2
MODGCONF2_SCHEMAS_DIR= f-spot
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-scrollkeeper \
--enable-shave=no \
--disable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
DLLMAP_FILES= lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config \
lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config \
DLLMAP_FILES= lib/unique-sharp/unique/unique-sharp.dll.config \
lib/gio-sharp/gio/gio-sharp.dll.config \
lib/gtk-sharp-beans/gtk-sharp-beans.dll.config \
lib/libgphoto2-sharp/libgphoto2-sharp.dll.config \
src/Cms.dll.config.in \
src/Cms.dll.config \
src/FSpot.Utils.dll.config \
src/FSpot.Widgets.dll.config.in \
src/f-spot.exe.config.in
src/FSpot.Widgets.dll.config \
src/f-spot.exe.config
FAKE_FLAGS= schemadir=${PREFIX}/${SCHEMAS_INSTDIR}
pre-configure:
${SUBST_CMD} ${WRKSRC}/icon-theme-installer

View File

@ -1,5 +1,5 @@
MD5 (gnome/f-spot-0.6.1.5.tar.bz2) = QRusgmamDZpyghjRndXnNQ==
RMD160 (gnome/f-spot-0.6.1.5.tar.bz2) = 8TLRttBEUh0FUPmC4Ab5mtj8Baw=
SHA1 (gnome/f-spot-0.6.1.5.tar.bz2) = cSqlzgqIREA6dRRWrkZxF9Grcdo=
SHA256 (gnome/f-spot-0.6.1.5.tar.bz2) = y1OOkLXoxuaySveEwISvosFxLHYGxuZNRzHWFFWWukY=
SIZE (gnome/f-spot-0.6.1.5.tar.bz2) = 2902761
MD5 (gnome/f-spot-0.6.2.tar.bz2) = gtKB62xcaxDnUxOolyUERA==
RMD160 (gnome/f-spot-0.6.2.tar.bz2) = 7SbvcoySDl/gXpuwtZUeoLTsP0k=
SHA1 (gnome/f-spot-0.6.2.tar.bz2) = uv0+36xxZ2msbyMMXZ81lVDmJOE=
SHA256 (gnome/f-spot-0.6.2.tar.bz2) = 99g2wRSvnX9QkDzXlxDwebAl8fi4SV2RF7FQ1udGxn4=
SIZE (gnome/f-spot-0.6.2.tar.bz2) = 2913007

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-configure,v 1.6 2010/03/24 22:53:55 ajacoutot Exp $
XXX Force using bundle ndesk-dbus, the system one crashes...
--- configure.orig Wed Mar 24 00:43:47 2010
+++ configure Wed Mar 24 00:44:02 2010
@@ -17900,8 +17900,8 @@ GTKSHARP_REQUIRED=2.12.2
MONO_REQUIRED=2.0.0
GTK_REQUIRED=2.14
BEAGLE_REQUIRED=0.3.0
-NDESK_DBUS_REQUIRED=0.4.2
-NDESK_DBUS_GLIB_REQUIRED=0.3.0
+NDESK_DBUS_REQUIRED=9.9.9
+NDESK_DBUS_GLIB_REQUIRED=9.9.9
MONO_CAIRO_REQUIRED=1.2.4
CAIRO_REQUIRED=1.4.0
LCMS_REQUIRED=1.12

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-f-spot_schemas_in,v 1.1 2010/05/15 10:07:46 ajacoutot Exp $
--- f-spot.schemas.in.orig Sat May 15 11:56:10 2010
+++ f-spot.schemas.in Sat May 15 11:57:08 2010
@@ -53,7 +53,7 @@
<key>/schemas/desktop/gnome/f-spot/ui/main_window_x</key>
<applyto>/desktop/gnome/f-spot/ui/main_window_x</applyto>
<type>int</type>
- <default></default>
+ <default>0</default>
<locale name="C">
<short>X position of the main window.</short>
<long>The X position to use for the main window.</long>
@@ -64,7 +64,7 @@
<key>/schemas/desktop/gnome/f-spot/ui/main_window_y</key>
<applyto>/desktop/gnome/f-spot/ui/main_window_y</applyto>
<type>int</type>
- <default></default>
+ <default>0</default>
<locale name="C">
<short>Y position of the main window.</short>
<long>The Y position to use for the main window.</long>
@@ -253,7 +253,7 @@
<key>/schemas/desktop/gnome/f-spot/ui/viewer_x</key>
<applyto>/desktop/gnome/f-spot/ui/viewer_x</applyto>
<type>int</type>
- <default></default>
+ <default>0</default>
<locale name="C">
<short>X position of the photo viewer window.</short>
<long>The X position to use for the photo viewer window.</long>
@@ -264,7 +264,7 @@
<key>/schemas/desktop/gnome/f-spot/ui/viewer_y</key>
<applyto>/desktop/gnome/f-spot/ui/viewer_y</applyto>
<type>int</type>
- <default></default>
+ <default>0</default>
<locale name="C">
<short>Y position of the photo viewer window.</short>
<long>The Y position to use for the photo viewer window.</long>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-icons_Makefile_in,v 1.1 2010/03/24 22:53:55 ajacoutot Exp $
--- icons/Makefile.in.orig Wed Nov 4 20:35:13 2009
+++ icons/Makefile.in Wed Mar 24 23:33:47 2010
@@ -40,7 +40,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.6 2010/03/24 21:56:18 ajacoutot Exp $
--- lib/libfspot/Makefile.in.orig Wed Nov 4 20:35:15 2009
+++ lib/libfspot/Makefile.in Wed Mar 24 12:21:13 2010
@@ -87,7 +87,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.7 2010/05/15 10:07:46 ajacoutot Exp $
--- lib/libfspot/Makefile.in.orig Fri May 14 20:39:38 2010
+++ lib/libfspot/Makefile.in Sat May 15 10:17:31 2010
@@ -90,7 +90,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_libfspot_Makefile_in,v 1.6 2010/03/24 21:56:18 ajacoutot Exp
$(LDFLAGS) -o $@
SOURCES = $(libfspot_la_SOURCES)
DIST_SOURCES = $(libfspot_la_SOURCES)
@@ -320,6 +320,8 @@ libfspot_la_SOURCES = \
@@ -338,6 +338,8 @@ libfspot_la_SOURCES = \
f-utils.h
libfspot_la_LIBADD = \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.4 2010/03/24 21:56:18 ajacoutot Exp $
--- lib/libjpegtran/Makefile.in.orig Wed Nov 4 20:35:15 2009
+++ lib/libjpegtran/Makefile.in Wed Mar 24 12:21:32 2010
@@ -68,7 +68,7 @@ am__base_list = \
$OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.5 2010/05/15 10:07:46 ajacoutot Exp $
--- lib/libjpegtran/Makefile.in.orig Fri May 14 20:39:39 2010
+++ lib/libjpegtran/Makefile.in Sat May 15 10:17:31 2010
@@ -71,7 +71,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(fspotlibdir)"
LTLIBRARIES = $(fspotlib_LTLIBRARIES)
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.4 2010/03/24 21:56:18 ajacoutot
am__objects_1 = jpeg-data.lo jpeg-marker.lo jpegtran.lo transupp.lo
am_libfspotjpegtran_la_OBJECTS = $(am__objects_1)
libfspotjpegtran_la_OBJECTS = $(am_libfspotjpegtran_la_OBJECTS)
@@ -83,7 +83,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
@@ -86,7 +86,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_f-spot_in,v 1.3 2010/03/24 12:18:44 robert Exp $
--- src/f-spot.in.orig Wed Nov 4 20:34:32 2009
+++ src/f-spot.in Sat Mar 20 17:30:03 2010
$OpenBSD: patch-src_f-spot_in,v 1.4 2010/05/15 10:07:46 ajacoutot Exp $
--- src/f-spot.in.orig Fri May 14 20:38:21 2010
+++ src/f-spot.in Sat May 15 10:17:31 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -99,5 +99,5 @@ elif $run_valgrind; then
@@ -94,5 +94,5 @@ elif $run_valgrind; then
elif $run_strace; then
strace -ttt -f -o /tmp/f-spot.strace mono $MONO_OPTIONS $EXE_TO_RUN "$@"
else

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_Makefile_in,v 1.6 2010/03/24 12:18:44 robert Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.7 2010/05/15 10:07:46 ajacoutot Exp $
The f-spot-import script needs HAL to work, which we don't have.
--- tools/Makefile.in.orig Wed Nov 4 20:35:16 2009
+++ tools/Makefile.in Sat Mar 20 17:30:03 2010
@@ -284,8 +284,7 @@ DISTCLEANFILES = \
--- tools/Makefile.in.orig Fri May 14 20:39:39 2010
+++ tools/Makefile.in Sat May 15 10:17:31 2010
@@ -302,8 +302,7 @@ DISTCLEANFILES = \
saverdir = @GNOME_SCREENSAVER_SAVERDIR@
saver_SCRIPTS = f-spot-screensaver

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2010/03/24 22:53:55 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.15 2010/05/15 10:07:46 ajacoutot Exp $
bin/f-spot
bin/f-spot-sqlite-upgrade
lib/f-spot/
@ -22,34 +22,26 @@ lib/f-spot/FSpot.Widgets.dll
lib/f-spot/FSpot.Widgets.dll.config
lib/f-spot/FSpot.Widgets.dll.mdb
lib/f-spot/FlickrNet.dll
lib/f-spot/Mono.Addins.Gui.dll
lib/f-spot/Mono.Addins.Setup.dll
lib/f-spot/Mono.Addins.dll
lib/f-spot/Mono.Addins.dll.config
lib/f-spot/Mono.Google.dll
lib/f-spot/Mono.Tabblo.dll
lib/f-spot/NDesk.DBus.GLib.dll
lib/f-spot/NDesk.DBus.GLib.dll.config
lib/f-spot/NDesk.DBus.dll
lib/f-spot/NDesk.Glitz.dll
lib/f-spot/SemWeb.dll
lib/f-spot/SmugMugNet.dll
lib/f-spot/extensions/
lib/f-spot/extensions/BeagleService.dll
lib/f-spot/extensions/CDExport.dll
lib/f-spot/extensions/ChangePhotoPath.dll
lib/f-spot/extensions/CoverTransition.dll
lib/f-spot/extensions/DBusService.dll
lib/f-spot/extensions/DefaultExporters.addin.xml
lib/f-spot/extensions/DevelopInUFRaw.dll
lib/f-spot/extensions/FacebookExport.dll
lib/f-spot/extensions/FlickrExport.dll
lib/f-spot/extensions/FolderExport.dll
lib/f-spot/extensions/GalleryExport.dll
lib/f-spot/extensions/HashJob.dll
lib/f-spot/extensions/LiveWebGallery.dll
lib/f-spot/extensions/MergeDb.dll
lib/f-spot/extensions/PicasaWebExport.dll
lib/f-spot/extensions/RawPlusJpeg.dll
lib/f-spot/extensions/RetroactiveRoll.dll
lib/f-spot/extensions/ScreensaverConfig.dll
lib/f-spot/extensions/SmugMugExport.dll
lib/f-spot/extensions/TabbloExport.dll
@ -70,11 +62,17 @@ lib/f-spot/libfspot.so
lib/f-spot/libfspotjpegtran.so
lib/f-spot/libgphoto2-sharp.dll
lib/f-spot/libgphoto2-sharp.dll.config
@comment lib/f-spot/libgphoto2glue.la
@lib lib/f-spot/libgphoto2glue.so.${LIBgphoto2glue_VERSION}
lib/f-spot/unique-sharp.dll
lib/f-spot/unique-sharp.dll.config
lib/pkgconfig/f-spot.pc
libexec/gnome-screensaver/
libexec/gnome-screensaver/f-spot-screensaver
share/applications/f-spot-import.desktop
share/applications/f-spot-view.desktop
share/applications/f-spot.desktop
share/applications/screensavers/
share/applications/screensavers/f-spot-screensaver.desktop
share/f-spot/
share/f-spot/icons/
@ -337,6 +335,19 @@ share/gnome/help/f-spot/ru/figures/f-spot-sepia.png
share/gnome/help/f-spot/ru/figures/f-spot-slideshow.png
share/gnome/help/f-spot/ru/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/ru/figures/f-spot-straighten.png
share/gnome/help/f-spot/sl/
share/gnome/help/f-spot/sl/f-spot.xml
share/gnome/help/f-spot/sl/figures/
share/gnome/help/f-spot/sl/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/sl/figures/f-spot-autocolor.png
share/gnome/help/f-spot/sl/figures/f-spot-crop.png
share/gnome/help/f-spot/sl/figures/f-spot-desaturate.png
share/gnome/help/f-spot/sl/figures/f-spot-fullscreen.png
share/gnome/help/f-spot/sl/figures/f-spot-red-eye.png
share/gnome/help/f-spot/sl/figures/f-spot-sepia.png
share/gnome/help/f-spot/sl/figures/f-spot-slideshow.png
share/gnome/help/f-spot/sl/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/sl/figures/f-spot-straighten.png
share/gnome/help/f-spot/sv/
share/gnome/help/f-spot/sv/f-spot.xml
share/gnome/help/f-spot/sv/figures/
@ -350,11 +361,22 @@ share/gnome/help/f-spot/sv/figures/f-spot-sepia.png
share/gnome/help/f-spot/sv/figures/f-spot-slideshow.png
share/gnome/help/f-spot/sv/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
share/gnome/help/f-spot/uk/
share/gnome/help/f-spot/uk/f-spot.xml
share/gnome/help/f-spot/uk/figures/
share/gnome/help/f-spot/uk/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/uk/figures/f-spot-autocolor.png
share/gnome/help/f-spot/uk/figures/f-spot-crop.png
share/gnome/help/f-spot/uk/figures/f-spot-desaturate.png
share/gnome/help/f-spot/uk/figures/f-spot-fullscreen.png
share/gnome/help/f-spot/uk/figures/f-spot-red-eye.png
share/gnome/help/f-spot/uk/figures/f-spot-sepia.png
share/gnome/help/f-spot/uk/figures/f-spot-slideshow.png
share/gnome/help/f-spot/uk/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/uk/figures/f-spot-straighten.png
share/icons/hicolor/16x16/apps/f-spot.png
share/icons/hicolor/22x22/apps/f-spot.png
share/icons/hicolor/24x24/apps/f-spot.png
share/icons/hicolor/256x256/
share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/f-spot.png
share/icons/hicolor/32x32/apps/f-spot.png
share/icons/hicolor/48x48/apps/f-spot.png
@ -362,6 +384,7 @@ share/locale/ar/LC_MESSAGES/f-spot.mo
share/locale/as/LC_MESSAGES/f-spot.mo
share/locale/be@latin/LC_MESSAGES/f-spot.mo
share/locale/bg/LC_MESSAGES/f-spot.mo
share/locale/bn_IN/LC_MESSAGES/f-spot.mo
share/locale/ca/LC_MESSAGES/f-spot.mo
share/locale/cs/LC_MESSAGES/f-spot.mo
share/locale/da/LC_MESSAGES/f-spot.mo
@ -391,6 +414,7 @@ share/locale/lv/LC_MESSAGES/f-spot.mo
share/locale/mk/LC_MESSAGES/f-spot.mo
share/locale/mr/LC_MESSAGES/f-spot.mo
share/locale/nb/LC_MESSAGES/f-spot.mo
share/locale/nds/LC_MESSAGES/f-spot.mo
share/locale/nl/LC_MESSAGES/f-spot.mo
share/locale/oc/LC_MESSAGES/f-spot.mo
share/locale/or/LC_MESSAGES/f-spot.mo
@ -398,6 +422,7 @@ share/locale/pa/LC_MESSAGES/f-spot.mo
share/locale/pl/LC_MESSAGES/f-spot.mo
share/locale/pt/LC_MESSAGES/f-spot.mo
share/locale/pt_BR/LC_MESSAGES/f-spot.mo
share/locale/ro/LC_MESSAGES/f-spot.mo
share/locale/ru/LC_MESSAGES/f-spot.mo
share/locale/rw/LC_MESSAGES/f-spot.mo
share/locale/sk/LC_MESSAGES/f-spot.mo
@ -424,7 +449,13 @@ share/omf/f-spot/f-spot-it.omf
share/omf/f-spot/f-spot-oc.omf
share/omf/f-spot/f-spot-pt_BR.omf
share/omf/f-spot/f-spot-ru.omf
share/omf/f-spot/f-spot-sl.omf
share/omf/f-spot/f-spot-sv.omf
share/omf/f-spot/f-spot-uk.omf
@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}/f-spot.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
@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