Update to f-spot-0.7.1.

This commit is contained in:
ajacoutot 2010-07-14 10:58:35 +00:00
parent 5449b11d06
commit 561f6e5690
6 changed files with 63 additions and 54 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.34 2010/07/13 20:37:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2010/07/14 10:58:35 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= personal photo management application for GNOME
GNOME_VERSION= 0.7.0
GNOME_VERSION= 0.7.1
GNOME_PROJECT= f-spot
REVISION= 1
CATEGORIES= graphics
@ -29,7 +28,7 @@ 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 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png popt pthread-stubs ssl
WANTLIB += util xcb xcb-render xcb-render-util xml2 z
WANTLIB += util xcb xcb-render xcb-render-util xml2 z lcms
MODULES= devel/gettext \
lang/mono \
@ -50,8 +49,7 @@ RUN_DEPENDS= ::devel/mono-addins \
::devel/mono-flickrnet \
::x11/gnome/mono-keyring \
::devel/libunique
LIB_DEPENDS+= exif::graphics/libexif \
lcms::graphics/lcms
LIB_DEPENDS+= ::graphics/lcms
MODGCONF2_SCHEMAS_DIR= f-spot

View File

@ -1,5 +1,5 @@
MD5 (gnome/f-spot-0.7.0.tar.bz2) = nvaIvnf7+4xpc2jQRqbNaw==
RMD160 (gnome/f-spot-0.7.0.tar.bz2) = NSxre3GyVo1gDH6McwrlyRPSXo4=
SHA1 (gnome/f-spot-0.7.0.tar.bz2) = zWs4FNj60tWAlE0HwajB+dsnsT0=
SHA256 (gnome/f-spot-0.7.0.tar.bz2) = Lti5k7N07MzjqJyDb2Sn+pR2h95CB8WuFMJfHfL8kgM=
SIZE (gnome/f-spot-0.7.0.tar.bz2) = 2938691
MD5 (gnome/f-spot-0.7.1.tar.bz2) = aGP9ukamUbKz8QR3/OdHKw==
RMD160 (gnome/f-spot-0.7.1.tar.bz2) = LIywJlgivCYr+LK7KcWqQ3JCPKw=
SHA1 (gnome/f-spot-0.7.1.tar.bz2) = kjW0DL4qBJaSX0+/Ka74A90DdPU=
SHA256 (gnome/f-spot-0.7.1.tar.bz2) = rdW3pbW7bndat92Dpgs/gg+5P3WMx6D4+JbOruI/1Dg=
SIZE (gnome/f-spot-0.7.1.tar.bz2) = 3116123

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.8 2010/06/30 19:08:37 robert Exp $
--- lib/libfspot/Makefile.in.orig Wed Jun 16 10:54:39 2010
+++ lib/libfspot/Makefile.in Tue Jun 29 01:40:23 2010
@@ -96,7 +96,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$OpenBSD: patch-lib_libfspot_Makefile_in,v 1.9 2010/07/14 10:58:35 ajacoutot Exp $
--- lib/libfspot/Makefile.in.orig Tue Jul 13 21:11:30 2010
+++ lib/libfspot/Makefile.in Wed Jul 14 11:38:55 2010
@@ -94,7 +94,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@ -10,12 +10,3 @@ $OpenBSD: patch-lib_libfspot_Makefile_in,v 1.8 2010/06/30 19:08:37 robert Exp $
$(LDFLAGS) -o $@
SOURCES = $(libfspot_la_SOURCES)
DIST_SOURCES = $(libfspot_la_SOURCES)
@@ -357,6 +357,8 @@ libfspot_la_SOURCES = \
f-utils.h
libfspot_la_LIBADD = \
+ -lX11 \
+ $(F_LIBS) \
$(LCMS_LIBS) \
$(EXIF_LIBS) \
$(GIO_LIBS) \

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_libjpegtran_Makefile_in,v 1.6 2010/06/30 19:08:37 robert Exp $
--- lib/libjpegtran/Makefile.in.orig Wed Jun 16 10:54:40 2010
+++ lib/libjpegtran/Makefile.in Tue Jun 29 01:40:23 2010
@@ -77,7 +77,7 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(fspotlibdir)"
LTLIBRARIES = $(fspotlib_LTLIBRARIES)
-libfspotjpegtran_la_LIBADD =
+libfspotjpegtran_la_LIBADD = $(F_LIBS)
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)
@@ -92,7 +92,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ --mode=link $(CCLD) -module -avoid-version $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libfspotjpegtran_la_SOURCES)
DIST_SOURCES = $(libfspotjpegtran_la_SOURCES)

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_Makefile_in,v 1.8 2010/06/30 19:08:37 robert Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.9 2010/07/14 10:58:35 ajacoutot Exp $
The f-spot-import script needs HAL to work, which we don't have.
--- tools/Makefile.in.orig Wed Jun 16 10:54:41 2010
+++ tools/Makefile.in Tue Jun 29 01:40:23 2010
@@ -321,8 +321,7 @@ DISTCLEANFILES = \
--- tools/Makefile.in.orig Tue Jul 13 21:11:31 2010
+++ tools/Makefile.in Wed Jul 14 11:38:59 2010
@@ -318,8 +318,7 @@ DISTCLEANFILES = \
saverdir = @GNOME_SCREENSAVER_SAVERDIR@
saver_SCRIPTS = f-spot-screensaver

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2010/06/30 19:08:37 robert Exp $
@comment $OpenBSD: PLIST,v 1.17 2010/07/14 10:58:35 ajacoutot Exp $
bin/f-spot
bin/f-spot-sqlite-upgrade
lib/f-spot/
@ -74,12 +74,13 @@ lib/f-spot/Hyena.dll
lib/f-spot/Hyena.dll.mdb
lib/f-spot/Mono.Data.Sqlite.dll
lib/f-spot/Mono.Data.Sqlite.dll.mdb
lib/f-spot/SemWeb.dll
lib/f-spot/SemWeb.dll.mdb
lib/f-spot/TagLib.dll
lib/f-spot/TagLib.dll.mdb
lib/f-spot/f-spot.exe
lib/f-spot/f-spot.exe.config
lib/f-spot/f-spot.exe.mdb
lib/f-spot/f-spot.global.addins
lib/f-spot/gconf-schema-extractor.exe
lib/f-spot/gio-sharp.dll
lib/f-spot/gio-sharp.dll.config
lib/f-spot/gkeyfile-sharp.dll
@ -87,8 +88,6 @@ lib/f-spot/gtk-sharp-beans.dll
lib/f-spot/gtk-sharp-beans.dll.config
@comment lib/f-spot/libfspot.la
lib/f-spot/libfspot.so
@comment lib/f-spot/libfspotjpegtran.la
lib/f-spot/libfspotjpegtran.so
lib/f-spot/unique-sharp.dll
lib/f-spot/unique-sharp.dll.config
lib/pkgconfig/f-spot.pc
@ -274,6 +273,47 @@ share/gnome/help/f-spot/C/tags.page
share/gnome/help/f-spot/C/upload-to-web.page
share/gnome/help/f-spot/C/versioning.page
share/gnome/help/f-spot/C/zooomr.page
share/gnome/help/f-spot/de/
share/gnome/help/f-spot/de/23hq.page
share/gnome/help/f-spot/de/adjust-color.page
share/gnome/help/f-spot/de/cd.page
share/gnome/help/f-spot/de/colors.page
share/gnome/help/f-spot/de/date-search.page
share/gnome/help/f-spot/de/enhancements.page
share/gnome/help/f-spot/de/extensions.page
share/gnome/help/f-spot/de/facebook.page
share/gnome/help/f-spot/de/figures/
share/gnome/help/f-spot/de/figures/f-spot-adjust-colors.png
share/gnome/help/f-spot/de/figures/f-spot-autocolor.png
share/gnome/help/f-spot/de/figures/f-spot-crop.png
share/gnome/help/f-spot/de/figures/f-spot-desaturate.png
share/gnome/help/f-spot/de/figures/f-spot-fullscreen.png
share/gnome/help/f-spot/de/figures/f-spot-red-eye.png
share/gnome/help/f-spot/de/figures/f-spot-sepia.png
share/gnome/help/f-spot/de/figures/f-spot-slideshow.png
share/gnome/help/f-spot/de/figures/f-spot-soft-focus.png
share/gnome/help/f-spot/de/figures/f-spot-straighten.png
share/gnome/help/f-spot/de/file-management.page
share/gnome/help/f-spot/de/flickr.page
share/gnome/help/f-spot/de/folder.page
share/gnome/help/f-spot/de/general-editing.page
share/gnome/help/f-spot/de/import-photos.page
share/gnome/help/f-spot/de/import-roll-search.page
share/gnome/help/f-spot/de/index.page
share/gnome/help/f-spot/de/introduction.page
share/gnome/help/f-spot/de/picasa.page
share/gnome/help/f-spot/de/rate-search.page
share/gnome/help/f-spot/de/ratings.page
share/gnome/help/f-spot/de/smugmug.page
share/gnome/help/f-spot/de/tag-attach.page
share/gnome/help/f-spot/de/tag-creation.page
share/gnome/help/f-spot/de/tag-delete.page
share/gnome/help/f-spot/de/tag-remove.page
share/gnome/help/f-spot/de/tag-search.page
share/gnome/help/f-spot/de/tags.page
share/gnome/help/f-spot/de/upload-to-web.page
share/gnome/help/f-spot/de/versioning.page
share/gnome/help/f-spot/de/zooomr.page
share/icons/hicolor/128x128/apps/f-spot.png
share/icons/hicolor/16x16/apps/f-spot.png
share/icons/hicolor/22x22/apps/f-spot.png
@ -283,6 +323,7 @@ share/icons/hicolor/32x32/apps/f-spot.png
share/icons/hicolor/48x48/apps/f-spot.png
share/locale/ar/LC_MESSAGES/f-spot.mo
share/locale/as/LC_MESSAGES/f-spot.mo
share/locale/ast/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