Date: Friday, October 4, 2013 @ 11:55:22
Author: spupykin
Revision: 98032
archrelease: copy trunk to community-i686, community-x86_64
Added:
shotwell/repos/community-i686/PKGBUILD
(from rev 98031, shotwell/trunk/PKGBUILD)
shotwell/repos/community-i686/shotwell.install
(from rev 98031, shotwell/trunk/shotwell.install)
shotwell/repos/community-x86_64/PKGBUILD
(from rev 98031, shotwell/trunk/PKGBUILD)
shotwell/repos/community-x86_64/shotwell.install
(from rev 98031, shotwell/trunk/shotwell.install)
Deleted:
shotwell/repos/community-i686/PKGBUILD
shotwell/repos/community-i686/libraw-0.15.2.patch
shotwell/repos/community-i686/no-libexec.patch
shotwell/repos/community-i686/shotwell.install
shotwell/repos/community-x86_64/PKGBUILD
shotwell/repos/community-x86_64/libraw-0.15.2.patch
shotwell/repos/community-x86_64/no-libexec.patch
shotwell/repos/community-x86_64/shotwell.install
--------------------------------------+
/PKGBUILD | 66 +++++++++++++++++++++++++++++++++
/shotwell.install | 34 +++++++++++++++++
community-i686/PKGBUILD | 46 -----------------------
community-i686/libraw-0.15.2.patch | 33 ----------------
community-i686/no-libexec.patch | 26 -------------
community-i686/shotwell.install | 17 --------
community-x86_64/PKGBUILD | 46 -----------------------
community-x86_64/libraw-0.15.2.patch | 33 ----------------
community-x86_64/no-libexec.patch | 26 -------------
community-x86_64/shotwell.install | 17 --------
10 files changed, 100 insertions(+), 244 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-i686/PKGBUILD 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Maintainer : Ionut Biru <[email protected]>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-
-pkgname=shotwell
-pkgver=0.14.1
-pkgrel=5
-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"
-
"FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff";)
-md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1'
- 'b4124e022c98b4382530e6fbcef965e2'
- '3ad21364f82229122f48452f5c74dfde'
- '9f9690f4b860f52ffd44f8ab6d4fd3b5')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 <$srcdir/no-libexec.patch
- patch -Rp1 <$srcdir/libraw-0.15.2.patch
- patch -p1 <$srcdir/FS35899.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-i686/PKGBUILD (from rev 98031,
shotwell/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-10-04 09:55:22 UTC (rev 98032)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer : Ionut Biru <[email protected]>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
+pkgname=shotwell
+pkgver=0.15.0
+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=('libgee' '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";)
+md5sums=('8b33dd5df51f49e7f4f451b431d7c133')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --libexec=/usr/lib/shotwell \
+ --disable-schemas-compile \
+ --disable-desktop-update \
+ --disable-icon-update
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/libraw-0.15.2.patch
===================================================================
--- community-i686/libraw-0.15.2.patch 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-i686/libraw-0.15.2.patch 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,33 +0,0 @@
-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; }
Deleted: community-i686/no-libexec.patch
===================================================================
--- community-i686/no-libexec.patch 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-i686/no-libexec.patch 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,26 +0,0 @@
-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");
- }
- }
-
Deleted: community-i686/shotwell.install
===================================================================
--- community-i686/shotwell.install 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-i686/shotwell.install 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,17 +0,0 @@
-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-i686/shotwell.install (from rev 98031,
shotwell/trunk/shotwell.install)
===================================================================
--- community-i686/shotwell.install (rev 0)
+++ community-i686/shotwell.install 2013-10-04 09:55:22 UTC (rev 98032)
@@ -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
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-x86_64/PKGBUILD 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Maintainer : Ionut Biru <[email protected]>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-
-pkgname=shotwell
-pkgver=0.14.1
-pkgrel=5
-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"
-
"FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff";)
-md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1'
- 'b4124e022c98b4382530e6fbcef965e2'
- '3ad21364f82229122f48452f5c74dfde'
- '9f9690f4b860f52ffd44f8ab6d4fd3b5')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 <$srcdir/no-libexec.patch
- patch -Rp1 <$srcdir/libraw-0.15.2.patch
- patch -p1 <$srcdir/FS35899.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-x86_64/PKGBUILD (from rev 98031,
shotwell/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-10-04 09:55:22 UTC (rev 98032)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer : Ionut Biru <[email protected]>
+# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+
+pkgname=shotwell
+pkgver=0.15.0
+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=('libgee' '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";)
+md5sums=('8b33dd5df51f49e7f4f451b431d7c133')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --libexec=/usr/lib/shotwell \
+ --disable-schemas-compile \
+ --disable-desktop-update \
+ --disable-icon-update
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/libraw-0.15.2.patch
===================================================================
--- community-x86_64/libraw-0.15.2.patch 2013-10-04 09:55:08 UTC (rev
98031)
+++ community-x86_64/libraw-0.15.2.patch 2013-10-04 09:55:22 UTC (rev
98032)
@@ -1,33 +0,0 @@
-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; }
Deleted: community-x86_64/no-libexec.patch
===================================================================
--- community-x86_64/no-libexec.patch 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-x86_64/no-libexec.patch 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,26 +0,0 @@
-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");
- }
- }
-
Deleted: community-x86_64/shotwell.install
===================================================================
--- community-x86_64/shotwell.install 2013-10-04 09:55:08 UTC (rev 98031)
+++ community-x86_64/shotwell.install 2013-10-04 09:55:22 UTC (rev 98032)
@@ -1,17 +0,0 @@
-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-x86_64/shotwell.install (from rev 98031,
shotwell/trunk/shotwell.install)
===================================================================
--- community-x86_64/shotwell.install (rev 0)
+++ community-x86_64/shotwell.install 2013-10-04 09:55:22 UTC (rev 98032)
@@ -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
+}
