head 1.12; access; symbols pkgsrc-2019Q4:1.11.0.40 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.36 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.34 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.32 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.30 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.28 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.26 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.24 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.22 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.20 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.16 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.14 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.12 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.10 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.8 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.6 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.4 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.2 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.10.0.6 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.4 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.2 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.9.0.24 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.22 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.20 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.18 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.16 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.14 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.12 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.10 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.8 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.6 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.4 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.2 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.8.0.2 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.3.0.2 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.2.0.2 pkgsrc-2010Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2020.01.21.16.15.05; author nia; state dead; branches; next 1.11; commitid PWpmEYdwmSAdKzTB; 1.11 date 2015.08.23.14.04.32; author wiz; state Exp; branches; next 1.10; commitid K8mgRn8Ya882Qoyy; 1.10 date 2014.11.25.10.07.18; author wiz; state Exp; branches; next 1.9; commitid mxfnoc68YAcJeyZx; 1.9 date 2011.10.22.13.51.02; author gls; state Exp; branches; next 1.8; 1.8 date 2011.09.12.18.15.03; author drochner; state Exp; branches; next 1.7; 1.7 date 2011.07.12.19.00.57; author drochner; state Exp; branches; next 1.6; 1.6 date 2011.05.14.18.56.00; author gls; state Exp; branches; next 1.5; 1.5 date 2011.04.14.16.24.39; author drochner; state Exp; branches; next 1.4; 1.4 date 2011.04.05.18.34.20; author drochner; state Exp; branches; next 1.3; 1.3 date 2011.01.11.20.46.16; author gls; state Exp; branches; next 1.2; 1.2 date 2010.12.13.20.36.53; author gls; state Exp; branches; next 1.1; 1.1 date 2010.11.15.19.04.53; author gls; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.11.15.19.04.53; author gls; state Exp; branches; next ; desc @@ 1.12 log @shotwell: Update to 0.30.8 Updated to GNOME 3 / gtk3 version. @ text @$NetBSD: patch-aa,v 1.11 2015/08/23 14:04:32 wiz Exp $ --- Makefile.orig 2015-03-24 00:38:31.000000000 +0000 +++ Makefile @@@@ -263,7 +263,6 @@@@ EXT_PKGS = \ gstreamer-base-1.0 \ gstreamer-pbutils-1.0 \ gtk+-3.0 \ - gudev-1.0 \ libexif \ libgphoto2 \ json-glib-1.0 \ @@@@ -295,7 +294,6 @@@@ EXT_PKG_VERSIONS = \ gstreamer-plugins-base-1.0 >= 1.0.0 \ gstreamer-pbutils-1.0 >= 1.0.0 \ gtk+-3.0 >= 3.12.2 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ @@@@ -417,7 +415,7 @@@@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU # Required for gudev-1.0 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE -all: pkgcheck valacheck desktop +all: pkgcheck desktop ifdef ENABLE_BUILD_FOR_GLADE all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE) @@@@ -489,7 +487,7 @@@@ ifndef DISABLE_DESKTOP_VALIDATE else rm -f misc/shotwell.desktop.errors; \ fi endif - + misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES) cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \ @@@@ -694,7 +692,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU .PHONY: $(PLUGINS_DIR) $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS) - $(call check_valac_version) @@$(MAKE) --directory=$@@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \ PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)" @ 1.11 log @Update to 0.22.0: Shotwell 0.22.0 - 23 March 2015 ------------------------------- * Improved metadata support for Facebook upload (#742163) * Saved search now properly supports text is-set, not-set (#743924, #743923) * Import title, exposure time when available * User interface improvements (#744291, #719284, more) * Sort photos by filename (#717878) * Updated translations Shotwell 0.21.0 - 2 February 2015 --------------------------------- * User interface refresh (#742326, #742443) * Fix Shotwell Viewer .desktop file (#743799) * Natural sorting of photo titles (#717960) * Improved video thumbnailer (#739396, #741821) * Updated translations @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $ @ 1.10 log @Update shotwell using shotwell-gtk3. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2014/11/24 16:08:38 wiz Exp $ d3 1 a3 1 --- Makefile.orig 2013-11-19 02:16:36.000000000 +0000 d5 1 a5 1 @@@@ -315,7 +315,6 @@@@ EXT_PKGS = \ d13 1 a13 1 @@@@ -347,7 +346,6 @@@@ EXT_PKG_VERSIONS = \ d16 1 a16 1 gtk+-3.0 >= 3.6.0 \ d21 1 a21 1 @@@@ -461,7 +459,7 @@@@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU d30 1 a30 1 @@@@ -535,7 +533,7 @@@@ ifndef DISABLE_DESKTOP_VALIDATE d39 1 a39 1 @@@@ -736,7 +732,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU @ 1.9 log @Updated graphics/shotwell to 0.11.5 Upstream changes: 0.11.5: ------- This release fixes an issue in which Shotwell could crash when using the "Import from F-Spot" feature for the subset of users who continued to experience this problem after the 0.11.4 upgrade. We recommend that all users upgrade. 0.11.4; ------- This release fixes two critical issues present in all previous versions of Shotwell 0.11.x that could cause Shotwell to crash when using the Import from F-Spot feature. We recommend that all users upgrade. 0.11.3: ------- This releases fixes two critical bugs, including: * Shotwell could crash at the end of photo imports where one or more files failed to import correctly * Showell crashed when a new tag containing a slash (/) character was created by context-clicking on the Tags item in the sidebar and choosing New and improves error reporting in the publishing system. 0.11.2: ------- * Improved stability working with hierarchical tags * Importing hierarchical tags from F-Spot doesn't generate duplicate top-level tags * Fixed "server redirect contained no session key" errors in the Facebook Connector * Corrected problems with item counts over mixed media @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $ d3 1 a3 1 --- Makefile.orig 2011-10-13 19:26:06.000000000 +0000 d5 4 a8 4 @@@@ -273,7 +273,6 @@@@ EXT_PKGS = \ gstreamer-base-0.10 \ gstreamer-pbutils-0.10 \ gtk+-2.0 \ d12 5 a16 5 libsoup-2.4 \ @@@@ -309,7 +308,6 @@@@ EXT_PKG_VERSIONS = \ gstreamer-base-0.10 >= 0.10.28 \ gstreamer-pbutils-0.10 >= 0.10.32 \ gtk+-2.0 >= 2.18.0 \ d20 20 a39 32 libsoup-2.4 >= 2.26.0 \ @@@@ -434,7 +432,7 @@@@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA # if not available. LIBRAW_CONFIG=./libraw-config -define check_valac_version +define xcheck_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 ),) @@@@ -660,7 +658,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) - $(call check_valac_version) @@echo Compiling Vala code... @@mkdir -p $(BUILD_DIR) @@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \ @@@@ -677,10 +674,10 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) @@ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile - $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@@ $< + $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@@ $< $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(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) @@@@ -691,7 +688,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU a46 9 @@@@ -709,7 +705,7 @@@@ docs: glade: lib$(PROGRAM).so lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@@ + $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@@ .PHONY: pkgcheck pkgcheck: @ 1.8 log @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 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2011-08-23 18:53:10.000000000 +0000 d5 1 a5 1 @@@@ -269,7 +269,6 @@@@ EXT_PKGS = \ d13 1 a13 1 @@@@ -302,7 +301,6 @@@@ EXT_PKG_VERSIONS = \ d21 1 a21 10 @@@@ -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) - + DIST_TAR = $(PROGRAM)-$(VERSION).tar DIST_TAR_BZ2 = $(DIST_TAR).bz2 @@@@ -427,7 +425,7 @@@@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA d30 1 a30 1 @@@@ -656,7 +654,6 @@@@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U d38 1 a38 1 @@@@ -673,10 +670,10 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) d46 1 a46 1 - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@@ d51 1 a51 1 @@@@ -687,7 +684,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU d59 1 a59 1 @@@@ -705,7 +701,7 @@@@ docs: d63 1 a63 1 - $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@@ @ 1.7 log @update to 0.10.1 changes: -Fixes "Hide Photos Already Imported" -Multiple editing bugs fixed -Resolves crash when two or more cameras have the same name -Documentation now includes saved searches -Piwigo bugs fixed -Translation updates @ text @d3 1 a3 3 Remove gudev requirements. Fix m4 params and libraw configuration. --- Makefile.orig 2011-06-02 19:11:21.000000000 +0000 d5 1 a5 2 @@@@ -264,7 +264,6 @@@@ EXT_PKGS = \ gstreamer-0.10 \ d7 1 d13 1 a13 2 @@@@ -296,7 +295,6 @@@@ EXT_PKG_VERSIONS = \ gstreamer-0.10 >= 0.10.28 \ d15 1 d21 1 a21 1 @@@@ -375,7 +373,7 @@@@ DIST_FILES = Makefile configure chkver $ d30 1 a30 1 @@@@ -420,7 +418,7 @@@@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA d39 1 a39 1 @@@@ -638,7 +636,6 @@@@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U d47 1 a47 1 @@@@ -655,10 +652,10 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) d57 1 d60 1 a60 2 $(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg)) @@@@ -668,7 +665,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU d68 1 a68 1 @@@@ -686,7 +682,7 @@@@ docs: @ 1.6 log @Update graphics/shotwell to 0.9.3 Pkgsrc changes: - Add librsvg as a dependency, as it is required to deal with .svg icons. Upstream chnages: * Resolves issue where setting the desktop background didn't work in Gnome3 * Mimics are now deleted when a RAW photo is removed * Event dates are now only shown once in the Event view * Fixes a number of translation issues @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2011/04/14 16:24:39 drochner Exp $ d4 2 a5 1 --- Makefile.orig 2011-04-12 22:04:01.000000000 +0000 d7 1 a7 1 @@@@ -261,7 +261,6 @@@@ EXT_PKGS = \ d15 1 a15 1 @@@@ -288,7 +287,6 @@@@ EXT_PKG_VERSIONS = \ d23 10 a32 1 @@@@ -394,7 +392,7 @@@@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA d35 1 a35 1 d41 2 a42 11 @@@@ -574,7 +572,7 @@@@ $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) $(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4 @@mkdir -p $(UNITIZE_DIR) @@$(foreach group,$(APP_GROUPS),\ - `m4 '--define=_APP_GROUP_=$(group)' '--define=_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '--define=_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`) + `m4 '-D_APP_GROUP_=$(group)' '-D_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '-D_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`) @@$(foreach nm,$(UNIT_NAMESPACES),\ `m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) @@touch $@@ @@@@ -584,7 +582,6 @@@@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U d46 4 a49 4 ifndef ASSUME_PKGS ifdef EXT_PKG_VERSIONS @@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)' @@@@ -611,17 +608,16 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) d51 1 a51 1 d55 2 a56 2 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) d58 6 a63 5 + $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR) @@ d69 2 a70 2 @@@@ -639,5 +635,5 @@@@ docs: d72 1 a72 1 d76 3 @ 1.5 log @update to 0.9.2 This is a bug fix release that fixes a translation issue and several critical publishing bugs. @ text @d1 1 a1 1 $NetBSD$ d3 1 d25 1 a25 1 d41 1 a41 1 d50 1 a50 1 d54 1 a54 1 d58 1 a58 1 d61 1 a61 1 d67 1 a67 1 d70 1 a70 1 a73 1 @ 1.4 log @update to 0.9.1 changes: -new search bar -TIFF support -plugin framework, mostly for exporting -many more improvements and bugfixes @ text @d3 1 a3 1 --- Makefile.orig 2011-04-05 00:35:38.000000000 +0000 d30 1 a30 9 @@@@ -568,15 +566,15 @@@@ ifdef INSTALL_HEADERS endif $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) - m4 '--define=_VERSION_=$(VERSION)' '--define=_PREFIX_=$(PREFIX)' '--define=_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \ - '--define=_LIB_=$(LIB)' $< > $@@ + m4 '-D_VERSION_=$(VERSION)' '-D_PREFIX_=$(PREFIX)' '-D_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \ + '-D_LIB_=$(LIB)' $< > $@@ d37 1 a37 2 - `m4 '--define=_UNIT_NAME_=$(nm)' '--define=_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '--define=_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) + `m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) a38 2 $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP) @ 1.3 log @pdate to version 0.8.0 Upstream changes: * Video support for most major video formats, including importing them off of camera and adding them to events and tags. * Publish videos to major Web services, including YouTube, Flickr, Facebook, and PicasaWeb. * Runtime monitoring of library directory and auto-import of newly created files. * Background writing of metadata (tags, titles, ratings, orientation, and exposure date) to master files (user-configurable). * Flagging photos for batch operations. * Set multiple photos to desktop background slideshow. * Numerous translation updates. * Various bug fixes. @ text @d3 1 a3 1 --- Makefile.orig 2010-12-23 23:01:46.000000000 +0000 d5 2 a6 1 @@@@ -280,7 +280,7 @@@@ EXT_PKGS = \ a8 1 glib-2.0 \ a9 2 + gmodule-2.0 \ json-glib-1.0 \ d12 2 a13 2 @@@@ -306,7 +306,6 @@@@ EXT_PKG_VERSIONS = \ glib-2.0 >= 2.24.0 \ d16 1 a17 1 json-glib-1.0 >= 0.7.6 \ d20 35 a54 5 @@@@ -504,7 +503,6 @@@@ endif $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \ $(CONFIG_IN) - @@ ./minver `$(VALAC) --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `$(VALAC) --version` '\b.'; exit 1 ) d58 1 a58 1 @@@@ -530,13 +528,13 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) d69 10 @ 1.2 log @Fix patch-aa to find new graphics/libraw Add graphics/lcms as dependency, required by libraw. PKG_REVISION++ @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2010/11/15 19:04:53 gls Exp $ d3 1 a3 1 --- Makefile.orig 2010-09-10 22:55:54.000000000 +0000 d5 2 a6 14 @@@@ -124,11 +124,6 @@@@ SRC_FILES = \ FSpotDatabaseDriver.vala \ FSpotDatabaseTables.vala -ifndef LINUX -SRC_FILES += \ - GConf.vala -endif - VAPI_FILES = \ libexif.vapi \ libgphoto2.vapi \ @@@@ -268,6 +263,7 @@@@ EXT_PKGS = \ gee-1.0 \ d9 1 d11 1 a12 9 sqlite3 \ gexiv2 @@@@ -275,7 +271,6 @@@@ EXT_PKGS = \ LIBRAW_PKG = \ libraw -ifdef LINUX EXT_PKGS += \ gconf-2.0 \ d14 7 a20 18 @@@@ -283,10 +278,8 @@@@ EXT_PKGS += \ libxml-2.0 \ unique-1.0 \ webkit-1.0 \ - gudev-1.0 \ dbus-glib-1 \ gdk-x11-2.0 -endif # libraw is handled separately (see note below); when libraw-config is no longer needed, the version # should be added to this list @@@@ -301,7 +294,6 @@@@ EXT_PKG_VERSIONS = \ LIBRAW_VERSION = \ 0.9.0 -ifdef LINUX EXT_PKG_VERSIONS += \ gconf-2.0 >= 2.22.0 \ d22 1 a22 36 @@@@ -309,9 +301,7 @@@@ EXT_PKG_VERSIONS += \ libxml-2.0 >= 2.6.32 \ unique-1.0 >= 1.0.0 \ webkit-1.0 >= 1.1.5 \ - gudev-1.0 >= 145 \ dbus-glib-1 >= 0.80 -endif PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG) @@@@ -366,7 +356,7 @@@@ ifndef BUILD_DEBUG # -mwindows prevents a console window from appearing when we run Shotwell, but also hides # all logging/debugging output, so we specify it only in a release build. VALA_LDFLAGS += -mwindows -endif +endif shotwell.res: windows/shotwell.rc windres windows/shotwell.rc -O coff -o shotwell.res @@@@ -470,7 +460,6 @@@@ endif ifndef DISABLE_DESKTOP_UPDATE -update-desktop-database || : endif -ifdef LINUX ifndef DISABLE_SCHEMAS_INSTALL GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas else @@@@ -487,7 +476,6 @@@@ ifndef DISABLE_HELP_INSTALL mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures endif -endif -$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \ $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \ $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`) @@@@ -518,7 +506,6 @@@@ endif d26 1 a26 1 - @@ ./minver `valac --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `valac --version` '\b.'; exit 1 ) d29 2 a30 2 @@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)' @@@@ -546,15 +533,15 @@@@ $(EXPANDED_C_FILES): $(VALA_STAMP) a46 2 shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss iscc windows\winstall.iss @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d100 1 a100 1 + $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags raw` -o $@@ $< d104 1 a104 1 + $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -o $@@ d110 1 a110 1 + $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@@ @ 1.1.1.1 log @Import shotwell 0.7.2 into the NetBSD Packages collection. Shotwell is a photo organizer for the GNOME desktop. It lets you import photos from disk or camera, organize them in various ways, view them in full-window or fullscreen mode, and export them to share with others. @ text @@