[arch-commits] Commit in rawstudio/repos (8 files)
Jan de Groot
jgc at archlinux.org
Wed Dec 24 14:12:05 UTC 2014
Date: Wednesday, December 24, 2014 @ 15:12:05
Author: jgc
Revision: 124514
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 124513, rawstudio/trunk/PKGBUILD)
rawstudio/repos/community-staging-i686/libpng15.patch
(from rev 124513, rawstudio/trunk/libpng15.patch)
rawstudio/repos/community-staging-i686/rawstudio.install
(from rev 124513, rawstudio/trunk/rawstudio.install)
rawstudio/repos/community-staging-x86_64/
rawstudio/repos/community-staging-x86_64/PKGBUILD
(from rev 124513, rawstudio/trunk/PKGBUILD)
rawstudio/repos/community-staging-x86_64/libpng15.patch
(from rev 124513, rawstudio/trunk/libpng15.patch)
rawstudio/repos/community-staging-x86_64/rawstudio.install
(from rev 124513, rawstudio/trunk/rawstudio.install)
--------------------------------------------+
community-staging-i686/PKGBUILD | 40 +++++++++++++++++++++++++++
community-staging-i686/libpng15.patch | 40 +++++++++++++++++++++++++++
community-staging-i686/rawstudio.install | 11 +++++++
community-staging-x86_64/PKGBUILD | 40 +++++++++++++++++++++++++++
community-staging-x86_64/libpng15.patch | 40 +++++++++++++++++++++++++++
community-staging-x86_64/rawstudio.install | 11 +++++++
6 files changed, 182 insertions(+)
Copied: rawstudio/repos/community-staging-i686/PKGBUILD (from rev 124513, rawstudio/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-12-24 14:12:05 UTC (rev 124514)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: cdhotfire <cdhotfire at gmail.com>
+
+pkgname=rawstudio
+pkgver=2.0
+pkgrel=12
+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=(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
+}
Copied: rawstudio/repos/community-staging-i686/libpng15.patch (from rev 124513, rawstudio/trunk/libpng15.patch)
===================================================================
--- community-staging-i686/libpng15.patch (rev 0)
+++ community-staging-i686/libpng15.patch 2014-12-24 14:12:05 UTC (rev 124514)
@@ -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 124513, rawstudio/trunk/rawstudio.install)
===================================================================
--- community-staging-i686/rawstudio.install (rev 0)
+++ community-staging-i686/rawstudio.install 2014-12-24 14:12:05 UTC (rev 124514)
@@ -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 124513, rawstudio/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-12-24 14:12:05 UTC (rev 124514)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
+# Contributor: cdhotfire <cdhotfire at gmail.com>
+
+pkgname=rawstudio
+pkgver=2.0
+pkgrel=12
+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=(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
+}
Copied: rawstudio/repos/community-staging-x86_64/libpng15.patch (from rev 124513, rawstudio/trunk/libpng15.patch)
===================================================================
--- community-staging-x86_64/libpng15.patch (rev 0)
+++ community-staging-x86_64/libpng15.patch 2014-12-24 14:12:05 UTC (rev 124514)
@@ -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 124513, rawstudio/trunk/rawstudio.install)
===================================================================
--- community-staging-x86_64/rawstudio.install (rev 0)
+++ community-staging-x86_64/rawstudio.install 2014-12-24 14:12:05 UTC (rev 124514)
@@ -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
+}
More information about the arch-commits
mailing list