mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 20:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/inkscape: fix compilation under libpng 1.5

Browse Source
This commit is contained in:
William Pitcock 2011-05-14 21:07:33 -05:00
parent d88c8ba643
commit 2940035739
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/inkscape/APKBUILD
View File

@ -24,7 +24,7 @@ autoconf automake
depends="desktop-file-utils"
install=
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
"
inkscape-png15.patch"
_builddir="$srcdir"/$pkgname-$pkgver
@ -56,4 +56,5 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
md5sums="3c179eb998d49d1c312822e15773bf6d inkscape-0.48.1.tar.gz"
md5sums="3c179eb998d49d1c312822e15773bf6d inkscape-0.48.1.tar.gz
c2d1392e6489af822cb4b41ce3af877b inkscape-png15.patch"

33
main/inkscape/inkscape-png15.patch Normal file
View File

@ -0,0 +1,33 @@
--- 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;
}