Date: Thursday, March 15, 2012 @ 06:52:47
Author: bisson
Revision: 153511
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
inkscape/repos/staging-i686/
inkscape/repos/staging-i686/PKGBUILD
(from rev 153510, inkscape/trunk/PKGBUILD)
inkscape/repos/staging-i686/install
(from rev 153510, inkscape/trunk/install)
inkscape/repos/staging-i686/libpng15.patch
(from rev 153510, inkscape/trunk/libpng15.patch)
inkscape/repos/staging-x86_64/
inkscape/repos/staging-x86_64/PKGBUILD
(from rev 153510, inkscape/trunk/PKGBUILD)
inkscape/repos/staging-x86_64/install
(from rev 153510, inkscape/trunk/install)
inkscape/repos/staging-x86_64/libpng15.patch
(from rev 153510, inkscape/trunk/libpng15.patch)
-------------------------------+
staging-i686/PKGBUILD | 56 ++++++++++++++++++++++++++++++++++++++++
staging-i686/install | 13 +++++++++
staging-i686/libpng15.patch | 40 ++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 56 ++++++++++++++++++++++++++++++++++++++++
staging-x86_64/install | 13 +++++++++
staging-x86_64/libpng15.patch | 40 ++++++++++++++++++++++++++++
6 files changed, 218 insertions(+)
Copied: inkscape/repos/staging-i686/PKGBUILD (from rev 153510,
inkscape/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,56 @@
+# $Id$
+# Contributor: tobias <tob...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@justdreams.de>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=inkscape
+pkgver=0.48.3.1
+pkgrel=2
+pkgdesc='Vector graphics editor using the SVG file format'
+url='http://inkscape.sourceforge.net/'
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+makedepends=('boost' 'intltool')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
'popt'
+ 'python2' 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('pstoedit: latex formulas'
+ 'texlive-core: latex formulas'
+ 'python2-numpy: some extensions'
+ 'python2-lxml: some extensions and filters'
+ 'pyxml: some extensions'
+ 'uniconvertor: reading/writing to some proprietary formats')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'libpng15.patch')
+sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
+ 'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
+ sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g'
share/*/{test/,}*.py
+ sed -i 's|"python" },|"python2" },|g'
src/extension/implementation/script.cpp
+ sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+ sed -i 's|"python"|"python2"|g' src/main.cpp
+
+ patch -p1 -i ../libpng15.patch
+
+ ./configure \
+ --prefix=/usr \
+ --with-python \
+ --with-perl \
+ --enable-lcms \
+ --enable-poppler-cairo \
+ --disable-dependency-tracking \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: inkscape/repos/staging-i686/install (from rev 153510,
inkscape/trunk/install)
===================================================================
--- staging-i686/install (rev 0)
+++ staging-i686/install 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+
+post_remove() {
+ post_install
+}
Copied: inkscape/repos/staging-i686/libpng15.patch (from rev 153510,
inkscape/trunk/libpng15.patch)
===================================================================
--- staging-i686/libpng15.patch (rev 0)
+++ staging-i686/libpng15.patch 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+ return NULL;
+ }
+ // Set error handler
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return NULL;
+ }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+
+ #if defined(PNG_iCCP_SUPPORTED)
+ {
+- char* name = 0;
++ png_charp name = 0;
+ int compression_type = 0;
+- char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++ png_charp profile = 0;
++#else
++ png_bytep profile = 0;
++#endif
+ png_uint_32 proflen = 0;
+ if ( png_get_iCCP(pngPtr, infoPtr, &name,
&compression_type, &profile, &proflen) ) {
+ // g_message("Found an iCCP chunk
named [%s] with %d bytes and comp %d", name, proflen, compression_type);
Copied: inkscape/repos/staging-x86_64/PKGBUILD (from rev 153510,
inkscape/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,56 @@
+# $Id$
+# Contributor: tobias <tob...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@justdreams.de>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=inkscape
+pkgver=0.48.3.1
+pkgrel=2
+pkgdesc='Vector graphics editor using the SVG file format'
+url='http://inkscape.sourceforge.net/'
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+makedepends=('boost' 'intltool')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib'
'popt'
+ 'python2' 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('pstoedit: latex formulas'
+ 'texlive-core: latex formulas'
+ 'python2-numpy: some extensions'
+ 'python2-lxml: some extensions and filters'
+ 'pyxml: some extensions'
+ 'uniconvertor: reading/writing to some proprietary formats')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'libpng15.patch')
+sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
+ 'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
+ sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g'
share/*/{test/,}*.py
+ sed -i 's|"python" },|"python2" },|g'
src/extension/implementation/script.cpp
+ sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+ sed -i 's|"python"|"python2"|g' src/main.cpp
+
+ patch -p1 -i ../libpng15.patch
+
+ ./configure \
+ --prefix=/usr \
+ --with-python \
+ --with-perl \
+ --enable-lcms \
+ --enable-poppler-cairo \
+ --disable-dependency-tracking \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: inkscape/repos/staging-x86_64/install (from rev 153510,
inkscape/trunk/install)
===================================================================
--- staging-x86_64/install (rev 0)
+++ staging-x86_64/install 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+
+post_remove() {
+ post_install
+}
Copied: inkscape/repos/staging-x86_64/libpng15.patch (from rev 153510,
inkscape/trunk/libpng15.patch)
===================================================================
--- staging-x86_64/libpng15.patch (rev 0)
+++ staging-x86_64/libpng15.patch 2012-03-15 10:52:47 UTC (rev 153511)
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+ return NULL;
+ }
+ // Set error handler
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return NULL;
+ }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+
+ #if defined(PNG_iCCP_SUPPORTED)
+ {
+- char* name = 0;
++ png_charp name = 0;
+ int compression_type = 0;
+- char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++ png_charp profile = 0;
++#else
++ png_bytep profile = 0;
++#endif
+ png_uint_32 proflen = 0;
+ if ( png_get_iCCP(pngPtr, infoPtr, &name,
&compression_type, &profile, &proflen) ) {
+ // g_message("Found an iCCP chunk
named [%s] with %d bytes and comp %d", name, proflen, compression_type);
