From 35bd2bb6857eb818ca53b8fe34d88106133342f4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 2 Nov 2012 01:15:19 -0700
Subject: Fri Nov  2 01:12:32 PDT 2012

---
 community/shotwell/PKGBUILD         | 15 ++++++++++-----
 community/shotwell/no-libexec.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 community/shotwell/no-libexec.patch

(limited to 'community/shotwell')

diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 9600fd3ad..cab33a565 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 79129 2012-10-30 23:07:35Z heftig $
+# $Id: PKGBUILD 79217 2012-11-01 09:41:09Z 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.13.1
-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=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
-	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib')
+	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
+	 'gstreamer0.10-base-plugins')
 makedepends=('intltool' 'vala>=0.17.2')
 install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz")
-md5sums=('71eb1346093705ca2b37c12a21994d14')
+source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz"
+	"no-libexec.patch")
+md5sums=('71eb1346093705ca2b37c12a21994d14'
+         'b4124e022c98b4382530e6fbcef965e2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 <$srcdir/no-libexec.patch
+
   ./configure --prefix=/usr \
 	--disable-schemas-compile \
 	--disable-desktop-update \
diff --git a/community/shotwell/no-libexec.patch b/community/shotwell/no-libexec.patch
new file mode 100644
index 000000000..fe8960719
--- /dev/null
+++ b/community/shotwell/no-libexec.patch
@@ -0,0 +1,26 @@
+diff -Naur shotwell-0.13.1.orig/Makefile shotwell-0.13.1/Makefile
+--- shotwell-0.13.1.orig/Makefile	2012-10-05 20:07:37.000000000 +0200
++++ shotwell-0.13.1/Makefile	2012-10-31 22:27:30.382869896 +0100
+@@ -558,8 +558,8 @@
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(PREFIX)/bin
+-	mkdir -p $(DESTDIR)$(PREFIX)/libexec/shotwell
+-	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/libexec/shotwell
++	mkdir -p $(DESTDIR)$(PREFIX)/lib/shotwell
++	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(PREFIX)/lib/shotwell
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
+ 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+diff -Naur shotwell-0.13.1.orig/src/AppDirs.vala shotwell-0.13.1/src/AppDirs.vala
+--- shotwell-0.13.1.orig/src/AppDirs.vala	2012-10-05 19:56:07.000000000 +0200
++++ shotwell-0.13.1/src/AppDirs.vala	2012-10-31 22:28:17.634388872 +0100
+@@ -109,7 +109,7 @@
+                 // not installed yet - use wherever we were run from
+                 libexec_dir = get_exec_dir();
+             } else {
+-                libexec_dir = File.new_for_path(Resources.PREFIX + "/libexec/shotwell");
++                libexec_dir = File.new_for_path(Resources.PREFIX + "/lib/shotwell");
+             }
+         }
+ 
-- 
cgit v1.2.3-54-g00ecf