diff options
| -rw-r--r-- | graphics/shotwell/Makefile | 5 | ||||
| -rw-r--r-- | graphics/shotwell/distinfo | 3 | ||||
| -rw-r--r-- | graphics/shotwell/patches/patch-ac | 38 |
3 files changed, 43 insertions, 3 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 1462d0e19b0..854d6bfe24a 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2011/03/09 17:20:21 drochner Exp $ +# $NetBSD: Makefile,v 1.13 2011/03/18 18:58:29 drochner Exp $ # DISTNAME= shotwell-0.8.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://yorba.org/download/shotwell/0.8/ EXTRACT_SUFX= .tar.bz2 @@ -41,6 +41,7 @@ post-install: # 0.13.2 added shared libs BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2 .include "../../graphics/libraw/buildlink3.mk" +BUILDLINK_API_DEPENDS.vala+= vala>=0.10.4 .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 e342075f0a4..149784f39ba 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/01/18 21:57:36 gls Exp $ +$NetBSD: distinfo,v 1.5 2011/03/18 18:58:29 drochner Exp $ SHA1 (shotwell-0.8.1.tar.bz2) = b26b222e35a16d2ccbe9590853d66f2e99e9c9f6 RMD160 (shotwell-0.8.1.tar.bz2) = 56f1ad906a42ac6ae945a3cbd75a1d769452c718 Size (shotwell-0.8.1.tar.bz2) = 1317586 bytes SHA1 (patch-aa) = b6e1e8da2dd4370073d70a786ff7cf8aca06d868 SHA1 (patch-ab) = 390a2e725e10de42ce6d3617f4c093d3a63374e6 +SHA1 (patch-ac) = 3a9dc52b5770950ba99bc146652f37b49514cde6 diff --git a/graphics/shotwell/patches/patch-ac b/graphics/shotwell/patches/patch-ac new file mode 100644 index 00000000000..a57a5a5b361 --- /dev/null +++ b/graphics/shotwell/patches/patch-ac @@ -0,0 +1,38 @@ +$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) { |