X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id B48B0DC10BA for ; Tue, 17 May 2016 19:19:34 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 55B81DC00F9 for ; Tue, 17 May 2016 19:19:34 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id r12so7214545wme.0 for ; Tue, 17 May 2016 12:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=JTz7lNejdBmVGz6cf0l5XSuoZ0A9skDGGGR1h/PcGxs=; b=x+XJ4LpC/jtdrPZSHg82Dpu57XnZ1fCuCs9pBHf9Ghyf5nirqVgXf1GyGMfmAimaSy LraNPZbkcYt/ztW36YxWAMdeWRDkP7ciP0hPAU1tu3s+BFbb8+VZvcdkA9QCWWZwrU2J Visteli/iTBzXJDOVGm7AYLPjDGlATH9953di8kgSzpjxtuM3Z3aKPhgxM93BDKGbjad 360L2ZB7jBDiNdve3kK08HB3sTCbZYwU0dsJoT6sI9myqyfgMJIVxsEF6/KKTVOL0gfK yNxZ5YR2Bh1k+zYyEORqjBgMUo5WLmZpCIJWEyMusdt3MZZBRCIqQrromr2XA6/SNBcg Tduw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JTz7lNejdBmVGz6cf0l5XSuoZ0A9skDGGGR1h/PcGxs=; b=fL5FbfbQ2zGmSO2mf34xb01eHV/ypf9HUBWbC8BfrgI1ctnz7UBbr2CXu5T0tdylGu dLB4I6ZtaSckaSnk/oKSwPfhVMxrYnLx0bD4/4lnPw7TNHuZsBGnpNt1fYGCxK6p76rH SNd0hu2kXm3Ze/lBBeIFRFKNQ7LSPwCZgGUzzDm5S+aD9yJ2o0gUUPmcKvehMoS4TNk3 efW02TtSzRl5n6qR+SOwoNM54EwB30toMIOo/tr6yj8eYRko2Pbbfu+LN+5iMfGtCUCy vA15GqRITMSJGq6GRm+3e5b2JQ8zt2BWQDKRbP0ui2/XfGNy538PGJvc8+SJoHmkr1/r fZMQ== X-Gm-Message-State: AOPr4FXGM/9peNAUyrYcQCkcIFsF8FcUj3DKeBJA9xoz9lQIvOHWvwvoVfmhJ+4xg418dQ== X-Received: by 10.28.90.65 with SMTP id o62mr24768774wmb.16.1463512773026; Tue, 17 May 2016 12:19:33 -0700 (PDT) Received: from localhost.localdomain (tsn77-247-182-241.dyn.nltelcom.net. [77.247.182.241]) by smtp.gmail.com with ESMTPSA id kq9sm4643145wjc.26.2016.05.17.12.19.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 12:19:32 -0700 (PDT) From: Michael Koloberdin To: alpine-aports@lists.alpinelinux.org Cc: Michael Koloberdin Subject: [alpine-aports] [PATCH] testing/optipng: use builtin zlib; patch info: https://sourceforge.net/p/optipng/bugs/63/ Date: Tue, 17 May 2016 19:19:25 +0000 Message-Id: <1463512765-27879-1-git-send-email-koloberdin@gmail.com> X-Mailer: git-send-email 2.6.6 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/optipng/APKBUILD | 16 ++++++++++------ testing/optipng/builtin-zlib.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 testing/optipng/builtin-zlib.patch diff --git a/testing/optipng/APKBUILD b/testing/optipng/APKBUILD index 9980a0d..a409423 100644 --- a/testing/optipng/APKBUILD +++ b/testing/optipng/APKBUILD @@ -1,16 +1,17 @@ # Maintainer: Michael Koloberdin pkgname=optipng pkgver=0.7.6 -pkgrel=0 +pkgrel=1 pkgdesc="Compresses PNG files to a smaller size, without losing any information." url="http://optipng.sourceforge.net/" arch="all" license="ZLIB" depends="" -makedepends="zlib-dev" +makedepends="" install="" subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + builtin-zlib.patch" _builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -37,6 +38,9 @@ package() { install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 } -md5sums="568e0738358450eca69ecf578d48f26c optipng-0.7.6.tar.gz" -sha256sums="4870631fcbd3825605f00a168b8debf44ea1cda8ef98a73e5411eee97199be80 optipng-0.7.6.tar.gz" -sha512sums="d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184 optipng-0.7.6.tar.gz" +md5sums="568e0738358450eca69ecf578d48f26c optipng-0.7.6.tar.gz +510408cb0f6cdcdf9c94ab9872f33a9a builtin-zlib.patch" +sha256sums="4870631fcbd3825605f00a168b8debf44ea1cda8ef98a73e5411eee97199be80 optipng-0.7.6.tar.gz +3824daeba9185b5aa3e8a21dc243817bebb0cfb53ee102d3f2cc81ce5263fa73 builtin-zlib.patch" +sha512sums="d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184 optipng-0.7.6.tar.gz +062b12062f6d80127f89da88d216ad69c152f85ff03537f3c389c3e7ecc798bf21d62e1bb1065a0234b68b1acda6ef670ef5971c45d7ed4bbd5bdd3786fdd0b0 builtin-zlib.patch" diff --git a/testing/optipng/builtin-zlib.patch b/testing/optipng/builtin-zlib.patch new file mode 100644 index 0000000..a09cdad --- /dev/null +++ b/testing/optipng/builtin-zlib.patch @@ -0,0 +1,14 @@ +diff -urp optipng-0.7.6-orig/configure optipng-0.7.6/configure +--- optipng-0.7.6-orig/configure 2014-12-01 07:25:00.000000000 +0200 ++++ optipng-0.7.6/configure 2016-05-17 20:56:08.950224977 +0300 +@@ -234,6 +234,10 @@ then + fi + if test "$CPPFLAGS" + then ++ if test "$with_system_zlib" -eq 0 ++ then ++ CPPFLAGS="-I../zlib ${CPPFLAGS}" ++ fi + sed_preconfig_libpng=" + $sed_preconfig_libpng + s|^CPPFLAGS *=.*|CPPFLAGS = $CPPFLAGS| -- 2.6.6 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---