Date: Sunday, September 3, 2017 @ 09:01:39 Author: pierre Revision: 304609
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gd/repos/extra-i686/PKGBUILD (from rev 304608, gd/trunk/PKGBUILD) gd/repos/extra-x86_64/PKGBUILD (from rev 304608, gd/trunk/PKGBUILD) Deleted: gd/repos/extra-i686/PKGBUILD gd/repos/extra-i686/gd-2.2.4-upstream.patch gd/repos/extra-x86_64/PKGBUILD gd/repos/extra-x86_64/gd-2.2.4-upstream.patch --------------------------------------+ /PKGBUILD | 70 +++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 42 ------------------- extra-i686/gd-2.2.4-upstream.patch | 50 ----------------------- extra-x86_64/PKGBUILD | 42 ------------------- extra-x86_64/gd-2.2.4-upstream.patch | 50 ----------------------- 5 files changed, 70 insertions(+), 184 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-09-03 09:01:22 UTC (rev 304608) +++ extra-i686/PKGBUILD 2017-09-03 09:01:39 UTC (rev 304609) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=gd -pkgver=2.2.4 -pkgrel=2 -pkgdesc="Library for the dynamic creation of images by programmers" -arch=('i686' 'x86_64') -url="http://www.libgd.org/" -license=('custom') -depends=('fontconfig' 'libxpm' 'libwebp') -optdepends=('perl: bdftogd script') -checkdepends=('ttf-liberation') -source=("https://github.com/libgd/libgd/releases/download/gd-${pkgver}/libgd-${pkgver}.tar.xz" - 'gd-2.2.4-upstream.patch') -md5sums=('a244855a323a3ea1975d708eb1e12b7a' - '7db6743a61b30471d0b466e6a6c54a49') - -prepare() { - cd libgd-${pkgver} - patch -p1 -i ${srcdir}/gd-2.2.4-upstream.patch -} - -build() { - cd libgd-${pkgver} - ./configure \ - --prefix=/usr \ - --disable-rpath - make -} - -check() { - cd libgd-${pkgver} - # see https://github.com/libgd/libgd/issues/302 - [[ ${CARCH} == 'i686' ]] || FREETYPE_PROPERTIES='truetype:interpreter-version=35' make check -} - -package() { - cd libgd-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: gd/repos/extra-i686/PKGBUILD (from rev 304608, gd/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-09-03 09:01:39 UTC (rev 304609) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=gd +pkgver=2.2.5 +pkgrel=1 +pkgdesc="Library for the dynamic creation of images by programmers" +arch=('i686' 'x86_64') +url="http://www.libgd.org/" +license=('custom') +depends=('fontconfig' 'libxpm' 'libwebp') +optdepends=('perl: bdftogd script') +checkdepends=('ttf-liberation') +source=("https://github.com/libgd/libgd/releases/download/gd-${pkgver}/libgd-${pkgver}.tar.xz") +md5sums=('8d8d6a6189513ecee6e893b1fb109bf8') + +build() { + cd libgd-${pkgver} + ./configure \ + --prefix=/usr \ + --disable-rpath + make +} + +check() { + cd libgd-${pkgver} + # see https://github.com/libgd/libgd/issues/302 + [[ ${CARCH} == 'i686' ]] || FREETYPE_PROPERTIES='truetype:interpreter-version=35' make check +} + +package() { + cd libgd-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-i686/gd-2.2.4-upstream.patch =================================================================== --- extra-i686/gd-2.2.4-upstream.patch 2017-09-03 09:01:22 UTC (rev 304608) +++ extra-i686/gd-2.2.4-upstream.patch 2017-09-03 09:01:39 UTC (rev 304609) @@ -1,50 +0,0 @@ -From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" <cmbecke...@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" <cmbecke...@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; - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-09-03 09:01:22 UTC (rev 304608) +++ extra-x86_64/PKGBUILD 2017-09-03 09:01:39 UTC (rev 304609) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=gd -pkgver=2.2.4 -pkgrel=2 -pkgdesc="Library for the dynamic creation of images by programmers" -arch=('i686' 'x86_64') -url="http://www.libgd.org/" -license=('custom') -depends=('fontconfig' 'libxpm' 'libwebp') -optdepends=('perl: bdftogd script') -checkdepends=('ttf-liberation') -source=("https://github.com/libgd/libgd/releases/download/gd-${pkgver}/libgd-${pkgver}.tar.xz" - 'gd-2.2.4-upstream.patch') -md5sums=('a244855a323a3ea1975d708eb1e12b7a' - '7db6743a61b30471d0b466e6a6c54a49') - -prepare() { - cd libgd-${pkgver} - patch -p1 -i ${srcdir}/gd-2.2.4-upstream.patch -} - -build() { - cd libgd-${pkgver} - ./configure \ - --prefix=/usr \ - --disable-rpath - make -} - -check() { - cd libgd-${pkgver} - # see https://github.com/libgd/libgd/issues/302 - [[ ${CARCH} == 'i686' ]] || FREETYPE_PROPERTIES='truetype:interpreter-version=35' make check -} - -package() { - cd libgd-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: gd/repos/extra-x86_64/PKGBUILD (from rev 304608, gd/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-09-03 09:01:39 UTC (rev 304609) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=gd +pkgver=2.2.5 +pkgrel=1 +pkgdesc="Library for the dynamic creation of images by programmers" +arch=('i686' 'x86_64') +url="http://www.libgd.org/" +license=('custom') +depends=('fontconfig' 'libxpm' 'libwebp') +optdepends=('perl: bdftogd script') +checkdepends=('ttf-liberation') +source=("https://github.com/libgd/libgd/releases/download/gd-${pkgver}/libgd-${pkgver}.tar.xz") +md5sums=('8d8d6a6189513ecee6e893b1fb109bf8') + +build() { + cd libgd-${pkgver} + ./configure \ + --prefix=/usr \ + --disable-rpath + make +} + +check() { + cd libgd-${pkgver} + # see https://github.com/libgd/libgd/issues/302 + [[ ${CARCH} == 'i686' ]] || FREETYPE_PROPERTIES='truetype:interpreter-version=35' make check +} + +package() { + cd libgd-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-x86_64/gd-2.2.4-upstream.patch =================================================================== --- extra-x86_64/gd-2.2.4-upstream.patch 2017-09-03 09:01:22 UTC (rev 304608) +++ extra-x86_64/gd-2.2.4-upstream.patch 2017-09-03 09:01:39 UTC (rev 304609) @@ -1,50 +0,0 @@ -From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" <cmbecke...@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" <cmbecke...@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; -