summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-04-14 16:24:39 +0000
committerdrochner <drochner@pkgsrc.org>2011-04-14 16:24:39 +0000
commit6f78160848473b69249d4855f0db54624bf0f7ca (patch)
tree1c6542942a015791691b2f9d3ac7a45c84bb2e8f
parent773adf085676009fee770b239225bf2566539c3a (diff)
downloadpkgsrc-6f78160848473b69249d4855f0db54624bf0f7ca.tar.gz
update to 0.9.2
This is a bug fix release that fixes a translation issue and several critical publishing bugs.
-rw-r--r--graphics/shotwell/Makefile4
-rw-r--r--graphics/shotwell/distinfo10
-rw-r--r--graphics/shotwell/patches/patch-aa19
3 files changed, 11 insertions, 22 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index b79b2291e22..cdf1c6c51cb 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2011/04/05 18:34:20 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/14 16:24:39 drochner Exp $
#
-DISTNAME= shotwell-0.9.1
+DISTNAME= shotwell-0.9.2
CATEGORIES= graphics
MASTER_SITES= http://yorba.org/download/shotwell/0.9/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 91cfb411655..b5aeb96c883 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2011/04/05 18:34:20 drochner Exp $
+$NetBSD: distinfo,v 1.7 2011/04/14 16:24:39 drochner Exp $
-SHA1 (shotwell-0.9.1.tar.bz2) = e3d1b4e175352184a2c46da08f7a6ce53939b534
-RMD160 (shotwell-0.9.1.tar.bz2) = 801a1714246b51d76d0c432e7aa6b1838103d0c1
-Size (shotwell-0.9.1.tar.bz2) = 1456462 bytes
-SHA1 (patch-aa) = 1e4590acde5832f13f2390abdcb9e80904616208
+SHA1 (shotwell-0.9.2.tar.bz2) = 7a2a90c74a49e0e4b96a70eb83d2a80df4ea6fa3
+RMD160 (shotwell-0.9.2.tar.bz2) = 1d9f15b2b2cbc057c18fdd1979effa70feed16c6
+Size (shotwell-0.9.2.tar.bz2) = 1457781 bytes
+SHA1 (patch-aa) = bf4d526069f6ee474c02d0f28618c1fad770cd2c
SHA1 (patch-ab) = 5f9699feb50926e449b7c5a51152f7ea58da79e6
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
index aa23dad4e50..c2ba5ad065a 100644
--- a/graphics/shotwell/patches/patch-aa
+++ b/graphics/shotwell/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2011/04/05 18:34:20 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2011/04/14 16:24:39 drochner Exp $
---- Makefile.orig 2011-04-05 00:35:38.000000000 +0000
+--- Makefile.orig 2011-04-12 22:04:01.000000000 +0000
+++ Makefile
@@ -261,7 +261,6 @@ EXT_PKGS = \
gstreamer-0.10 \
@@ -27,26 +27,15 @@ $NetBSD: patch-aa,v 1.4 2011/04/05 18:34:20 drochner Exp $
@ ./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 ),)
-@@ -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)' $< > $@
-
+@@ -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 '--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`)
+ `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 $@
-
- $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP)
@@ -584,7 +582,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY