summaryrefslogtreecommitdiff
path: root/community/shotwell
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-06-20 01:16:55 -0700
committerroot <root@rshg054.dnsready.net>2013-06-20 01:16:55 -0700
commit5898d76e47144f2366f9acda9ab52827b696c2d5 (patch)
tree24ef06e686a0fdbd29152094c42ea6142c40ad28 /community/shotwell
parent603bdf488872afbc69493bc640aedb7548f3ed51 (diff)
Thu Jun 20 01:16:07 PDT 2013
Diffstat (limited to 'community/shotwell')
-rw-r--r--community/shotwell/PKGBUILD19
-rw-r--r--community/shotwell/libraw-0.15.2.patch33
2 files changed, 45 insertions, 7 deletions
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 7726c625c..c84b466c1 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $
+# $Id: PKGBUILD 92942 2013-06-19 21:09:47Z bpiotrowski $
# 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.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/"
license=('LGPL2.1')
-depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
'gst-plugins-base' 'libgphoto2')
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 \
diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch
new file mode 100644
index 000000000..248c5f236
--- /dev/null
+++ b/community/shotwell/libraw-0.15.2.patch
@@ -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; }