Fri Mar 18 18:58:29 2011 UTC ()
add patch from upstream to fix build with vala-0.10.4, require 0.10.4
because this is not backwards-compatible, bump PKGREV


(drochner)
diff -r1.12 -r1.13 pkgsrc/graphics/shotwell/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/shotwell/distinfo
diff -r0 -r1.3 pkgsrc/graphics/shotwell/patches/patch-ac
cvs diff -r1.12 -r1.13 pkgsrc/graphics/shotwell/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/Makefile 2011/03/09 17:20:21 1.12
+++ pkgsrc/graphics/shotwell/Makefile 2011/03/18 18:58:29 1.13
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2011/03/09 17:20:21 drochner Exp $ 1# $NetBSD: Makefile,v 1.13 2011/03/18 18:58:29 drochner Exp $
2# 2#
3 3
4DISTNAME= shotwell-0.8.1 4DISTNAME= shotwell-0.8.1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://yorba.org/download/shotwell/0.8/ 7MASTER_SITES= http://yorba.org/download/shotwell/0.8/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgrsc-users@NetBSD.org 10MAINTAINER= pkgrsc-users@NetBSD.org
11HOMEPAGE= http://yorba.org/shotwell/ 11HOMEPAGE= http://yorba.org/shotwell/
12COMMENT= Shotwell is a photo organizer for the GNOME desktop 12COMMENT= Shotwell is a photo organizer for the GNOME desktop
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18USE_TOOLS+= gmake bash pkg-config msgfmt 18USE_TOOLS+= gmake bash pkg-config msgfmt
@@ -31,23 +31,24 @@ post-install: @@ -31,23 +31,24 @@ post-install:
31 ${INSTALL_DATA} ${WRKSRC}/misc/shotwell.schemas \ 31 ${INSTALL_DATA} ${WRKSRC}/misc/shotwell.schemas \
32 ${DESTDIR}${PREFIX}/share/gconf/schemas 32 ${DESTDIR}${PREFIX}/share/gconf/schemas
33 33
34.include "../../databases/sqlite3/buildlink3.mk" 34.include "../../databases/sqlite3/buildlink3.mk"
35.include "../../devel/GConf/schemas.mk" 35.include "../../devel/GConf/schemas.mk"
36.include "../../devel/libgee/buildlink3.mk" 36.include "../../devel/libgee/buildlink3.mk"
37.include "../../devel/libgphoto2/buildlink3.mk" 37.include "../../devel/libgphoto2/buildlink3.mk"
38.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 38.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
39.include "../../graphics/libexif/buildlink3.mk" 39.include "../../graphics/libexif/buildlink3.mk"
40.include "../../graphics/libgexiv2/buildlink3.mk" 40.include "../../graphics/libgexiv2/buildlink3.mk"
41# 0.13.2 added shared libs 41# 0.13.2 added shared libs
42BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2 42BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
43.include "../../graphics/libraw/buildlink3.mk" 43.include "../../graphics/libraw/buildlink3.mk"
 44BUILDLINK_API_DEPENDS.vala+= vala>=0.10.4
44.include "../../lang/vala/buildlink3.mk" 45.include "../../lang/vala/buildlink3.mk"
45.include "../../net/libsoup24/buildlink3.mk" 46.include "../../net/libsoup24/buildlink3.mk"
46.include "../../sysutils/desktop-file-utils/desktopdb.mk" 47.include "../../sysutils/desktop-file-utils/desktopdb.mk"
47.include "../../sysutils/dbus-glib/buildlink3.mk" 48.include "../../sysutils/dbus-glib/buildlink3.mk"
48.include "../../textproc/libxml2/buildlink3.mk" 49.include "../../textproc/libxml2/buildlink3.mk"
49.include "../../textproc/json-glib/buildlink3.mk" 50.include "../../textproc/json-glib/buildlink3.mk"
50.include "../../www/webkit-gtk/buildlink3.mk" 51.include "../../www/webkit-gtk/buildlink3.mk"
51.include "../../x11/gtk2/buildlink3.mk" 52.include "../../x11/gtk2/buildlink3.mk"
52.include "../../x11/libunique/buildlink3.mk" 53.include "../../x11/libunique/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/shotwell/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/distinfo 2011/01/18 21:57:36 1.4
+++ pkgsrc/graphics/shotwell/distinfo 2011/03/18 18:58:29 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.4 2011/01/18 21:57:36 gls Exp $ 1$NetBSD: distinfo,v 1.5 2011/03/18 18:58:29 drochner Exp $
2 2
3SHA1 (shotwell-0.8.1.tar.bz2) = b26b222e35a16d2ccbe9590853d66f2e99e9c9f6 3SHA1 (shotwell-0.8.1.tar.bz2) = b26b222e35a16d2ccbe9590853d66f2e99e9c9f6
4RMD160 (shotwell-0.8.1.tar.bz2) = 56f1ad906a42ac6ae945a3cbd75a1d769452c718 4RMD160 (shotwell-0.8.1.tar.bz2) = 56f1ad906a42ac6ae945a3cbd75a1d769452c718
5Size (shotwell-0.8.1.tar.bz2) = 1317586 bytes 5Size (shotwell-0.8.1.tar.bz2) = 1317586 bytes
6SHA1 (patch-aa) = b6e1e8da2dd4370073d70a786ff7cf8aca06d868 6SHA1 (patch-aa) = b6e1e8da2dd4370073d70a786ff7cf8aca06d868
7SHA1 (patch-ab) = 390a2e725e10de42ce6d3617f4c093d3a63374e6 7SHA1 (patch-ab) = 390a2e725e10de42ce6d3617f4c093d3a63374e6
 8SHA1 (patch-ac) = 3a9dc52b5770950ba99bc146652f37b49514cde6
File Added: pkgsrc/graphics/shotwell/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.3 2011/03/18 18:58:29 drochner Exp $

--- src/CheckerboardLayout.vala.orig	2011-01-10 23:13:03.000000000 +0000
+++ src/CheckerboardLayout.vala
@@ -971,13 +971,13 @@ public class CheckerboardLayout : Gtk.Dr
             row_rect.width = allocation.width;
             row_rect.height = row.height;
             
-            if (area.intersect(row_rect, bitbucket)) {
+            if (area.intersect(row_rect, out bitbucket)) {
                 // see what elements, if any, intersect the area
                 foreach (CheckerboardItem item in row.items) {
                     if (item == null)
                         continue;
                     
-                    if (area.intersect(item.allocation, bitbucket))
+                    if (area.intersect(item.allocation, out bitbucket))
                         intersects.add(item);
                 }
             }
@@ -1504,7 +1504,7 @@ public class CheckerboardLayout : Gtk.Dr
             
             // only mark area as dirty if visible in viewport
             Gdk.Rectangle intersection = Gdk.Rectangle();
-            if (!visible_page.intersect(item.allocation, intersection))
+            if (!visible_page.intersect(item.allocation, out intersection))
                 continue;
             
             // grow the dirty area
@@ -1642,7 +1642,7 @@ public class CheckerboardLayout : Gtk.Dr
         // find the visible intersection of the viewport and the selection band
         Gdk.Rectangle visible_page = get_adjustment_page(hadjustment, vadjustment);
         Gdk.Rectangle visible_band = Gdk.Rectangle();
-        visible_page.intersect(selection_band, visible_band);
+        visible_page.intersect(selection_band, out visible_band);
         
         // pixelate selection rectangle interior
         if (visible_band.width > 1 && visible_band.height > 1) {