Commit b2150537 authored by Natanael Copa's avatar Natanael Copa

main/inkscape: upgrade to 0.48.4

parent 01df8177
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=inkscape
pkgver=0.48.3.1
pkgrel=6
pkgver=0.48.4
pkgrel=0
pkgdesc="A vector-based drawing program - svg compliant"
url="http://inkscape.sourceforge.net/"
arch="all"
......@@ -25,9 +25,7 @@ tar
depends="desktop-file-utils"
install=
subpackages="$pkgname-lang"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
inkscape-png15.patch
poppler20.patch"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -59,6 +57,4 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
md5sums="ccf8ccd9e66199badb8c35ea3851a888 inkscape-0.48.3.1.tar.gz
c2d1392e6489af822cb4b41ce3af877b inkscape-png15.patch
e5b13a78d073150367749b93f5605ffb poppler20.patch"
md5sums="2c7149e877609f3f7e7a9d4e6f510d2b inkscape-0.48.4.tar.gz"
--- inkscape-0.48.1.orig/src/sp-image.cpp
+++ inkscape-0.48.1/src/sp-image.cpp
@@ -388,7 +388,7 @@
{
char* name = 0;
int compression_type = 0;
- char* profile = 0;
+ png_byte* profile = 0;
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);
--- inkscape-0.48.1.orig/src/helper/png-write.cpp
+++ inkscape-0.48.1/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.orig/src/extension/internal/pdfinput/svg-builder.cpp
+++ inkscape-0.48.1/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;
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment