Date: Friday, October 4, 2013 @ 17:27:57 Author: bgyorgy Revision: 98046
archrelease: copy trunk to community-i686, community-x86_64 Added: rawstudio/repos/community-i686/PKGBUILD (from rev 98045, rawstudio/trunk/PKGBUILD) rawstudio/repos/community-i686/libpng15.patch (from rev 98045, rawstudio/trunk/libpng15.patch) rawstudio/repos/community-i686/rawstudio.install (from rev 98045, rawstudio/trunk/rawstudio.install) rawstudio/repos/community-x86_64/PKGBUILD (from rev 98045, rawstudio/trunk/PKGBUILD) rawstudio/repos/community-x86_64/libpng15.patch (from rev 98045, rawstudio/trunk/libpng15.patch) rawstudio/repos/community-x86_64/rawstudio.install (from rev 98045, rawstudio/trunk/rawstudio.install) Deleted: rawstudio/repos/community-i686/PKGBUILD rawstudio/repos/community-i686/libpng15.patch rawstudio/repos/community-i686/rawstudio.install rawstudio/repos/community-x86_64/PKGBUILD rawstudio/repos/community-x86_64/libpng15.patch rawstudio/repos/community-x86_64/rawstudio.install ------------------------------------+ /PKGBUILD | 82 +++++++++++++++++++++++++++++++++++ /libpng15.patch | 80 ++++++++++++++++++++++++++++++++++ /rawstudio.install | 22 +++++++++ community-i686/PKGBUILD | 37 --------------- community-i686/libpng15.patch | 40 ----------------- community-i686/rawstudio.install | 11 ---- community-x86_64/PKGBUILD | 37 --------------- community-x86_64/libpng15.patch | 40 ----------------- community-x86_64/rawstudio.install | 11 ---- 9 files changed, 184 insertions(+), 176 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-10-04 15:27:48 UTC (rev 98045) +++ community-i686/PKGBUILD 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,37 +0,0 @@ -# $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=8 -pkgdesc="An open source raw-image converter written in GTK+" -arch=('i686' 'x86_64') -license=('GPL') -url="http://rawstudio.org/" -depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' - 'raptor1' 'lcms' 'gtk2') -install=${pkgname}.install -options=('!libtool') -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz - libpng15.patch) -md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' - '2f8b7acbe10d8096ce613cbea7986fd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/libpng15.patch - export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" - ./configure --prefix=/usr - 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-i686/PKGBUILD (from rev 98045, rawstudio/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-10-04 15:27:57 UTC (rev 98046) @@ -0,0 +1,41 @@ +# $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=9 +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') +install=${pkgname}.install +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz + libpng15.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/libpng15.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 +} Deleted: community-i686/libpng15.patch =================================================================== --- community-i686/libpng15.patch 2013-10-04 15:27:48 UTC (rev 98045) +++ community-i686/libpng15.patch 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,40 +0,0 @@ -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-i686/libpng15.patch (from rev 98045, rawstudio/trunk/libpng15.patch) =================================================================== --- community-i686/libpng15.patch (rev 0) +++ community-i686/libpng15.patch 2013-10-04 15:27:57 UTC (rev 98046) @@ -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)) Deleted: community-i686/rawstudio.install =================================================================== --- community-i686/rawstudio.install 2013-10-04 15:27:48 UTC (rev 98045) +++ community-i686/rawstudio.install 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,11 +0,0 @@ -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-i686/rawstudio.install (from rev 98045, rawstudio/trunk/rawstudio.install) =================================================================== --- community-i686/rawstudio.install (rev 0) +++ community-i686/rawstudio.install 2013-10-04 15:27:57 UTC (rev 98046) @@ -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 +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-10-04 15:27:48 UTC (rev 98045) +++ community-x86_64/PKGBUILD 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,37 +0,0 @@ -# $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=8 -pkgdesc="An open source raw-image converter written in GTK+" -arch=('i686' 'x86_64') -license=('GPL') -url="http://rawstudio.org/" -depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' - 'raptor1' 'lcms' 'gtk2') -install=${pkgname}.install -options=('!libtool') -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz - libpng15.patch) -md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' - '2f8b7acbe10d8096ce613cbea7986fd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/libpng15.patch - export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" - ./configure --prefix=/usr - 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-x86_64/PKGBUILD (from rev 98045, rawstudio/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-10-04 15:27:57 UTC (rev 98046) @@ -0,0 +1,41 @@ +# $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=9 +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') +install=${pkgname}.install +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz + libpng15.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/libpng15.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 +} Deleted: community-x86_64/libpng15.patch =================================================================== --- community-x86_64/libpng15.patch 2013-10-04 15:27:48 UTC (rev 98045) +++ community-x86_64/libpng15.patch 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,40 +0,0 @@ -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-x86_64/libpng15.patch (from rev 98045, rawstudio/trunk/libpng15.patch) =================================================================== --- community-x86_64/libpng15.patch (rev 0) +++ community-x86_64/libpng15.patch 2013-10-04 15:27:57 UTC (rev 98046) @@ -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)) Deleted: community-x86_64/rawstudio.install =================================================================== --- community-x86_64/rawstudio.install 2013-10-04 15:27:48 UTC (rev 98045) +++ community-x86_64/rawstudio.install 2013-10-04 15:27:57 UTC (rev 98046) @@ -1,11 +0,0 @@ -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-x86_64/rawstudio.install (from rev 98045, rawstudio/trunk/rawstudio.install) =================================================================== --- community-x86_64/rawstudio.install (rev 0) +++ community-x86_64/rawstudio.install 2013-10-04 15:27:57 UTC (rev 98046) @@ -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 +}