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 3ECD4DC3D52 for ; Tue, 5 Apr 2016 13:14:46 +0000 (UTC) Received: from mail-lb0-f194.google.com (mail-lb0-f194.google.com [209.85.217.194]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id C1D4EDC1529 for ; Tue, 5 Apr 2016 13:14:44 +0000 (UTC) Received: by mail-lb0-f194.google.com with SMTP id gk8so1092565lbc.2 for ; Tue, 05 Apr 2016 06:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=orxi1Gtwz6DW7r+W61fabaxxZ2aHN00VTHy4TtTPi0U=; b=hPIxZFe1nIJCDJrd0Lzzyu3FtgQTvR36e5Sn1GZvT+PsnEFMTCxShS/4O+Dq9aiDip 6vJRnNahyByQrCTX4L0OjwFnBc1xJ5D7V5sjf6sDI4U/wbv32nHjNG4dzJjHRzhGOiyZ EoipqVeJ4VYHs/5ST90wU6ojPF/nv/gSo1Vs8YTjL+szH7qprdzURNtkRHA6ekeFiOUt vK6ZqXMYX62dzwn2THzRLOCo1gDuwWPjU5ZNdjbS4DXPvH8qWmDxjl79HqRU+878Y7cQ zMJ50DOaTv6LU92dwgVUNBtROeNtWbZbP122HUtSESBQ1b73KAsGiyxJVhYfslrcJ5YU tUkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=orxi1Gtwz6DW7r+W61fabaxxZ2aHN00VTHy4TtTPi0U=; b=HN3nY+gk4nbxpHLn/WOqZqaH3DWFVxcGycBh1vdZZvT6F1xqRkiws+jWFyvnMxzrlp jVuxklXEmQZ5q282f/cfgGZqSUx+tTAvs8nB0UegOdDMImiGayqH5fz2itWIw7LbxQ1y v7ghEESXh4jbukvdLCutVmshNv4swOUTgldNDsAOEB5UkFXYbB4ZqnrucJjk2kBi1h3v hi3+q5f1yKUEO9cV7BbrIvOWjENUyb3dW71pMQi9RLg3APLGMKPK+XwjrHRS7yR8RJ74 s9TasAtLl0kq2HuFJeZe17zTpapOjccNWPaFpvQXvVdNoPs8u3+hFYA16N0lxTHNxkG6 WsjQ== X-Gm-Message-State: AD7BkJK/OFN/7KNqj/48FGEkj4IdJ9GlaqdWYKReuKgBp0DSHJ4ffsOKybMukZQitcBkfw== X-Received: by 10.112.168.194 with SMTP id zy2mr7254480lbb.102.1459750498650; Sun, 03 Apr 2016 23:14:58 -0700 (PDT) Received: from vostro.util.wtbts.net ([2001:1bc8:101:f402:21a:9fff:fe0c:4022]) by smtp.gmail.com with ESMTPSA id m35sm2668087lfi.25.2016.04.03.23.14.58 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 03 Apr 2016 23:14:58 -0700 (PDT) Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= Date: Mon, 4 Apr 2016 09:14:55 +0300 From: Timo Teras To: Stuart Cardall Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH v2] testing/php7: add iconv subpkg Message-ID: <20160404091455.3a27f4a7@vostro.util.wtbts.net> In-Reply-To: <1459704185-7807-1-git-send-email-developer@it-offshore.co.uk> References: <1459704185-7807-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP On Sun, 3 Apr 2016 17:23:05 +0000 Stuart Cardall wrote: > --- > Changes v1 -> v2: > - pkgrel bumped correctly > = this should apply cleanly after Valery's 7.0.5 patch sent today > > testing/php7/APKBUILD | 27 +++++++++++++++++---------- > testing/php7/libintl-iconv.patch | 10 ++++++++++ > 2 files changed, 27 insertions(+), 10 deletions(-) > create mode 100644 testing/php7/libintl-iconv.patch > > @@ -400,7 +404,7 @@ xsl() { _mv_ext xsl $pkgname-dom; } > zip() { _mv_ext zip; } > zlib() { _mv_ext zlib; } > > -md5sums="0171201350941327399a5c3e678a86e5 php-7.0.4.tar.bz2 > +md5sums="b15e6836babcbf0aa446678ee38f896b php-7.0.5.tar.bz2 > a340f27e83ed4482d2fbb98658ef71cb php7-fpm.initd > 25bde13e7894c2930d97fad68d5dd3b3 php7-fpm.logrotate > 47be6cd1ed92f21579e15bf2003a709f php7-module.conf These checksum updates are incorrect and do not apply. > @@ -0,0 +1,10 @@ +--- php-7.0.4/ext/standard/string.c ++++ > php-7.0.4/ext/standard/string.c.new +@@ -23,6 +23,7 @@ > + /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ > + > + #include > ++#include > + #include "php.h" > + #include "php_rand.h" > + #include "php_string.h" Is this patch really needed? We had few issues with the gettext-dev package, but it should be finally fixed now (there turned out to be one busybox ash bug that broke one of the configure tests in gettext). I see that main/php enables iconv similary, and does not need a patch like this. Thanks, Timo --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---