Attachment 155855 Details for Bug 199612 – patch to 0.7.5

[patch] patch to 0.7.5

graphics-optipng-0.7.4-to-0.7.5.patch (text/plain), 3.96 KB, created by Thomas Hurst on 2015-04-22 14:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2015-04-22 14:14:53 UTC

Size: 3.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 384474)
>+++ Makefile	(working copy)
>@@ -1,9 +1,8 @@
>-# Created by: Thomas Hurst <freaky@aagh.net>
>+# Created by: Thomas Hurst <tom@hur.st>
> # $FreeBSD$
> 
> PORTNAME=	optipng
>-PORTVERSION=	0.7.4
>-PORTREVISION=	1
>+PORTVERSION=	0.7.5
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION}
> 
>@@ -15,27 +14,24 @@
> 
> OPTIONS_DEFINE=	BUNDLED_LIBPNG BUNDLED_ZLIB
> 
>-BUNDLED_LIBPNG_DESC=	Use bundled libpng
>-BUNDLED_ZLIB_DESC=	Use bundled zlib
>+BUNDLED_LIBPNG_DESC=		Use bundled libpng
>+BUNDLED_LIBPNG_CONFIGURE_OFF=	--with-system-libpng
>+BUNDLED_LIBPNG_CONFIGURE_ON=	--without-system-libpng
>+BUNDLED_LIBPNG_LIB_DEPENDS_OFF=	libpng.so:${PORTSDIR}/graphics/png
>+BUNDLED_LIBPNG_CFLAGS_OFF=	-I${LOCALBASE}/include
>+BUNDLED_LIBPNG_LDFLAGS_OFF=	-L${LOCALBASE}/lib
> 
>+BUNDLED_ZLIB_DESC=		Use bundled zlib
>+BUNDLED_ZLIB_CONFIGURE_OFF=	--with-system-zlib
>+BUNDLED_ZLIB_CONFIGURE_ON=	--without-system-zlib
>+
>+USES=	gmake
> HAS_CONFIGURE=	yes
>+
> PLIST_FILES=	bin/optipng man/man1/optipng.1.gz
> PORTDOCS=	history.txt optipng.man.html optipng.man.pdf optipng.man.txt \
> 		png_optimization.html todo.txt
> 
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_LIBPNG)
>-CONFIGURE_ARGS+=	--with-system-libpng
>-CFLAGS+=	"-I${LOCALBASE}/include"
>-LDFLAGS+=	"-L${LOCALBASE}/lib"
>-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
>-.endif
>-
>-.if empty(PORT_OPTIONS:MBUNDLED_ZLIB)
>-CONFIGURE_ARGS+=	--with-system-zlib
>-.endif
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${STAGEDIR}${PREFIX}/bin/
> 	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
>Index: distinfo
>===================================================================
>--- distinfo	(revision 384474)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (optipng-0.7.4.tar.gz) = 520b5d5a9405dbdc5c905dd0cff87211e69c4ed2059744037510e613fe8237ff
>-SIZE (optipng-0.7.4.tar.gz) = 1613916
>+SHA256 (optipng-0.7.5.tar.gz) = 74e54b798b012dff8993fb8d90185ca83f18cfa4935f4a93b0bcfc33c849619d
>+SIZE (optipng-0.7.5.tar.gz) = 2141943
>Index: files/patch-src-optipng-osys.c
>===================================================================
>--- files/patch-src-optipng-osys.c	(revision 384474)
>+++ files/patch-src-optipng-osys.c	(working copy)
>@@ -1,11 +0,0 @@
>---- src/optipng/osys.c.orig	2011-07-22 13:49:00.000000000 +0900
>-+++ src/optipng/osys.c	2012-06-14 18:51:09.000000000 +0900
>-@@ -435,7 +435,7 @@
>-     if (chmod(dest_path, mode) != 0)
>-         return -1;
>- 
>--#ifdef AT_FDCWD
>-+#if 0 /* def AT_FDCWD */
>-     {
>-         struct timespec times[2];
>- 
>Index: files/patch-src_optipng_osys.c
>===================================================================
>--- files/patch-src_optipng_osys.c	(revision 0)
>+++ files/patch-src_optipng_osys.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/optipng/osys.c.orig	2015-04-22 09:09:17 UTC
>++++ src/optipng/osys.c
>+@@ -518,7 +518,7 @@ osys_copy_attr(const char *src_path, con
>+     if (chmod(dest_path, sbuf.st_mode) != 0)
>+         result = -1;
>+ 
>+-#ifdef AT_FDCWD
>++#if 0
>+     {
>+         struct timespec times[2];
>+ 
>Index: files/patch-src_pngxtern_pngxmem.c
>===================================================================
>--- files/patch-src_pngxtern_pngxmem.c	(revision 0)
>+++ files/patch-src_pngxtern_pngxmem.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/pngxtern/pngxmem.c.orig	2015-04-22 09:07:30 UTC
>++++ src/pngxtern/pngxmem.c
>+@@ -34,7 +34,7 @@ pngx_malloc_rows_extended(png_structp pn
>+       png_error(png_ptr, "Missing IHDR");
>+    row_size = png_get_rowbytes(png_ptr, info_ptr);
>+    /* libpng sets row_size to 0 when the width is too large to process. */
>+-   if (row_size == 0 || height > (pngx_alloc_size_t)(-1) / sizeof(png_bytep))
>++   if (row_size == 0 || height > (pngx_alloc_size_t)(-1U) / sizeof(png_bytep))
>+       png_error(png_ptr, "Can't handle exceedingly large image dimensions");
>+    if (row_size < min_row_size)
>+       row_size = min_row_size;

Flags:

tom: maintainer-approval+

Actions: View | Diff

Attachments on bug 199612: 155855 | 155856 | 155857