diff options
author | drochner <drochner> | 2011-09-12 18:15:03 +0000 |
---|---|---|
committer | drochner <drochner> | 2011-09-12 18:15:03 +0000 |
commit | 1dd78e3012c889cef9487e30956a6463a2ffd511 (patch) | |
tree | e8991e2e563ffb68d97013853e8ed37206e73cfd | |
parent | 6f2b62a676a935230c9c3ee59233b824d9b5832d (diff) | |
download | pkgsrc-1dd78e3012c889cef9487e30956a6463a2ffd511.tar.gz |
update to 0.11.1
changes:
-Tags can now be organized into hierarchical trees
-Paired RAW + JPEG images are treated as a single photo when imported
from a camera
-Select different developers for RAW photos: use the development produced
by Shotwell or by your camera
-Shotwell now uses GSettings instead of GConf to store its
configuration information
-"Hide Photos Already Imported" setting persists between imports
-Several all-new saved search options
-JPEG mimics of RAW images are no longer stored in your home directory,
and are now created on demand
-Shotwell now supports Windows Bitmap (.bmp) images
-rw-r--r-- | graphics/shotwell/Makefile | 18 | ||||
-rw-r--r-- | graphics/shotwell/PLIST | 10 | ||||
-rw-r--r-- | graphics/shotwell/distinfo | 12 | ||||
-rw-r--r-- | graphics/shotwell/patches/patch-aa | 28 | ||||
-rw-r--r-- | graphics/shotwell/patches/patch-src_photos_GRaw.vala | 38 | ||||
-rw-r--r-- | graphics/shotwell/patches/patch-vapi_libraw.vapi | 19 |
6 files changed, 30 insertions, 95 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 21271b86791..f8fafe36f40 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2011/07/31 17:37:00 gls Exp $ +# $NetBSD: Makefile,v 1.22 2011/09/12 18:15:03 drochner Exp $ # -DISTNAME= shotwell-0.10.1 -PKGREVISION= 1 +DISTNAME= shotwell-0.11.1 CATEGORIES= graphics -MASTER_SITES= http://yorba.org/download/shotwell/0.10/ +MASTER_SITES= http://yorba.org/download/shotwell/0.11/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgrsc-users@NetBSD.org @@ -22,17 +21,10 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --assume-pkgs CONFIGURE_ENV+= --define=NO_CAMERA -REPLACE_SH+= minver configure libraw-config - -GCONF_SCHEMAS= shotwell.schemas -INSTALLATION_DIRS+= share/gconf/schemas - -post-install: - ${INSTALL_DATA} ${WRKSRC}/misc/shotwell.schemas \ - ${DESTDIR}${PREFIX}/share/gconf/schemas +REPLACE_SH+= configure .include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" +.include "../../devel/glib2/schemas.mk" .include "../../devel/libgee/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/graphics/shotwell/PLIST b/graphics/shotwell/PLIST index c51b9ffc806..1cf2ccd289e 100644 --- a/graphics/shotwell/PLIST +++ b/graphics/shotwell/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2011/07/12 19:00:57 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2011/09/12 18:15:03 drochner Exp $ bin/shotwell bin/shotwell-video-thumbnailer lib/shotwell/plugins/builtin/facebook.png @@ -6,6 +6,7 @@ lib/shotwell/plugins/builtin/flickr.png lib/shotwell/plugins/builtin/picasa.png 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/shotwell-publishing-extras.so lib/shotwell/plugins/builtin/shotwell-publishing.so lib/shotwell/plugins/builtin/shotwell-transitions.so @@ -14,7 +15,8 @@ lib/shotwell/plugins/builtin/yandex_publish_model.glade lib/shotwell/plugins/builtin/youtube.png share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop -share/gconf/schemas/shotwell.schemas +share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml +share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml share/gnome/help/shotwell/C/edit-adjustments.page share/gnome/help/shotwell/C/edit-crop.page share/gnome/help/shotwell/C/edit-enhance.page @@ -210,9 +212,11 @@ share/shotwell/ui/offline.ui share/shotwell/ui/photo.ui share/shotwell/ui/savedsearch.ui share/shotwell/ui/search_bar.ui +share/shotwell/ui/search_sidebar_context.ui share/shotwell/ui/set_background_dialog.glade share/shotwell/ui/shotwell.glade share/shotwell/ui/shotwell.xml -share/shotwell/ui/sidebar_default.ui +share/shotwell/ui/sidebar_default_context.ui +share/shotwell/ui/tag_sidebar_context.ui share/shotwell/ui/tags.ui share/shotwell/ui/trash.ui diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo index 9aa25b85183..b64bf813b43 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.10 2011/07/31 17:37:00 gls Exp $ +$NetBSD: distinfo,v 1.11 2011/09/12 18:15:03 drochner Exp $ -SHA1 (shotwell-0.10.1.tar.bz2) = abd6e771168910943101b62d76f7768a49e69be9 -RMD160 (shotwell-0.10.1.tar.bz2) = 44cccbebf4f1bf024229da9afbcc6d4db510be96 -Size (shotwell-0.10.1.tar.bz2) = 1483679 bytes -SHA1 (patch-aa) = 8eed6766df5ef9084a47c92fdbd85d3fc0f60827 +SHA1 (shotwell-0.11.1.tar.bz2) = 84c85291a22bf7a95f51cf0341d12ea0355f1415 +RMD160 (shotwell-0.11.1.tar.bz2) = 51b96dccfe8665551fb416d7a444c5f94b0358a1 +Size (shotwell-0.11.1.tar.bz2) = 1545164 bytes +SHA1 (patch-aa) = a13a2a1e9da42c3293c95e21d14e8b503bc35805 SHA1 (patch-ab) = 07503807a44fe20ba33481eb3d8fde9e34c460c0 -SHA1 (patch-src_photos_GRaw.vala) = a66ec94eeacef7270c46afb3635e1582eda5e33c -SHA1 (patch-vapi_libraw.vapi) = b3c4a64717a51f45ebb9b2e70916f77f91b0d606 diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa index 9472700ed12..8c66b9cb1d9 100644 --- a/graphics/shotwell/patches/patch-aa +++ b/graphics/shotwell/patches/patch-aa @@ -1,26 +1,24 @@ -$NetBSD: patch-aa,v 1.7 2011/07/12 19:00:57 drochner Exp $ +$NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $ -Remove gudev requirements. Fix m4 params and libraw configuration. - ---- Makefile.orig 2011-06-02 19:11:21.000000000 +0000 +--- Makefile.orig 2011-08-23 18:53:10.000000000 +0000 +++ Makefile -@@ -264,7 +264,6 @@ EXT_PKGS = \ - gstreamer-0.10 \ +@@ -269,7 +269,6 @@ EXT_PKGS = \ gstreamer-base-0.10 \ + gstreamer-pbutils-0.10 \ gtk+-2.0 \ - gudev-1.0 \ libexif \ libgphoto2 \ libsoup-2.4 \ -@@ -296,7 +295,6 @@ EXT_PKG_VERSIONS = \ - gstreamer-0.10 >= 0.10.28 \ +@@ -302,7 +301,6 @@ EXT_PKG_VERSIONS = \ gstreamer-base-0.10 >= 0.10.28 \ + gstreamer-pbutils-0.10 >= 0.10.32 \ gtk+-2.0 >= 2.18.0 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libsoup-2.4 >= 2.26.0 \ -@@ -375,7 +373,7 @@ DIST_FILES = Makefile configure chkver $ +@@ -382,7 +380,7 @@ DIST_FILES = Makefile configure chkver $ $(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \ unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \ $(EXPANDED_THUMBNAILER_SRC_FILES) @@ -29,7 +27,7 @@ Remove gudev requirements. Fix m4 params and libraw configuration. DIST_TAR = $(PROGRAM)-$(VERSION).tar DIST_TAR_BZ2 = $(DIST_TAR).bz2 -@@ -420,7 +418,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA +@@ -427,7 +425,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA # if not available. LIBRAW_CONFIG=./libraw-config @@ -38,7 +36,7 @@ Remove gudev requirements. Fix m4 params and libraw configuration. @ ./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 ),) -@@ -638,7 +636,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U +@@ -656,7 +654,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) @@ -46,7 +44,7 @@ Remove gudev requirements. Fix m4 params and libraw configuration. @echo Compiling Vala code... @mkdir -p $(BUILD_DIR) @$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \ -@@ -655,10 +652,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) +@@ -673,10 +670,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) @ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile @@ -56,10 +54,10 @@ Remove gudev requirements. Fix m4 params and libraw configuration. $(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 libraw` $(EXPORT_FLAGS) -o $@ + glib-compile-schemas misc $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES) - $(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg)) -@@ -668,7 +665,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU +@@ -687,7 +684,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU .PHONY: $(PLUGINS_DIR) $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS) @@ -67,7 +65,7 @@ Remove gudev requirements. Fix m4 params and libraw configuration. @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \ PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)" -@@ -686,7 +682,7 @@ docs: +@@ -705,7 +701,7 @@ docs: glade: lib$(PROGRAM).so lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) diff --git a/graphics/shotwell/patches/patch-src_photos_GRaw.vala b/graphics/shotwell/patches/patch-src_photos_GRaw.vala deleted file mode 100644 index 3f9655e9d3b..00000000000 --- a/graphics/shotwell/patches/patch-src_photos_GRaw.vala +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-src_photos_GRaw.vala,v 1.1 2011/07/31 17:37:01 gls Exp $ - -Fix importing with libraw 0.13.6 & 0.13.7 -Taken from upstream: http://redmine.yorba.org/issues/3868 - ---- src/photos/GRaw.vala.orig 2011-05-26 23:43:17.000000000 +0000 -+++ src/photos/GRaw.vala -@@ -110,8 +110,8 @@ public class ProcessedImage { - } - - public ProcessedImage(LibRaw.Processor proc) throws Exception { -- LibRaw.Result result; -- image = proc.make_mem_image(out result); -+ LibRaw.Result result = LibRaw.Result.SUCCESS; -+ image = proc.make_mem_image(ref result); - throw_exception("ProcessedImage", result); - assert(image != null); - -@@ -122,8 +122,8 @@ public class ProcessedImage { - } - - public ProcessedImage.from_thumb(LibRaw.Processor proc) throws Exception { -- LibRaw.Result result; -- image = proc.make_mem_thumb(out result); -+ LibRaw.Result result = LibRaw.Result.SUCCESS; -+ image = proc.make_mem_thumb(ref result); - throw_exception("ProcessedImage.from_thumb", result); - assert(image != null); - -@@ -280,7 +280,7 @@ private void throw_exception(string call - if (result == LibRaw.Result.SUCCESS) - return; - else if (result > 0) -- throw new Exception.SYSTEM_ERROR("System error %d: %s", (int) result, strerror(result)); -+ throw new Exception.SYSTEM_ERROR("%s: System error %d: %s", caller, (int) result, strerror(result)); - - string msg = "%s: %s".printf(caller, result.to_string()); - diff --git a/graphics/shotwell/patches/patch-vapi_libraw.vapi b/graphics/shotwell/patches/patch-vapi_libraw.vapi deleted file mode 100644 index 63e0dc999bf..00000000000 --- a/graphics/shotwell/patches/patch-vapi_libraw.vapi +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-vapi_libraw.vapi,v 1.1 2011/07/31 17:37:01 gls Exp $ - -Fix importing with libraw 0.13.6 & 0.13.7 -Taken from upstream: http://redmine.yorba.org/issues/3868 - ---- vapi/libraw.vapi.orig 2011-05-26 23:43:17.000000000 +0000 -+++ vapi/libraw.vapi -@@ -182,9 +182,9 @@ public class Processor { - public unowned ImageSizes get_sizes() { return sizes; } - public unowned Thumbnail get_thumbnail() { return thumbnail; } - [CCode (cname="libraw_dcraw_make_mem_image")] -- public ProcessedImage make_mem_image(out Result result); -+ public ProcessedImage make_mem_image(ref Result result); - [CCode (cname="libraw_dcraw_make_mem_thumb")] -- public ProcessedImage make_mem_thumb(out Result result); -+ public ProcessedImage make_mem_thumb(ref Result result); - public Result open_buffer(uint8[] buffer); - public Result open_file(string filename); - [CCode (cname="libraw_dcraw_process")] |