summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/feh/files/feh-1.11.2-libpng15.patch')
-rw-r--r--media-gfx/feh/files/feh-1.11.2-libpng15.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/media-gfx/feh/files/feh-1.11.2-libpng15.patch b/media-gfx/feh/files/feh-1.11.2-libpng15.patch
new file mode 100644
index 000000000000..d04027b72bca
--- /dev/null
+++ b/media-gfx/feh/files/feh-1.11.2-libpng15.patch
@@ -0,0 +1,25 @@
+Fix compilation against libpng-1.5
+https://github.com/derf/feh/commit/bbc68473129227511e1fb1f9876e3cb68bc7fa26#diff-1
+
+diff --git a/src/feh_png.c b/src/feh_png.c
+index cefd4c8..f02aecb 100644
+--- a/src/feh_png.c
++++ b/src/feh_png.c
+@@ -66,7 +66,7 @@ gib_hash *feh_png_read_comments(char *file)
+ return hash;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ return hash;
+@@ -124,7 +124,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
+ return 0;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ png_destroy_info_struct(png_ptr, &info_ptr);