summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-02-09 19:17:13 +0000
committerdrochner <drochner@pkgsrc.org>2012-02-09 19:17:13 +0000
commit72726ff9104ef8277081e9c12744c6027a5883f8 (patch)
tree980772cf36321c4c620c543929548b25581ebc01 /graphics
parente62ef4c13bf68ef91f84fa65a95a71a2ea426e6b (diff)
downloadpkgsrc-72726ff9104ef8277081e9c12744c6027a5883f8.tar.gz
this doesn't build with vala-0.14, make sure it picks up 0.12
Diffstat (limited to 'graphics')
-rw-r--r--graphics/shotwell/Makefile5
-rw-r--r--graphics/shotwell/distinfo3
-rw-r--r--graphics/shotwell/patches/patch-ac14
3 files changed, 20 insertions, 2 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 34d5e24bf60..9fa32042fa7 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/02/06 12:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/02/09 19:17:13 drochner Exp $
#
DISTNAME= shotwell-0.11.6
@@ -21,6 +21,7 @@ CONFIG_SHELL= bash
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --assume-pkgs
CONFIGURE_ENV+= --define=NO_CAMERA
+MAKE_ENV+= VALAC=${VALAC}
REPLACE_SH+= configure
@@ -37,6 +38,8 @@ BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
# Required for dealing with .svg icons. Spotted on a clean box
.include "../../graphics/librsvg/buildlink3.mk"
BUILDLINK_API_DEPENDS.vala+= vala>=0.11.7
+BUILDLINK_API_DEPENDS.vala+= vala<0.14
+BUILDLINK_DEPMETHOD.vala= build
.include "../../lang/vala/buildlink3.mk"
.include "../../net/libsoup24/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 1054c70e945..8400d91f965 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2011/11/09 20:59:21 gls Exp $
+$NetBSD: distinfo,v 1.14 2012/02/09 19:17:13 drochner Exp $
SHA1 (shotwell-0.11.6.tar.bz2) = 2dd2b46dc56f6562522f75bd79eefdc80cbb2a49
RMD160 (shotwell-0.11.6.tar.bz2) = d3a93a90f5feea65a630f8f30585a3ebbe558635
Size (shotwell-0.11.6.tar.bz2) = 1570860 bytes
SHA1 (patch-aa) = 9df29602ba465d2ad401fd9ca7ca55b1d6e3c788
SHA1 (patch-ab) = 59c223fd7f8a9cb3136b7db2c882834c8d79f363
+SHA1 (patch-ac) = 1d1474140a30a1dc90639cd8c411d03336f7a290
diff --git a/graphics/shotwell/patches/patch-ac b/graphics/shotwell/patches/patch-ac
new file mode 100644
index 00000000000..4148056ef39
--- /dev/null
+++ b/graphics/shotwell/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.5 2012/02/09 19:17:13 drochner Exp $
+
+--- plugins/Makefile.plugin.mk.orig 2011-11-03 21:25:02.000000000 +0000
++++ plugins/Makefile.plugin.mk
+@@ -10,7 +10,9 @@
+ # NOTE: This file is called from the cwd of each directory, hence the relative paths should be
+ # read as such.
+
++ifndef VALAC
+ VALAC := valac
++endif
+ MAKE_FILES := Makefile ../Makefile.plugin.mk ../plugins.mk
+ HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
+ ../shotwell-plugin-dev-1.0.deps