Wed Nov 2 23:14:55 UTC 2011

2 files changed, 60 insertions, 8 deletions

diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
index c61cd1b00..4e238db97 100644
--- a/community-testing/shotwell/PKGBUILD
+++ b/community-testing/shotwell/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 57609 2011-10-31 14:06:37Z spupykin $
+# $Id: PKGBUILD 57683 2011-11-01 08:40:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.11.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
 depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
 	 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'vala')
+makedepends=('intltool')
+# 'vala'
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
 	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
-	"build-hack.patch")
+	"fix-with-libraw-0.4.patch")
 md5sums=('d437c73127b1cb29a8f9c014effc6aa0'
          'bf35262cc611de447147d01cbac33767'
-         'afc8657b3fb3803d40f5e621e7857af8')
+         '488787b6d2cbc7348bc88348b78b6005')
 
 build() {
   cd "${srcdir}/vala-0.12.1"
@@ -29,14 +30,15 @@ build() {
   export PATH=$srcdir/vala/bin:$PATH
 
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../fix-with-libraw-0.4.patch
+
   ./configure --prefix=/usr \
 	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
 	--disable-schemas-install \
 	--disable-desktop-update \
 	--disable-icon-update
-  # hack
-  make || true
-  patch -p1 <$srcdir/build-hack.patch
+
   make
 }
 
diff --git a/community-testing/shotwell/fix-with-libraw-0.4.patch b/community-testing/shotwell/fix-with-libraw-0.4.patch
new file mode 100644
index 000000000..f6f021b61
--- /dev/null
+++ b/community-testing/shotwell/fix-with-libraw-0.4.patch
@@ -0,0 +1,50 @@
+Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
+diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
+--- shotwell-0.11.5/src/photos/GRaw.vala	2011-09-24 00:52:27.000000000 +0200
++++ shotwell-0.11.5-fixed/src/photos/GRaw.vala	2011-11-01 00:25:05.976289495 +0100
+@@ -163,9 +163,9 @@
+         proc = new LibRaw.Processor(options);
+     }
+     
+-    public void add_masked_borders_to_bitmap() {
+-        proc.add_masked_borders_to_bitmap();
+-    }
++//    public void add_masked_borders_to_bitmap() {
++//        proc.add_masked_borders_to_bitmap();
++//    }
+     
+     public void adjust_sizes_info_only() throws Exception {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+@@ -215,9 +215,9 @@
+         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
+     }
+     
+-    public void rotate_fuji_raw() throws Exception {
+-        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
+-    }
++//    public void rotate_fuji_raw() throws Exception {
++//        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
++//    }
+     
+     public void thumb_writer(string filename) throws Exception {
+         throw_exception("thumb_writer", proc.thumb_writer(filename));
+@@ -262,7 +262,7 @@
+         // camera_profile
+         // bad_pixels
+         // dark_frame
+-        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
++        // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
+         output_params->output_bps = 8;
+         // output_tiff
+         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
+@@ -303,8 +303,8 @@
+         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
+             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
+         
+-        case LibRaw.Result.CANNOT_ADDMASK:
+-            throw new Exception.CANNOT_ADDMASK(msg);
++//        case LibRaw.Result.CANNOT_ADDMASK:
++//            throw new Exception.CANNOT_ADDMASK(msg);
+         
+         case LibRaw.Result.UNSUFFICIENT_MEMORY:
+             throw new Exception.OUT_OF_MEMORY(msg);