Date: Thu, 25 Dec 2014 11:24:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375535 - in head/x11/metisse: . files Message-ID: <201412251124.sBPBOffv050219@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Dec 25 11:24:40 2014 New Revision: 375535 URL: https://svnweb.freebsd.org/changeset/ports/375535 QAT: https://qat.redports.org/buildarchive/r375535/ Log: Properly support png 1.5 Added: head/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c (contents, props changed) Deleted: head/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c Modified: head/x11/metisse/Makefile Modified: head/x11/metisse/Makefile ============================================================================== --- head/x11/metisse/Makefile Thu Dec 25 11:16:14 2014 (r375534) +++ head/x11/metisse/Makefile Thu Dec 25 11:24:40 2014 (r375535) @@ -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 \ Added: head/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c Thu Dec 25 11:24:40 2014 (r375535) @@ -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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412251124.sBPBOffv050219>