From 23b9a4551f77c59c198fb0ab0c1b3fab1b59713c Mon Sep 17 00:00:00 2001
From: Valery Kartel <valery.kartel@gmail.com>
Date: Fri, 24 Feb 2017 13:23:36 +0200
Subject: main/gd: upgrade to 2.2.4

---
 main/gd/APKBUILD | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'main/gd/APKBUILD')

diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index 978e2ad50c..3f4cf33e13 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -1,21 +1,19 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=gd
-pkgver=2.2.3
-_myver=${pkgver/_rc/RC}
-pkgrel=1
+pkgver=2.2.4
+pkgrel=0
+_pkgreal=lib$pkgname
 pkgdesc="Library for the dynamic creation of images by programmers"
 url="http://libgd.github.io/"
 arch="all"
 license="custom"
 depends=
-makedepends="libpng-dev libjpeg-turbo-dev freetype-dev zlib-dev"
-subpackages="$pkgname-dev"
-source="https://github.com/libgd/libgd/releases/download/gd-$pkgver/libgd-$pkgver.tar.xz
-	CVE-2016-7568.patch
-	"
-
-builddir="$srcdir"/lib$pkgname-$_myver
+makedepends="libpng-dev libjpeg-turbo-dev libwebp-dev libxpm-dev freetype-dev zlib-dev"
+subpackages="$pkgname-dev $_pkgreal:libs"
+source="https://github.com/$_pkgreal/$_pkgreal/releases/download/$pkgname-$pkgver/$_pkgreal-$pkgver.tar.xz
+	CVE-2016-7568.patch"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	cd "$builddir"
@@ -26,10 +24,6 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-png \
-		--with-freetype \
-		--with-jpeg \
-		--without-xpm \
 		--without-fontconfig \
 		--disable-werror \
 		|| return 1
@@ -41,9 +35,11 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="14e4134c129b4c166c3a0549a32ef340  libgd-2.2.3.tar.xz
-fca9871b791d6ac88af7d6d5ce8c59d1  CVE-2016-7568.patch"
-sha256sums="746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c  libgd-2.2.3.tar.xz
-0b7b7ddfc5200220763efb47cc6b56a6275fd5af70e85a8c91c667344f664012  CVE-2016-7568.patch"
-sha512sums="bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557  libgd-2.2.3.tar.xz
+dev() {
+       default_dev || return 1
+       depends="$pkgname perl"
+       mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin
+}
+
+sha512sums="07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5  libgd-2.2.4.tar.xz
 8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716  CVE-2016-7568.patch"
-- 
cgit v1.2.3