diff options
| author | bapt <bapt@FreeBSD.org> | 2014-12-25 19:24:40 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-12-25 19:24:40 +0800 |
| commit | 3dd8dcbb925c9b43d0f734c0110afc76f79bf633 (patch) | |
| tree | c4e8b9eb1c6bda3fd790c6b6bd2d9cb142d917c1 /x11 | |
| parent | d226f40b1cc9100cce476f5bfaa792ed751a4866 (diff) | |
| download | freebsd-ports-gnome-3dd8dcbb925c9b43d0f734c0110afc76f79bf633.tar.gz freebsd-ports-gnome-3dd8dcbb925c9b43d0f734c0110afc76f79bf633.tar.zst freebsd-ports-gnome-3dd8dcbb925c9b43d0f734c0110afc76f79bf633.zip | |
Properly support png 1.5
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/metisse/Makefile | 4 | ||||
| -rw-r--r-- | x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c | 10 | ||||
| -rw-r--r-- | x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c | 31 |
3 files changed, 33 insertions, 12 deletions
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile index 36f14427d58a..2d72dd331fa3 100644 --- a/x11/metisse/Makefile +++ b/x11/metisse/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 CONFLICTS= fvwm-1.* fvwm-2.* LIB_DEPENDS= libNucleo.so:${PORTSDIR}/x11-toolkits/nucleo \ - libpng15.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts USES= gettext libtool pathfix pkgconfig python shebangfix tar:bzip2 @@ -41,7 +41,7 @@ WANT_GNOME= yes MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}" INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= MMX GLX ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \ diff --git a/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c b/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c deleted file mode 100644 index 908412dbccbd..000000000000 --- a/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c +++ /dev/null @@ -1,10 +0,0 @@ ---- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 13:52:20.000000000 +0100 -+++ fvwm-insitu/libs/PictureImageLoader.c 2012-05-22 07:28:06.000000000 +0200 -@@ -44,6 +44,7 @@ - #include "Fgdk-pixbuf.h" - #include "FRenderInit.h" - #include "FImage.h" -+#include "pngpriv.h" - - /* ---------------------------- local definitions -------------------------- */ - #define FIMAGE_CMD_ARGS Display *dpy, Window win, char *path, \ diff --git a/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c b/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c new file mode 100644 index 000000000000..1e3ab0d4b3d4 --- /dev/null +++ b/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c @@ -0,0 +1,31 @@ +--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 12:52:20 UTC ++++ fvwm-insitu/libs/PictureImageLoader.c +@@ -145,7 +145,7 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS) + return False; + } + #if 0 +- if (setjmp(Fpng_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(Fpng_ptr))) + { + Fpng_destroy_read_struct(&Fpng_ptr, &Finfo_ptr, NULL); + fclose(f); +@@ -165,16 +165,16 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS) + { + Fpng_set_expand(Fpng_ptr); + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_RGB_ALPHA) + { + hasa = 1; + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY_ALPHA) + { + hasa = 1; + hasg = 1; + } +- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY) ++ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY) + { + hasg = 1; + } |