some packages update and rebuild

2017-02-15 13:52:22 +03:00
parent a2fbc97b8e
commit 23fd4d0482
9 changed files with 182 additions and 16 deletions
@@ -0,0 +1,34 @@
+diff -up gd-2.1.0/config/gdlib-config.in.multilib gd-2.1.0/config/gdlib-config.in
+--- gd-2.1.0/config/gdlib-config.in.multilib	2013-04-21 16:58:17.820010758 +0200
+++ gd-2.1.0/config/gdlib-config.in	2013-04-21 16:59:27.896317922 +0200
+@@ -7,9 +7,10 @@
+ # installation directories
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+libdir=`pkg-config gdlib --variable=libdir`
+ includedir=@includedir@
+ bindir=@bindir@
+ldflags=`pkg-config gdlib --variable=ldflags`
+ 
+ usage()
+ {
+@@ -68,7 +69,7 @@ while test $# -gt 0; do
+ 	echo @GDLIB_REVISION@
+ 	;;
+     --ldflags)
+-	echo @LDFLAGS@
+	echo $ldflags
+ 	;;
+     --libs)
+ 	echo -lgd @LIBS@ @LIBICONV@
+@@ -83,7 +84,7 @@ while test $# -gt 0; do
+ 	echo "GD library  @VERSION@"
+ 	echo "includedir: $includedir"
+ 	echo "cflags:     -I@includedir@"
+-	echo "ldflags:    @LDFLAGS@"
+	echo "ldflags:    $ldflags"
+ 	echo "libs:       @LIBS@ @LIBICONV@"
+ 	echo "libdir:     $libdir"
+ 	echo "features:   @FEATURES@"
+
@@ -0,0 +1,42 @@
+From 2b3dd57a6ccb2940f2e9119ae04e14362e2a1f61 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 22 Jul 2016 08:14:12 +0200
+Subject: [PATCH] Fix gd2/gd2_read.c:8:6: error: 'error' may be used
+ uninitialized in this function [-Werror=maybe-uninitialized]
+
+Also report about any error, not only the last one.
+---
+ tests/gd2/gd2_read.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/tests/gd2/gd2_read.c b/tests/gd2/gd2_read.c
+index 94fe069..8ce8bd1 100644
+--- a/tests/gd2/gd2_read.c
+++ b/tests/gd2/gd2_read.c
+@@ -5,7 +5,7 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-	int error, i = 0;
+	int error = 0, i = 0;
+ 	gdImagePtr im, exp;
+ 	FILE *fp;
+ 	char *path[] = {
+@@ -40,8 +40,6 @@ int main(int argc, char *argv[])
+ 				gdTestErrorMsg("image %s differs from expected result\n", path[i]);
+ 				gdImageDestroy(im);
+ 				error = 1;
+-			} else {
+-				error = 0;
+ 			}
+ 			if (exp) {
+ 				gdImageDestroy(exp);
+@@ -52,8 +50,6 @@ int main(int argc, char *argv[])
+ 				gdTestErrorMsg("image %s should have failed to be loaded\n", path[i]);
+ 				gdImageDestroy(im);
+ 				error = 1;
+-			} else {
+-				error = 0;
+ 			}
+ 		}
+ 		i++;
@@ -0,0 +1,51 @@
+From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Wed, 18 Jan 2017 13:59:02 +0100
+Subject: [PATCH] Fix build issue regarding INT_MAX
+
+For portability gd_gd2.c needs to include <limits.h>.
+---
+ src/gd_gd2.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gd_gd2.c b/src/gd_gd2.c
+index c2904ca..049c4c5 100644
+--- a/src/gd_gd2.c
+++ b/src/gd_gd2.c
+@@ -74,6 +74,7 @@
+ 
+ /* 2.0.29: no more errno.h, makes windows happy */
+ #include <math.h>
+#include <limits.h>
+ #include <string.h>
+ #include "gd.h"
+ #include "gd_errors.h"
+
+
+From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Thu, 19 Jan 2017 01:02:58 +0100
+Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.
+
+We make sure to never pass a negative `int` as argument to a `size_t`
+parameter.
+---
+ src/gd_io_dp.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
+index eda2eeb..cb38794 100644
+--- a/src/gd_io_dp.c
+++ b/src/gd_io_dp.c
+@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
+ 		rlen = dp->realSize - dp->pos;
+ 	}
+ 
+	if (rlen < 0) {
+		return 0;
+	}
+
+ 	memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
+ 	dp->pos += rlen;
+ 
+