Apply partial half-baked update to 0.8.2 to fix longtime problem with
missing Mono DLLs at config time. This fixes that problem but fails because it needs gnome-keyring-sharp, which we don't yet have in pkgsrc. I'm committing anyway in the hopes someone else will deal with that because the package hasn't been buildable in a long time and this does constitute a step forward. Upstream changes: f-spot 0.8.2 - Dec 19 2010 - Error! ----------------------------------- - A small error slipped through while releasing 0.8.1, this release fixes that one. f-spot 0.8.1 - Dec 19 2010 - Winter Fixes! ------------------------------------------ - Bug fix release for the 0.8.x series. - Critical bug fixes and translation updates. Upgrading highly recommended. - Infobox crasher fixed (Paul Wellner Bou) - CRW crasher (Christian Krause) - XMP sidecar file naming now uses file.jpg.xmp, falls back to old file.xmp if present (Ruben Vermeersch) - French Mallard Documentation (Bruno Brouard) - Slovenian Mallard Documentation (Matej UrbanÄiÄ) - Tons of translations - Loads of obsolete code fixed (Tim Howard) - DateTime.DaysInMonth crasher fix (Tim Howard) - Mono.Data.Sqlite removed (Tim Howard) - Switch to official Taglib# repository. - Lots of Taglib# fixes. - Rotation crasher (Nuno Ferreira) - Gallery export crasher for Unicode characters (Martin Slota) - A fix for the very annoying Int32.MaxValue bug. - Around 20 bugs closed (http://bit.ly/hCAwkd) f-spot 0.8.0 - Sep 15 2010 - Stabilized --------------------------------------- - First long-term stable release of the 0.8.x series. - Contains everything from the 0.7.x series as well as some critical extra fixes that were added during the past week. - Some regressions in terms of support for obscure RAW formats, but lots of improvements overall, definitely in terms of stability. - Nearly 300 bugs closed since 0.6.2 (http://bit.ly/bqXLLt) - This series will continue to be maintained and released, but only with improvements and fixes. New development will happen on the master branch and result in 0.9.x releases. f-spot 0.7.3 - Sep 9 2010 - Release Candidate ---------------------------------------------- - Release candidate for the 0.8.0 release. - Completely replaced Glade usage by GtkBuilder (Paul Lange) - Cleanups and refactorings all accross (Ruben Vermeersch) - Correctly decide when to make the library location sensitive (Iain Lane) - Fixes in Taglib#. - IconView has been split up and made much more modular (Mike Gemünde) - More Hyenafication (Mike Gemünde) - Copy to Clipboard fixed (Mike Gemünde) - Another 20 bugs closed (http://bit.ly/a9FWVh) f-spot 0.7.2 - Aug 11 2010 - Retooled ------------------------------------- - Third release of the unstable 0.7 development series. Features a fully restructured source tree with full Monodevelop build support. Solves some of the regressions introduced in 0.7.1. - Reorganized source tree for clarity, builds with Monodevelop. - Switched from QueuedSqliteDatabase to HyenaSqliteConnection (Mike Gemünde) - Build tweaks (Christian Krause) - More GtkBuilder transition (Eric Faehnrich) - Reliability improvements (lots of them) for metadata handling (Mike Gemünde, Ruben Vermeersch) - Prune empty directories when deleting photos, import usability enhancements (Mike Wallick) - Big race-condition fix in import (Paul Wellner Bou) - Loads of improvements to Taglib#, in terms of handling broken files, extra format support (Pentax, Panasonic, Leica), stability and correctness (Ruben Vermeersch) - Reporting of import errors. - Speedups to repeated imports of the same directory. - Piles of cleanups and general stability improvements. - Over 50 bugs closed (http://bit.ly/cqpC3y) f-spot 0.7.1 - Jul 14 2010 - The Big Switch ------------------------------------------- - Second release of the unstable 0.7 development series. Most notably including a switch to Taglib#. Regressions in the amount of RAW types supported, will be fixed before releasing 0.8. - Switched to a new Taglib#-backed metadata layer. This is a huge change which should bring us increased stability (in the long run) and a much easier to maintain metadata layer than the one we previously had. Also enables some funky new features like XMP sidecars. (Ruben Vermeersch, Mike Gemünde) - Add support for XMP sidecars (Ruben Vermeersch) - Add "remove from camera after import"-option (Ruben Vermeersch) - Start of a massive backend cleanup (Mike Gemünde) - Upstreaming of a lot of Debian/Ubuntu patches (Iain Lane) - Several dialogs converted from glade to GtkBuilder (Ademir Mendoza, Nick Van Eeckhout, Peter Goetz, Trevor Buchanan) - Code refactorings and cleanups, increased Hyena adoption (Evan Briones, Paul Lange, Paul Wellner Bou) - Small usability improvements (Alex Launi, Anton Keks, Iain Churcher, Tomas Kovacik) - More build retooling (Bertrand Lorentz, Christian Krause, Gabriel Burt) - Many bugs fixed and improvements in stability: Over 85 bugs closed (http://bit.ly/aKyQOd) f-spot 0.7.0 - Jun 16 2010 - Full Steam Ahead! ---------------------------------------------- - First release of the unstable 0.7 development series. Massive changes. - Reparenting and detaching support (Anton Keks) - A new Mallard-based documentation (Harold Schreckengost) - No longer embeds flickrnet, uses distribution copy (Iain Lane) - Adoption of a large amount of Hyena functionality (Paul Lange, Peter Goetz) - No longer embeds gnome-keyring-sharp - Completely rewritten import, much faster and less memory hungry (Ruben Vermeersch) - No longer use gphoto2-sharp, now uses gvfs which is less crash-pron (Ruben Vermeersch) - Fix Facebook support (Ruben Vermeersch) - Modernized unit tests - Revamped build (Mike Gemünde) - Much improved duplicate detection (much faster too) (Ruben Vermeersch) - Mouse selection in Iconview (Vincent Pomey) - Image panning support using middle mouse button (Wojciech Dzierżanowski) - Timeline slider now restricted to the size of the window (Iain Churcher) - Over 100 bugs closed (http://bit.ly/cyVjnD)
This commit is contained in:
dholland
parent
9a0f208f07
commit
acad638c12
6 changed files with 34 additions and 85 deletions
|
|
@ -1,10 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.37 2012/04/27 12:31:50 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.38 2012/05/10 17:46:34 dholland Exp $
|
||||
#
|
||||
|
||||
DISTNAME= f-spot-0.6.2
|
||||
PKGREVISION= 15
|
||||
DISTNAME= f-spot-0.8.2
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.8/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
|
|
@ -19,24 +18,26 @@ USE_TOOLS+= gmake intltool pkg-config bash:run msgfmt
|
|||
|
||||
MAKE_JOBS_SAFE= no
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
.for platform in ${LP64PLATFORMS}
|
||||
. if ${MACHINE_PLATFORM:M${platform}}
|
||||
CONFIGURE_ENV+= EXTRACSDEFINES=-define:LONG_IS_64BITS
|
||||
. endif
|
||||
.endfor
|
||||
#.include "../../mk/bsd.prefs.mk"
|
||||
#.for platform in ${LP64PLATFORMS}
|
||||
#. if ${MACHINE_PLATFORM:M${platform}}
|
||||
#CONFIGURE_ENV+= EXTRACSDEFINES=-define:LONG_IS_64BITS
|
||||
#. endif
|
||||
#.endfor
|
||||
|
||||
PKGCONFIG_OVERRIDE+= f-spot.pc.in
|
||||
|
||||
REPLACE_BASH+= icon-theme-installer
|
||||
REPLACE_BASH+= src/f-spot.in
|
||||
REPLACE_BASH+= src/Clients/MainApp/f-spot.in
|
||||
REPLACE_BASH+= tools/f-spot-import
|
||||
|
||||
SUBST_CLASSES+= fix-x11
|
||||
SUBST_STAGE.fix-x11= post-patch
|
||||
SUBST_MESSAGE.fix-x11= Fixing libX11 references
|
||||
SUBST_FILES.fix-x11= src/FSpot.Utils.dll.config
|
||||
SUBST_FILES.fix-x11+= src/f-spot.exe.config.in
|
||||
SUBST_FILES.fix-x11= src/Core/FSpot.Utils/FSpot.Utils.dll.config.in
|
||||
SUBST_FILES.fix-x11+= src/Core/FSpot.Utils/FSpot.Utils.dll.config
|
||||
SUBST_FILES.fix-x11+= build/DllMapVerifier.cs
|
||||
SUBST_FILES.fix-x11+= lib/Hyena/build/DllMapVerifier.cs
|
||||
SUBST_SED.fix-x11= -e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
|
||||
|
||||
GCONF_SCHEMAS= f-spot.schemas
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.7 2010/05/17 17:46:44 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.8 2012/05/10 17:46:34 dholland Exp $
|
||||
|
||||
SHA1 (f-spot-0.6.2.tar.bz2) = bafd3edfac716769ac6f230c5d9f359550e624e1
|
||||
RMD160 (f-spot-0.6.2.tar.bz2) = ed26ef728c920e5fe05e9bb0b5951ea0b4ec3f49
|
||||
Size (f-spot-0.6.2.tar.bz2) = 2913007 bytes
|
||||
SHA1 (patch-ab) = 2c4744ff8915c7e98ceb9a402447e168c2b972b5
|
||||
SHA1 (patch-ac) = b572e3dde7fb572b5b772492e32c75b1e9b9a517
|
||||
SHA1 (patch-ad) = 4aec4a1c7a08f169f7909143e9e8e1120ac53a42
|
||||
SHA1 (f-spot-0.8.2.tar.bz2) = 258e30a11ac24f963a47ead19c3d14bf755816e5
|
||||
RMD160 (f-spot-0.8.2.tar.bz2) = 658f437cb336fc29a718cf021ba54ee62dbee757
|
||||
Size (f-spot-0.8.2.tar.bz2) = 3222712 bytes
|
||||
SHA1 (patch-Makefile_in) = 313c3ad5fb9859a2891c38d49776347747949162
|
||||
|
|
|
|||
15
graphics/f-spot/patches/patch-Makefile_in
Normal file
15
graphics/f-spot/patches/patch-Makefile_in
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-Makefile_in,v 1.1 2012/05/10 17:46:34 dholland Exp $
|
||||
|
||||
Do gconf schemas the pkgsrc way.
|
||||
|
||||
--- Makefile.in~ 2010-12-19 13:55:19.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -391,7 +391,7 @@ SUBDIRS = \
|
||||
src \
|
||||
tests
|
||||
|
||||
-schemadir = $(sysconfdir)/gconf/schemas
|
||||
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schema_in_files = f-spot.schemas.in
|
||||
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
|
||||
CLEANFILES = \
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.1 2010/02/16 12:16:23 drochner Exp $
|
||||
|
||||
--- lib/libgphoto2-sharp/CameraFilesystem.cs.orig 2009-11-04 19:34:32.000000000 +0000
|
||||
+++ lib/libgphoto2-sharp/CameraFilesystem.cs
|
||||
@@ -45,7 +45,11 @@ namespace LibGPhoto2
|
||||
{
|
||||
public CameraFileInfoFields fields;
|
||||
public CameraFileStatus status;
|
||||
+#if LONG_IS_64BITS
|
||||
public ulong size;
|
||||
+#else
|
||||
+ public uint size;
|
||||
+#endif
|
||||
[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
|
||||
}
|
||||
|
||||
@@ -54,7 +58,11 @@ namespace LibGPhoto2
|
||||
{
|
||||
public CameraFileInfoFields fields;
|
||||
public CameraFileStatus status;
|
||||
+#if LONG_IS_64BITS
|
||||
public ulong size;
|
||||
+#else
|
||||
+ public uint size;
|
||||
+#endif
|
||||
[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
|
||||
|
||||
public uint width, height;
|
||||
@@ -65,7 +73,11 @@ namespace LibGPhoto2
|
||||
{
|
||||
public CameraFileInfoFields fields;
|
||||
public CameraFileStatus status;
|
||||
+#if LONG_IS_64BITS
|
||||
public ulong size;
|
||||
+#else
|
||||
+ public uint size;
|
||||
+#endif
|
||||
[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
|
||||
|
||||
public uint width, height;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.2 2010/05/17 17:46:44 drochner Exp $
|
||||
|
||||
--- configure.orig 2010-05-14 18:39:34.000000000 +0000
|
||||
+++ configure
|
||||
@@ -17786,6 +17786,7 @@ if pkg-config --at-least-version=2.16 gt
|
||||
CSC_DEFINES="$CSC_DEFINES -d:GTK_2_16"
|
||||
fi
|
||||
|
||||
+CSC_DEFINES="$CSC_DEFINES $EXTRACSDEFINES"
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDESK_DBUS" >&5
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.1 2010/05/17 17:46:44 drochner Exp $
|
||||
|
||||
--- Makefile.in.orig 2010-05-17 17:12:48.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -367,7 +367,7 @@ desktop_in_files = \
|
||||
desktop_files = $(desktop_in_files:.desktop.in=.desktop)
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = f-spot.pc
|
||||
-schemadir = $(sysconfdir)/gconf/schemas
|
||||
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schema_in_files = f-spot.schemas.in
|
||||
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
|
||||
Applicationsdir = $(datadir)/applications
|
||||
Loading…
Reference in a new issue