head 1.6; access; symbols pkgsrc-2014Q3:1.4.0.8 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.6 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.4 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.2 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.3.0.4 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.2 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.1.1.0.4 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.2 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc_base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2014.11.25.10.07.18; author wiz; state dead; branches; next 1.5; commitid mxfnoc68YAcJeyZx; 1.5 date 2014.11.24.16.08.38; author wiz; state Exp; branches; next 1.4; commitid odiajhNvmvOGgsZx; 1.4 date 2013.12.04.12.57.47; author drochner; state Exp; branches; next 1.3; commitid q4si9xcr53hwCOfx; 1.3 date 2013.04.08.16.51.59; author drochner; state Exp; branches; next 1.2; 1.2 date 2012.10.10.11.41.12; author drochner; state Exp; branches; next 1.1; 1.1 date 2012.04.11.11.48.30; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2012.04.11.11.48.30; author drochner; state Exp; branches; next ; desc @@ 1.6 log @Update shotwell using shotwell-gtk3. @ text @$NetBSD: patch-aa,v 1.5 2014/11/24 16:08:38 wiz Exp $ --- Makefile.orig 2013-11-19 02:16:36.000000000 +0000 +++ Makefile @@@@ -315,7 +315,6 @@@@ EXT_PKGS = \ gstreamer-base-1.0 \ gstreamer-pbutils-1.0 \ gtk+-3.0 \ - gudev-1.0 \ libexif \ libgphoto2 \ json-glib-1.0 \ @@@@ -347,7 +346,6 @@@@ EXT_PKG_VERSIONS = \ gstreamer-plugins-base-1.0 >= 1.0.0 \ gstreamer-pbutils-1.0 >= 1.0.0 \ gtk+-3.0 >= 3.6.0 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ @@@@ -461,7 +459,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) @@@@ -535,7 +533,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 \ @@@@ -736,7 +732,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.5 log @Update to 0.20.2: Shotwell 0.20.2 - 31 October 2014 --------------------------------- * Set Desktop Slideshow dialog resource now included in distribution (#739095) * Check for rendering failure in video thumbnailer (#738245) * Updated translations Shotwell 0.20.1 - 2 October 2014 -------------------------------- * Corrects problems with navigating photos in full-screen mode (#737092) * Better memory utilization via more conservative pixbuf cache (#715198) * Fixes minor bugs detected by better Vala code analysis Shotwell 0.20.0 - 16 September 2014 ----------------------------------- * Fix crash when deleting a photo in Shotwell Photo Viewer * Fix crash when deleting a photo * Better detection of corrupt files while importing * Updated translations Shotwell 0.19.0 - 21 August 2014 -------------------------------- * Support for Rajce.net and Gallery 3 photo services added * Set background image for lock screen * Better detection of corrupt images during import * Various bug fixes * Updated translations Shotwell 0.18.1 - 30 Jun 2014 ----------------------------- * Fix Flickr publishing errors due to Flickr moving to HTTPs-only * Fix crash when updating photo data/time * Fix crash due to nested tag and changing sidebar selection * Corrected URLs to point to new gnome.org pages Shotwell 0.18.0 - 17 March 2014 ------------------------------- * Compile and install translated help files * Updated translations Shotwell 0.17.2 - 4 March 2014 ------------------------------ * UNIX pipe unnecessarily left open for each imported video * Improved searching for event comments and diacritics * Update translations Shotwell 0.17.1 - 17 February 2014 ---------------------------------- * Updated translations * Parent folder names as search keywords rolled back (see bgo#722756) Shotwell 0.17.0 - 4 February 2014 --------------------------------- * Include parent folder names for keyword search * Tumblr publishing fixed * Bug fixes * Updated translations @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2013/12/04 12:57:47 drochner Exp $ @ 1.4 log @update to 0.15.1 changes: Copy and paste color adjustments between photos Highlights detail adjustment YouTube plugin now uses OAuth / OpenID Videos in Missing Files now re-import properly Improvements when thumbnailing videos Numerous bug fixes @ text @d1 1 a1 1 $NetBSD$ a4 9 @@@@ -10,7 +10,7 @@@@ BUILD_ROOT = 1 ifndef VALAC VALAC := $(shell which valac) else -VALAC := $(shell which $VALAC) +#VALAC := $(shell which $VALAC) endif VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'` d39 1 a39 1 @@@@ -736,7 +734,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU @ 1.3 log @update to 0.14.1 changes: -improved raw support, error handling on import, slideshow mode -bugfixes @ text @d3 1 a3 1 --- Makefile.orig 2013-03-18 20:32:30.000000000 +0000 d5 10 a14 1 @@@@ -298,7 +298,6 @@@@ EXT_PKGS = \ d22 1 a22 1 @@@@ -330,7 +329,6 @@@@ EXT_PKG_VERSIONS = \ d25 1 a25 1 gtk+-3.0 >= 3.0.11 \ d30 3 a32 6 @@@@ -411,7 +409,7 @@@@ DIST_FILES = Makefile configure chkver $ unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \ vapi/gphoto-2.5/libgphoto2.vapi vapi/gphoto-2.4/libgphoto2.vapi \ $(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN) - + d34 2 a35 8 DIST_TAR = $(PROGRAM)-$(VERSION).tar DIST_TAR_XZ = $(DIST_TAR).xz @@@@ -455,7 +453,7 @@@@ define check_valadate_version @@ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater. You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 ) endef -all: pkgcheck valacheck +all: pkgcheck d39 10 a48 1 @@@@ -707,7 +705,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU @ 1.2 log @update to 0.13.1 new major release, many fixes and improvements @ text @d3 1 a3 1 --- Makefile.orig 2012-09-19 23:24:26.000000000 +0000 d5 3 a7 3 @@@@ -297,7 +297,6 @@@@ EXT_PKGS = \ gstreamer-base-0.10 \ gstreamer-pbutils-0.10 \ d14 2 a15 2 gstreamer-plugins-base-0.10 >= 0.10.32 \ gstreamer-pbutils-0.10 >= 0.10.32 \ d21 1 a21 1 @@@@ -412,7 +410,7 @@@@ DIST_FILES = Makefile configure chkver $ d30 3 a32 3 @@@@ -452,7 +450,7 @@@@ PLUGIN_CFLAGS += $(REQUIRED_CFLAGS) # Required for gudev-1.0 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE d34 6 a39 6 -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 ),) @@@@ -710,7 +708,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- Makefile.orig 2012-03-28 22:35:57.000000000 +0000 d5 1 a5 1 @@@@ -280,7 +280,6 @@@@ EXT_PKGS = \ d12 2 a13 2 libsoup-2.4 \ @@@@ -316,7 +315,6 @@@@ EXT_PKG_VERSIONS = \ d20 13 a32 4 libsoup-2.4 >= 2.26.0 \ @@@@ -440,7 +438,7 @@@@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA # if not available. LIBRAW_CONFIG=./libraw-config d39 1 a39 22 @@@@ -666,7 +664,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 \ @@@@ -683,10 +680,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) @@@@ -697,7 +694,6 @@@@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU a46 9 @@@@ -715,7 +711,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.1.1.1 log @add shotwell-0.12.1, the new major branch, based on gtk3 @ text @@