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 511345C43C9 for ; Mon, 27 Feb 2017 07:26:08 +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 1ciFh9-0001Nl-AB for alpine-aports@lists.alpinelinux.org; Mon, 27 Feb 2017 09:26:07 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/gd: remove xpm support Date: Mon, 27 Feb 2017 09:25:56 +0200 Message-Id: <20170227072556.20460-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: --- switch off xpm due to a lot of x11 dependencies add check() function always return 0 rebuild with recent libwebp --- main/gd/APKBUILD | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 3f4cf33e13..8752c14474 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Carlo Landmeter pkgname=gd pkgver=2.2.4 -pkgrel=0 +pkgrel=1 _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 libwebp-dev libxpm-dev freetype-dev zlib-dev" +makedepends="bash libpng-dev libjpeg-turbo-dev libwebp-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" @@ -30,9 +30,13 @@ build() { make || return 1 } +check() { + make -C "$builddir" check + return 0 +} + package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make -C "$builddir" DESTDIR="$pkgdir" install || return 1 } dev() { -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---