diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-02 10:21:33 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-02 10:21:33 +0100 |
| commit | 7331003f023f979ab7ad98bdca0eceed11af5957 (patch) | |
| tree | cd10099276da7590c6cdb28528442a4f7a889cf4 /community/shotwell | |
| parent | 312d1a232de2133d8af1628d46782e70d07766e9 (diff) | |
| parent | 35bd2bb6857eb818ca53b8fe34d88106133342f4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/calf/PKGBUILD
community/geany-plugins/PKGBUILD
community/noip/PKGBUILD
core/procps-ng/PKGBUILD
Diffstat (limited to 'community/shotwell')
| -rw-r--r-- | community/shotwell/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/shotwell/no-libexec.patch | 26 |
2 files changed, 36 insertions, 5 deletions
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index ff8a2e341..8ae26b341 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' 'mips64el') 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"); + } + } + |