Date: Friday, July 3, 2015 @ 17:36:05 Author: spupykin Revision: 136336
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: rawstudio/repos/community-staging-i686/ rawstudio/repos/community-staging-i686/PKGBUILD (from rev 136335, rawstudio/trunk/PKGBUILD) rawstudio/repos/community-staging-i686/lensfun03.patch (from rev 136335, rawstudio/trunk/lensfun03.patch) rawstudio/repos/community-staging-i686/libpng15.patch (from rev 136335, rawstudio/trunk/libpng15.patch) rawstudio/repos/community-staging-i686/rawstudio.install (from rev 136335, rawstudio/trunk/rawstudio.install) rawstudio/repos/community-staging-x86_64/ rawstudio/repos/community-staging-x86_64/PKGBUILD (from rev 136335, rawstudio/trunk/PKGBUILD) rawstudio/repos/community-staging-x86_64/lensfun03.patch (from rev 136335, rawstudio/trunk/lensfun03.patch) rawstudio/repos/community-staging-x86_64/libpng15.patch (from rev 136335, rawstudio/trunk/libpng15.patch) rawstudio/repos/community-staging-x86_64/rawstudio.install (from rev 136335, rawstudio/trunk/rawstudio.install) --------------------------------------------+ community-staging-i686/PKGBUILD | 43 +++++++++++++++++++++++++++ community-staging-i686/lensfun03.patch | 23 ++++++++++++++ community-staging-i686/libpng15.patch | 40 +++++++++++++++++++++++++ community-staging-i686/rawstudio.install | 11 ++++++ community-staging-x86_64/PKGBUILD | 43 +++++++++++++++++++++++++++ community-staging-x86_64/lensfun03.patch | 23 ++++++++++++++ community-staging-x86_64/libpng15.patch | 40 +++++++++++++++++++++++++ community-staging-x86_64/rawstudio.install | 11 ++++++ 8 files changed, 234 insertions(+) Copied: rawstudio/repos/community-staging-i686/PKGBUILD (from rev 136335, rawstudio/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Roman Kyrylych <ro...@archlinux.org> +# Contributor: cdhotfire <cdhotf...@gmail.com> + +pkgname=rawstudio +pkgver=2.0 +pkgrel=14 +pkgdesc="An open source raw-image converter written in GTK+" +arch=('i686' 'x86_64') +license=('GPL') +url="http://rawstudio.org/" +depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite' + 'libgphoto2' 'gtk-engines' 'desktop-file-utils' 'icu') +install=${pkgname}.install +source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz + libpng15.patch + lensfun03.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3' + 'a606b05fa260a7afec791f8db92d9a5e') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../libpng15.patch + patch -Np1 -i ../lensfun03.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins +} Copied: rawstudio/repos/community-staging-i686/lensfun03.patch (from rev 136335, rawstudio/trunk/lensfun03.patch) =================================================================== --- community-staging-i686/lensfun03.patch (rev 0) +++ community-staging-i686/lensfun03.patch 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,23 @@ +From cc31d235cd3c4f0adf35614e09965c28175c7c99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <ser...@serjux.com> +Date: Tue, 27 Jan 2015 13:30:27 +0000 +Subject: [PATCH] Compile with Lensfun 0.3 version where CCI correction have + been removed + +--- + plugins/lensfun/lensfun.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/lensfun/lensfun.c b/plugins/lensfun/lensfun.c +index af1f189..4f7fffb 100644 +--- a/plugins/lensfun/lensfun.c ++++ b/plugins/lensfun/lensfun.c +@@ -668,7 +668,7 @@ get_image(RSFilter *filter, const RSFilterRequest *request) + } + + /* Start threads to apply phase 2, Vignetting and CA Correction */ +- if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI)) ++ if (effective_flags & LF_MODIFY_VIGNETTING) + { + /* Phase 2 is corrected inplace, so copy input first */ + guint y_offset, y_per_thread, threaded_h; Copied: rawstudio/repos/community-staging-i686/libpng15.patch (from rev 136335, rawstudio/trunk/libpng15.patch) =================================================================== --- community-staging-i686/libpng15.patch (rev 0) +++ community-staging-i686/libpng15.patch 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,40 @@ +diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp +--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 ++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 +@@ -102,8 +102,8 @@ + { + *linear_guess = FALSE; + RSColorSpace* profile = NULL; +- const gchar *icc_profile_title; +- const gchar *icc_profile; ++ png_charp icc_profile_title; ++ png_bytep icc_profile; + guint icc_profile_size; + png_structp png_ptr = png_create_read_struct( + PNG_LIBPNG_VER_STRING, +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, +- (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ &icc_profile_title, &compression_type, ++ &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); +diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c +--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 ++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 +@@ -23,6 +23,7 @@ + #include <gettext.h> + #include "config.h" + #include <png.h> ++#include <zlib.h> + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) Copied: rawstudio/repos/community-staging-i686/rawstudio.install (from rev 136335, rawstudio/trunk/rawstudio.install) =================================================================== --- community-staging-i686/rawstudio.install (rev 0) +++ community-staging-i686/rawstudio.install 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q || true +} + +post_upgrade() { + update-desktop-database -q || true +} + +post_remove() { + update-desktop-database -q || true +} Copied: rawstudio/repos/community-staging-x86_64/PKGBUILD (from rev 136335, rawstudio/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Roman Kyrylych <ro...@archlinux.org> +# Contributor: cdhotfire <cdhotf...@gmail.com> + +pkgname=rawstudio +pkgver=2.0 +pkgrel=14 +pkgdesc="An open source raw-image converter written in GTK+" +arch=('i686' 'x86_64') +license=('GPL') +url="http://rawstudio.org/" +depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite' + 'libgphoto2' 'gtk-engines' 'desktop-file-utils' 'icu') +install=${pkgname}.install +source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz + libpng15.patch + lensfun03.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3' + 'a606b05fa260a7afec791f8db92d9a5e') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../libpng15.patch + patch -Np1 -i ../lensfun03.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins +} Copied: rawstudio/repos/community-staging-x86_64/lensfun03.patch (from rev 136335, rawstudio/trunk/lensfun03.patch) =================================================================== --- community-staging-x86_64/lensfun03.patch (rev 0) +++ community-staging-x86_64/lensfun03.patch 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,23 @@ +From cc31d235cd3c4f0adf35614e09965c28175c7c99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <ser...@serjux.com> +Date: Tue, 27 Jan 2015 13:30:27 +0000 +Subject: [PATCH] Compile with Lensfun 0.3 version where CCI correction have + been removed + +--- + plugins/lensfun/lensfun.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/lensfun/lensfun.c b/plugins/lensfun/lensfun.c +index af1f189..4f7fffb 100644 +--- a/plugins/lensfun/lensfun.c ++++ b/plugins/lensfun/lensfun.c +@@ -668,7 +668,7 @@ get_image(RSFilter *filter, const RSFilterRequest *request) + } + + /* Start threads to apply phase 2, Vignetting and CA Correction */ +- if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI)) ++ if (effective_flags & LF_MODIFY_VIGNETTING) + { + /* Phase 2 is corrected inplace, so copy input first */ + guint y_offset, y_per_thread, threaded_h; Copied: rawstudio/repos/community-staging-x86_64/libpng15.patch (from rev 136335, rawstudio/trunk/libpng15.patch) =================================================================== --- community-staging-x86_64/libpng15.patch (rev 0) +++ community-staging-x86_64/libpng15.patch 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,40 @@ +diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp +--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 ++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 +@@ -102,8 +102,8 @@ + { + *linear_guess = FALSE; + RSColorSpace* profile = NULL; +- const gchar *icc_profile_title; +- const gchar *icc_profile; ++ png_charp icc_profile_title; ++ png_bytep icc_profile; + guint icc_profile_size; + png_structp png_ptr = png_create_read_struct( + PNG_LIBPNG_VER_STRING, +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, +- (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ &icc_profile_title, &compression_type, ++ &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); +diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c +--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 ++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 +@@ -23,6 +23,7 @@ + #include <gettext.h> + #include "config.h" + #include <png.h> ++#include <zlib.h> + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) Copied: rawstudio/repos/community-staging-x86_64/rawstudio.install (from rev 136335, rawstudio/trunk/rawstudio.install) =================================================================== --- community-staging-x86_64/rawstudio.install (rev 0) +++ community-staging-x86_64/rawstudio.install 2015-07-03 15:36:05 UTC (rev 136336) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q || true +} + +post_upgrade() { + update-desktop-database -q || true +} + +post_remove() { + update-desktop-database -q || true +}