Date: Thu, 19 Jul 2012 10:12:45 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301148 - in head/x11/slim: . files Message-ID: <201207191012.q6JACjq3067358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Thu Jul 19 10:12:45 2012 New Revision: 301148 URL: http://svn.freebsd.org/changeset/ports/301148 Log: 1.3.4 - 2012.06.26 * Replaced stderr writes function. * Fix numlock control. * Fix build with GLUT. * Fix PAM authentication. Submitted by: rea Approved by: maintainer timeout Added: head/x11/slim/files/patch-libpng-setjmp-image.cpp (contents, props changed) Modified: head/x11/slim/Makefile head/x11/slim/distinfo Modified: head/x11/slim/Makefile ============================================================================== --- head/x11/slim/Makefile Thu Jul 19 09:59:16 2012 (r301147) +++ head/x11/slim/Makefile Thu Jul 19 10:12:45 2012 (r301148) @@ -5,12 +5,9 @@ # $FreeBSD$ PORTNAME= slim -PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTVERSION= 1.3.4 CATEGORIES= x11 MASTER_SITES= http://slim.berlios.de/releases/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.release.asc -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Graphical login manager for X11, derived from Login.app @@ -45,9 +42,6 @@ CMAKE_ARGS+= -DUSE_PAM=no PLIST_SUB+= PAM="@comment " .endif -verify: checksum - gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.release.asc - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${PORTNAME}.conf @${REINPLACE_CMD} -e 's|"/etc"|"${PREFIX}/etc"|' \ @@ -57,7 +51,7 @@ post-patch: @${MV} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample @${REINPLACE_CMD} -e 's|std::snprintf|snprintf|' ${WRKSRC}/Ck.cpp -# Fix a previous bad install +# Fix a previous bad install - Ok to remove at version 1.3.5 or later pre-install: @${RM} -f ${LOCALBASE}/share/man/man1/slim.1 @${RMDIR} ${LOCALBASE}/share/man/man1 2>/dev/null || true Modified: head/x11/slim/distinfo ============================================================================== --- head/x11/slim/distinfo Thu Jul 19 09:59:16 2012 (r301147) +++ head/x11/slim/distinfo Thu Jul 19 10:12:45 2012 (r301148) @@ -1,4 +1,2 @@ -SHA256 (slim-1.3.3.tar.gz) = c15248d99c36cb45c66298b0797246d43cd851765536746a431a1533e48dbbb9 -SIZE (slim-1.3.3.tar.gz) = 226797 -SHA256 (slim-1.3.3.tar.gz.release.asc) = 14d2d9c1048ca624c8521bb815eb9bbd2802d03eea72069a5afd861ac970d430 -SIZE (slim-1.3.3.tar.gz.release.asc) = 1145 +SHA256 (slim-1.3.4.tar.gz) = 155c26460c98b9f0925624028b4254afc0de4fda33300f3ac45606b2c5cbd501 +SIZE (slim-1.3.4.tar.gz) = 227197 Added: head/x11/slim/files/patch-libpng-setjmp-image.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/slim/files/patch-libpng-setjmp-image.cpp Thu Jul 19 10:12:45 2012 (r301148) @@ -0,0 +1,33 @@ +--- image.cpp.orig 2012-07-05 11:54:10.000000000 +0400 ++++ image.cpp 2012-07-05 12:20:08.000000000 +0400 +@@ -746,6 +746,10 @@ + return(ret); + } + ++#if (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5) || PNG_LIBPNG_VER_MAJOR > 1 ++#define PNG_NEW_SETJMP_API ++#endif ++ + int + Image::readPng(const char *filename, int *width, int *height, + unsigned char **rgb, unsigned char **alpha) +@@ -781,7 +785,13 @@ + (png_infopp) NULL); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp( ++#ifdef PNG_NEW_SETJMP_API ++(png_jmpbuf(png_ptr)) ++#else ++png_ptr->jmpbuf ++#endif ++ )) { + goto png_destroy; + } + +@@ -894,3 +904,4 @@ + fclose(infile); + return(ret); + } ++#undef PNG_NEW_SETJMP_API
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207191012.q6JACjq3067358>