Date: Monday, June 17, 2013 @ 14:42:20 Author: spupykin Revision: 92876
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: shotwell/repos/community-staging-i686/ shotwell/repos/community-staging-i686/PKGBUILD (from rev 92875, shotwell/trunk/PKGBUILD) shotwell/repos/community-staging-i686/libraw-0.15.2.patch (from rev 92875, shotwell/trunk/libraw-0.15.2.patch) shotwell/repos/community-staging-i686/no-libexec.patch (from rev 92875, shotwell/trunk/no-libexec.patch) shotwell/repos/community-staging-i686/shotwell.install (from rev 92875, shotwell/trunk/shotwell.install) shotwell/repos/community-staging-x86_64/ shotwell/repos/community-staging-x86_64/PKGBUILD (from rev 92875, shotwell/trunk/PKGBUILD) shotwell/repos/community-staging-x86_64/libraw-0.15.2.patch (from rev 92875, shotwell/trunk/libraw-0.15.2.patch) shotwell/repos/community-staging-x86_64/no-libexec.patch (from rev 92875, shotwell/trunk/no-libexec.patch) shotwell/repos/community-staging-x86_64/shotwell.install (from rev 92875, shotwell/trunk/shotwell.install) ----------------------------------------------+ community-staging-i686/PKGBUILD | 43 +++++++++++++++++++++++++ community-staging-i686/libraw-0.15.2.patch | 33 +++++++++++++++++++ community-staging-i686/no-libexec.patch | 26 +++++++++++++++ community-staging-i686/shotwell.install | 17 +++++++++ community-staging-x86_64/PKGBUILD | 43 +++++++++++++++++++++++++ community-staging-x86_64/libraw-0.15.2.patch | 33 +++++++++++++++++++ community-staging-x86_64/no-libexec.patch | 26 +++++++++++++++ community-staging-x86_64/shotwell.install | 17 +++++++++ 8 files changed, 238 insertions(+) Copied: shotwell/repos/community-staging-i686/PKGBUILD (from rev 92875, shotwell/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-06-17 12:42:20 UTC (rev 92876) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer : Ionut Biru <ib...@archlinux.org> +# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> + +pkgname=shotwell +pkgver=0.14.1 +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' '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" + "libraw-0.15.2.patch") +md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' + 'b4124e022c98b4382530e6fbcef965e2' + '3ad21364f82229122f48452f5c74dfde') + +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 \ + --disable-icon-update + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: shotwell/repos/community-staging-i686/libraw-0.15.2.patch (from rev 92875, shotwell/trunk/libraw-0.15.2.patch) =================================================================== --- community-staging-i686/libraw-0.15.2.patch (rev 0) +++ community-staging-i686/libraw-0.15.2.patch 2013-06-17 12:42:20 UTC (rev 92876) @@ -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; } Copied: shotwell/repos/community-staging-i686/no-libexec.patch (from rev 92875, shotwell/trunk/no-libexec.patch) =================================================================== --- community-staging-i686/no-libexec.patch (rev 0) +++ community-staging-i686/no-libexec.patch 2013-06-17 12:42:20 UTC (rev 92876) @@ -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"); + } + } + Copied: shotwell/repos/community-staging-i686/shotwell.install (from rev 92875, shotwell/trunk/shotwell.install) =================================================================== --- community-staging-i686/shotwell.install (rev 0) +++ community-staging-i686/shotwell.install 2013-06-17 12:42:20 UTC (rev 92876) @@ -0,0 +1,17 @@ +pkgname=shotwell + +post_install() { + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + update-desktop-database -q + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +} Copied: shotwell/repos/community-staging-x86_64/PKGBUILD (from rev 92875, shotwell/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2013-06-17 12:42:20 UTC (rev 92876) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer : Ionut Biru <ib...@archlinux.org> +# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> + +pkgname=shotwell +pkgver=0.14.1 +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' '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" + "libraw-0.15.2.patch") +md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' + 'b4124e022c98b4382530e6fbcef965e2' + '3ad21364f82229122f48452f5c74dfde') + +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 \ + --disable-icon-update + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: shotwell/repos/community-staging-x86_64/libraw-0.15.2.patch (from rev 92875, shotwell/trunk/libraw-0.15.2.patch) =================================================================== --- community-staging-x86_64/libraw-0.15.2.patch (rev 0) +++ community-staging-x86_64/libraw-0.15.2.patch 2013-06-17 12:42:20 UTC (rev 92876) @@ -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; } Copied: shotwell/repos/community-staging-x86_64/no-libexec.patch (from rev 92875, shotwell/trunk/no-libexec.patch) =================================================================== --- community-staging-x86_64/no-libexec.patch (rev 0) +++ community-staging-x86_64/no-libexec.patch 2013-06-17 12:42:20 UTC (rev 92876) @@ -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"); + } + } + Copied: shotwell/repos/community-staging-x86_64/shotwell.install (from rev 92875, shotwell/trunk/shotwell.install) =================================================================== --- community-staging-x86_64/shotwell.install (rev 0) +++ community-staging-x86_64/shotwell.install 2013-06-17 12:42:20 UTC (rev 92876) @@ -0,0 +1,17 @@ +pkgname=shotwell + +post_install() { + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + update-desktop-database -q + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +}