From patchwork Sat Jan 21 19:13:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 718083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v5S0V2cR8z9t15 for ; Sun, 22 Jan 2017 06:13:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="Ng0U+AiZ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 12D5F22F5C; Sat, 21 Jan 2017 19:13:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sqnx09eFCWVf; Sat, 21 Jan 2017 19:13:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D3E8C2A109; Sat, 21 Jan 2017 19:13:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 99EDC1BFDB9 for ; Sat, 21 Jan 2017 19:13:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9664885A7E for ; Sat, 21 Jan 2017 19:13:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wNrcumoxU1XF for ; Sat, 21 Jan 2017 19:13:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1A4D985A4E for ; Sat, 21 Jan 2017 19:13:23 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3v5S0H3KXfz101G for ; Sat, 21 Jan 2017 20:13:18 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1485025997; x=1485630798; bh=o1VlwugoxVj2MBlGVOcyV6Y3Z0vyuwIG+4ggstYHPcg=; b=Ng0U+AiZEf1j 6bTYD1echFMvaYolDCix0S3FjRkz9Ngq4DrkrcJhHeLgI3tSyxBJxXyY94uyf7mn DKUKxyre2FN69Fv2oxlPfirh3zEhu7V1JdAQQs4aowxeVhG7BSWf2hM9zdVvVQeC cG7k10Y2EEh9hXHKlJfpWHeoUn8vwDNAxZJHzRh+MYm65yfU9UjibG/yNXX7oAfA Wx/O80ApANJoHn1YVVMJpmlHqHZauPNI6obST/IRAXsvK7Z90lhRDEIDZirGRDSA t6XbMrR4Ub0YiQZDf4MtXTi3P6fw/wlpufGJ+9uvngwNgxHn87RLFyzScms9YLsv Zm8dl3dzKQ== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XrBXWhvdE4rl; Sat, 21 Jan 2017 20:13:17 +0100 (CET) Received: from nzxt.fritz.box (x4d021ca3.dyn.telefonica.de [77.2.28.163]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sat, 21 Jan 2017 20:13:17 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Sat, 21 Jan 2017 20:13:14 +0100 Message-Id: <20170121191314.11474-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/hplip: fix build by bumping to version 3.16.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adjust patch #2 to apply successfully. Fixes: http://autobuild.buildroot.net/results/bee/beea88e0848ccabcafe6b92c2a69074ed1114225/ http://autobuild.buildroot.net/results/4ba/4ba68d3e6764f395f3314c46c4d06b101c23479c/ http://autobuild.buildroot.net/results/345/3455044679a497fbee72378e59178724305720d9/ .. and many more. The previous version 3.15.11 failed to build because of: ``` hpijs/hpcupsfax.cpp: In function 'int main(int, char**)': prnt/hpijs/hpcupsfax.cpp:651:5: error: 'ppd_file_t' was not declared in this scope ppd_file_t *ppd; ^ ``` `ppd_file_t` is defined in "cups/ppd.h" which was not included in 3.15.11, but is in 3.16.11. Signed-off-by: Jörg Krause --- package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch | 2 +- package/hplip/hplip.hash | 2 +- package/hplip/hplip.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch b/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch index 7c7538d1a..814749017 100644 --- a/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch +++ b/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch @@ -23,7 +23,7 @@ index 8b06428..680cad5 100755 @@ -27,8 +27,7 @@ #AC_PREREQ(2.59) - AC_INIT([HP Linux Imaging and Printing], [3.15.11], [3.15.11], [hplip]) + AC_INIT([HP Linux Imaging and Printing], [3.16.11], [3.16.11], [hplip]) -#AM_INIT_AUTOMAKE([1.9 foreign]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) diff --git a/package/hplip/hplip.hash b/package/hplip/hplip.hash index 75ff7d3d0..9dfb7a2ad 100644 --- a/package/hplip/hplip.hash +++ b/package/hplip/hplip.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d hplip-3.15.11.tar.gz +sha256 f6e20cacb4891e4e60fc5de2213a10f8d0c68840f9b511aa38cfca0cb29f9b24 hplip-3.16.11.tar.gz diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk index d70e2e926..9a2c9db02 100644 --- a/package/hplip/hplip.mk +++ b/package/hplip/hplip.mk @@ -4,7 +4,7 @@ # ################################################################################ -HPLIP_VERSION = 3.15.11 +HPLIP_VERSION = 3.16.11 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip HPLIP_AUTORECONF = YES HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf