diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-08-11 21:36:06 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-08-11 21:36:06 +0000 |
| commit | ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7 (patch) | |
| tree | 1e6751309d1894b2f70c1984e76346501b505e9b /sci-biology/arb/files | |
| parent | Move dev-libs/ding-libs from rion-overlay (diff) | |
| download | gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.tar.gz gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.tar.bz2 gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.zip | |
Add missing dependency on sys-process/time and fix building with libpng-1.5 wrt #378353. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the report and Samuli Suominen <ssuominen@gentoo.org> for the patch
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology/arb/files')
| -rw-r--r-- | sci-biology/arb/files/5.2-libpng15.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sci-biology/arb/files/5.2-libpng15.patch b/sci-biology/arb/files/5.2-libpng15.patch new file mode 100644 index 000000000000..3d750e76efe3 --- /dev/null +++ b/sci-biology/arb/files/5.2-libpng15.patch @@ -0,0 +1,45 @@ +Fix building with libpng-1.5 + +https://bugs.gentoo.org/show_bug.cgi?id=378353 + +Patch written by Samuli Suominen <ssuominen@gentoo.org> +--- a/GL/glpng/glpng.c ++++ b/GL/glpng/glpng.c +@@ -285,7 +285,7 @@ + endinfo = png_create_info_struct(png); + + // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; +@@ -390,7 +390,7 @@ + endinfo = png_create_info_struct(png); + + // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; +@@ -569,7 +569,7 @@ + #define ALPHA *q + + switch (trans) { +- case PNG_CALLBACK: ++ case PNG_CALLBACKT: + FORSTART + ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); + FOREND +--- a/GL/glpng/glpng.h ++++ b/GL/glpng/glpng.h +@@ -57,7 +57,7 @@ + #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS + + /* Transparency parameters */ +-#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ ++#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */ + #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ + #define PNG_SOLID -1 /* No transparency */ + #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ |