summaryrefslogtreecommitdiff
path: root/community/shotwell
diff options
context:
space:
mode:
Diffstat (limited to 'community/shotwell')
-rw-r--r--community/shotwell/PKGBUILD21
-rw-r--r--community/shotwell/fix-with-libraw-0.4.patch50
2 files changed, 64 insertions, 7 deletions
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 06412266b..db9b90cb5 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 56880 2011-10-15 22:25:22Z spupykin $
+# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $
# 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.4
-pkgrel=2
+pkgver=0.11.6
+pkgrel=1
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")
-md5sums=('150899574f8fd96b6a5b87173a6ef3e0'
- 'bf35262cc611de447147d01cbac33767')
+ "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
+ "fix-with-libraw-0.4.patch")
+md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf'
+ 'bf35262cc611de447147d01cbac33767'
+ '488787b6d2cbc7348bc88348b78b6005')
build() {
cd "${srcdir}/vala-0.12.1"
@@ -27,11 +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
+
make
}
diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch
new file mode 100644
index 000000000..f6f021b61
--- /dev/null
+++ b/community/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);