summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-17 11:48:29 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-17 11:48:29 +0000
commit2d816f1a7d71a6f21bafc1df27a61f1a3eea583c (patch)
tree88dfb51f59d0442514a02e77588193f6f84b8326 /x11-misc/fireflies/files
parentVersion bump (diff)
downloadgentoo-2-2d816f1a7d71a6f21bafc1df27a61f1a3eea583c.tar.gz
gentoo-2-2d816f1a7d71a6f21bafc1df27a61f1a3eea583c.tar.bz2
gentoo-2-2d816f1a7d71a6f21bafc1df27a61f1a3eea583c.zip
Fix building with libpng15 wrt #394971 by Elijah El Lazkani. Fix missing license entry for internal libgfx library.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/fireflies/files')
-rw-r--r--x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
new file mode 100644
index 000000000000..23d471b8fd13
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
@@ -0,0 +1,20 @@
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -39,7 +39,7 @@
+ // Because we didn't set up any error handlers, we need to be
+ // prepared to handle longjmps out of the library on error
+ // conditions.
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+@@ -129,7 +129,7 @@
+ return false;
+ }
+
+- if( setjmp(png_ptr->jmpbuf) )
++ if( setjmp(png_jmpbuf(png_ptr)) )
+ {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);