X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id 0F6B45C43CF for ; Mon, 27 Feb 2017 07:37:35 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1ciFsE-0001QW-GI for alpine-aports@lists.alpinelinux.org; Mon, 27 Feb 2017 09:37:34 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] testing/php7.1: switch back to bundled libgd Date: Mon, 27 Feb 2017 09:37:34 +0200 Message-Id: <20170227073734.23479-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.11.1 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- do not use system libgd because of bug #6936 switch off gd xpm support due to a lot of x11 dependencies rebuild with recent libwebp, libzip add dummy check() function --- testing/php7.1/APKBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/testing/php7.1/APKBUILD b/testing/php7.1/APKBUILD index 3234471035..717daa1c96 100644 --- a/testing/php7.1/APKBUILD +++ b/testing/php7.1/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Valery Kartel pkgname=php7.1 pkgver=7.1.2 -pkgrel=2 +pkgrel=3 _apiver=20160303 _suffix=${pkgname#php} _pkgreal=${pkgname%$_suffix} @@ -18,7 +18,7 @@ provides="$replaces $pkgname-cli" makedepends="autoconf bison re2c apache2-dev libxml2-dev libxslt-dev libzip-dev bzip2-dev zlib-dev aspell-dev enchant-dev expat-dev pcre-dev curl-dev gmp-dev icu-dev imap-dev gd-dev libical-dev libressl-dev openldap-dev net-snmp-dev db-dev krb5-dev gdbm-dev sqlite-dev - freetds-dev mariadb-dev postgresql-dev unixodbc-dev freetype-dev tidyhtml-dev libxpm-dev + freetds-dev mariadb-dev postgresql-dev unixodbc-dev freetype-dev tidyhtml-dev libwebp-dev libpng-dev libjpeg-turbo-dev libmcrypt-dev recode-dev libedit-dev gettext-dev file-dev " source="http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2 @@ -98,7 +98,8 @@ _build() { --with-enchant=shared \ --enable-exif=shared \ --enable-ftp=shared \ - --with-gd=shared,/usr --enable-gd-native-ttf --disable-gd-jis-conv \ + --with-gd=shared --with-jpeg-dir --with-png-dir --with-webp-dir --with-xpm-dir=no \ + --enable-gd-native-ttf --disable-gd-jis-conv \ --with-gettext=shared \ --with-gmp=shared \ --with-iconv=shared \ @@ -173,6 +174,10 @@ build() { make } +check() { + : +} + package() { pkgdesc="$pkgdesc (command line interface)" -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---