fix build after libraw-0.15

3 files changed, 64 insertions, 1 deletions

diff --git a/graphics/shotwell-gtk3/distinfo b/graphics/shotwell-gtk3/distinfo
index 5756b2f5f0e..a05630a1db4 100644
--- a/graphics/shotwell-gtk3/distinfo
+++ b/graphics/shotwell-gtk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/04/08 16:51:59 drochner Exp $
+$NetBSD: distinfo,v 1.6 2013/07/22 16:22:01 drochner Exp $
 
 SHA1 (shotwell-0.14.1.tar.xz) = 7fa0fc21938b7627411d6d6c6c78c262bd6b756c
 RMD160 (shotwell-0.14.1.tar.xz) = f7aac98f1c6cdf56dd8f4c7e6902c242e7ca4028
@@ -6,3 +6,5 @@ Size (shotwell-0.14.1.tar.xz) = 1624784 bytes
 SHA1 (patch-aa) = 555213fdc75b78dbc76f35d17f90c8526c087337
 SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
 SHA1 (patch-ac) = 72cc9c3cbda9d0f6d7f30b9bb41899d9b57d1cca
+SHA1 (patch-ba) = 8361490f058cd9da6791ba10e14615fa47c28758
+SHA1 (patch-bb) = 27a391a559b16767e1106df3c8ede8cb9c83ce34
diff --git a/graphics/shotwell-gtk3/patches/patch-ba b/graphics/shotwell-gtk3/patches/patch-ba
new file mode 100644
index 00000000000..44edfd4e018
--- /dev/null
+++ b/graphics/shotwell-gtk3/patches/patch-ba
@@ -0,0 +1,38 @@
+$NetBSD: patch-ba,v 1.1 2013/07/22 16:22:01 drochner Exp $
+
+fix build with libraw-0.15
+
+--- src/photos/GRaw.vala.orig	2013-04-03 00:54:23.000000000 +0000
++++ src/photos/GRaw.vala
+@@ -21,12 +21,6 @@ public enum Colorspace {
+     XYZ = 5
+ }
+ 
+-public enum DocMode {
+-    STANDARD = 0,
+-    GRAYSCALE = 1,
+-    GRAYSCALE_NO_WHITE_BALANCE = 2
+-}
+-
+ public errordomain Exception {
+     UNSPECIFIED,
+     UNSUPPORTED_FILE,
+@@ -167,10 +161,6 @@ public class Processor {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+     }
+     
+-    public void document_mode_processing() throws Exception {
+-        throw_exception("document_mode_processing", proc.document_mode_processing());
+-    }
+-    
+     public unowned LibRaw.ImageOther get_image_other() {
+         return proc.get_image_other();
+     }
+@@ -244,7 +234,6 @@ public class Processor {
+         // threshold
+         output_params->half_size = half_size;
+         // four_color_rgb
+-        output_params->document_mode = GRaw.DocMode.STANDARD;
+         output_params->highlight = GRaw.HighlightMode.CLIP;
+         output_params->use_auto_wb = true;
+         output_params->use_camera_wb = true;
diff --git a/graphics/shotwell-gtk3/patches/patch-bb b/graphics/shotwell-gtk3/patches/patch-bb
new file mode 100644
index 00000000000..ed8eba301ef
--- /dev/null
+++ b/graphics/shotwell-gtk3/patches/patch-bb
@@ -0,0 +1,23 @@
+$NetBSD: patch-bb,v 1.1 2013/07/22 16:22:01 drochner Exp $
+
+fix build with libraw-0.15
+
+--- vapi/libraw.vapi.orig	2013-04-03 00:54:23.000000000 +0000
++++ vapi/libraw.vapi
+@@ -104,7 +104,6 @@ public struct OutputParams {
+     public float threshold;
+     public bool half_size;
+     public bool four_color_rgb;
+-    public int document_mode;
+     public int highlight;
+     public bool use_auto_wb;
+     public bool use_camera_wb;
+@@ -184,8 +183,6 @@ public class Processor {
+     public Processor(Options flags = Options.NONE);
+     
+     public Result adjust_sizes_info_only();
+-    [CCode (cname="libraw_dcraw_document_mode_processing")]
+-    public Result document_mode_processing();
+     public unowned ImageOther get_image_other() { return other; }
+     public unowned ImageParams get_image_params() { return idata; }
+     public Progress get_progress_flags() { return progress_flags; }