[arch-commits] Commit in shotwell/trunk (PKGBUILD libraw-0.15.2.patch)

[Sergej Pupykin]

    Date: Monday, June 17, 2013 @ 14:41:55
  Author: spupykin
Revision: 92875

upgpkg: shotwell 0.14.1-4

upd

Added:
  shotwell/trunk/libraw-0.15.2.patch
Modified:
  shotwell/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   15 ++++++++++-----
 libraw-0.15.2.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-17 12:07:05 UTC (rev 92874)
+++ PKGBUILD	2013-06-17 12:41:55 UTC (rev 92875)
@@ -5,7 +5,7 @@
 
 pkgname=shotwell
 pkgver=0.14.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
@@ -16,15 +16,20 @@
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz"
-	"no-libexec.patch")
+	"no-libexec.patch"
+	"libraw-0.15.2.patch")
 md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1'
-         'b4124e022c98b4382530e6fbcef965e2')
+         'b4124e022c98b4382530e6fbcef965e2'
+         '3ad21364f82229122f48452f5c74dfde')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   patch -p1 <$srcdir/no-libexec.patch
+  patch -Rp1 <$srcdir/libraw-0.15.2.patch
+}
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--disable-schemas-compile \
 	--disable-desktop-update \

Added: libraw-0.15.2.patch
===================================================================
--- libraw-0.15.2.patch	                        (rev 0)
+++ libraw-0.15.2.patch	2013-06-17 12:41:55 UTC (rev 92875)
@@ -0,0 +1,33 @@
+diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala
+--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala	2013-06-17 16:26:12.247179310 +0400
++++ shotwell-0.14.1/src/photos/GRaw.vala	2013-04-03 04:54:23.000000000 +0400
+@@ -168,7 +168,7 @@
+     }
+     
+     public void document_mode_processing() throws Exception {
+-        throw_exception("document_mode_processing", 0);
++        throw_exception("document_mode_processing", proc.document_mode_processing());
+     }
+     
+     public unowned LibRaw.ImageOther get_image_other() {
+@@ -244,7 +244,7 @@
+         // threshold
+         output_params->half_size = half_size;
+         // four_color_rgb
+-//        output_params->document_mode = GRaw.DocMode.STANDARD;
++        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 -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi
+--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi	2013-06-17 16:25:23.623846536 +0400
++++ shotwell-0.14.1/vapi/libraw.vapi	2013-04-03 04:54:23.000000000 +0400
+@@ -184,6 +184,8 @@
+     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; }