1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00

Properly fix for png > 1.5

This commit is contained in:
Baptiste Daroussin 2014-12-23 22:56:51 +00:00
parent fcb4ae23ca
commit 9439524705
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=375363
3 changed files with 13 additions and 21 deletions

View File

@ -14,7 +14,7 @@ COMMENT?= Another gtk-based MP3 frontend
OPTIONS_DEFINE= MPG321
MPG321_DESC= use mpg321 instead of mpg123
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools \
xmp:${PORTSDIR}/audio/xmp
@ -26,7 +26,7 @@ USES= gettext libtool
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_GNOME_CONFIG=no
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
post-patch:

View File

@ -0,0 +1,11 @@
--- src/ui_pixbuf_save.c.orig 2002-03-09 20:00:13.000000000 +0100
+++ src/ui_pixbuf_save.c 2014-12-23 23:54:56.105240001 +0100
@@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu
return FALSE;
}
- if (setjmp (png_ptr->jmpbuf))
+ if (setjmp (png_jmpbuf (png_ptr)))
{
png_destroy_write_struct (&png_ptr, &info_ptr);
fclose (handle);

View File

@ -1,19 +0,0 @@
--- src/ui_pixbuf_save.c.orig 2002-03-09 20:00:13.000000000 +0100
+++ src/ui_pixbuf_save.c 2012-05-09 13:04:57.000000000 +0200
@@ -24,6 +24,7 @@
#ifdef HAVE_LIBPNG
#include <png.h> /* for png saving, below */
+#include <pngpriv.h>
#endif
@@ -86,7 +87,7 @@
return FALSE;
}
- if (setjmp (png_ptr->jmpbuf))
+ if (setjmp (png_ptr->longjmp_buffer))
{
png_destroy_write_struct (&png_ptr, &info_ptr);
fclose (handle);