From patchwork Tue Dec 1 21:30:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1409102 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=Rp04URoO; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4ClwJW0FSdz9sRK for ; Wed, 2 Dec 2020 08:31:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 613EE876C7; Tue, 1 Dec 2020 21:31:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vrqStzMB40a8; Tue, 1 Dec 2020 21:31:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9C315876C9; Tue, 1 Dec 2020 21:31:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EDD031BF392 for ; Tue, 1 Dec 2020 21:30:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E8B6C876C9 for ; Tue, 1 Dec 2020 21:30:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19r75g-8STSa for ; Tue, 1 Dec 2020 21:30:58 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by hemlock.osuosl.org (Postfix) with ESMTPS id 82144876C7 for ; Tue, 1 Dec 2020 21:30:58 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id p8so5099004wrx.5 for ; Tue, 01 Dec 2020 13:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5+FNDML9QveEfQDkhbM7wqRFEHQzr0cXwqg+29xwfW0=; b=Rp04URoO02uRCb/isXimFPVz4C5KoSaEhLIrUWeS1GWmW5P5aL8W1L7HdKKYgqkjbU pSoXBKfKBDSlvUEM67BVDXOsBaa1BQ8cLnOHrXiXkN3xkLBqvHQzna2ebTJAocs2c4eV HiUMbNfbhGCb2MStab+QMi06P6x3KY2Y2jXOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5+FNDML9QveEfQDkhbM7wqRFEHQzr0cXwqg+29xwfW0=; b=L0BRTXLP0RrSAN6gmx3xrcaoibeSEkZUvrt5DD/TTVWmjHaqeNK2wA4zMH+yZW6/om ZVvNPDV9rG0A9pSa/rC7XvdkVMMhDw+iwO5Qh3fkHotz+551QozVJxr2e4RQ9kNFyokk 1XILxwooZJV1ymWf4AA6pH854nMDusOsXl15PFnCjgZyOYkf8suA+wkLzgKGRDAudoJg /j+LZrPQ+aiLvZNd4+z/VJ8nN4jgsG9gg4DgBt7y7mccoBuzli+1k9f9jlfJVxKcrgXv T2sZqU8BatKioT6xLSfG/G6H8poljb3WgijgHoXLAvJdCPn9o6XTnF2Fshjwjei68WpZ 6/vA== X-Gm-Message-State: AOAM530gJtiz3hanhO84kKxKqz5ron+TB5eMDH5cA+mZQVRxZ07tCPse VXKuzKOl24+p3LHoD9S2S7dgL5l1nwKM+Q== X-Google-Smtp-Source: ABdhPJzXIvhf8eAJOrDVfsGiNpJQYlXOImtukkfFNjW6kGOrvAWTebwpT86QFQ6AnHbyCuWtfWaCAQ== X-Received: by 2002:adf:90d0:: with SMTP id i74mr6522893wri.288.1606858256566; Tue, 01 Dec 2020 13:30:56 -0800 (PST) Received: from localhost.localdomain (host185036129059.static.fidoka.tech. [185.36.129.59]) by smtp.gmail.com with ESMTPSA id b18sm1353559wrt.54.2020.12.01.13.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 13:30:56 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 1 Dec 2020 22:30:53 +0100 Message-Id: <20201201213053.2495000-1-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/cups-filters: bump to version 1.28.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" While bumping, removing upstreamed patches. Removing also autoreconf step cause we are not patching it anymore. License hash is changed due to remove of notice for file filter/sys5ippprinter.c. Signed-off-by: Angelo Compagnucci --- ...fix-cross-compilation-without-dejavu.patch | 41 ------------------- package/cups-filters/cups-filters.hash | 4 +- package/cups-filters/cups-filters.mk | 4 +- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch diff --git a/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch b/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch deleted file mode 100644 index 650b90a89b..0000000000 --- a/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ad1ed8b7939bf75079b0a770e234bfee7d33dbb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Jul 2020 23:02:50 +0200 -Subject: [PATCH] configure.ac: fix cross-compilation without dejavu - -Cross-compilation is broken since commit 1d66106. Indeed, when -cross-compiling, dejavu font won't be installed in /usr/share/fonts. The -path (e.g. $(TARGET_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf) could be -provided through --with-test-font-path which will fix the build failure -but will result in broken test programs. - -So when cross-compiling don't try to check if the test-font-path is -valid or not and just use the one provided by the user or the default -one (e.g. /usr/share/fonts/dejavu/DejaVuSans.ttf) - -Fix #262 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/OpenPrinting/cups-filters/commit/6ad1ed8b7939bf75079b0a770e234bfee7d33dbb] ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa905cf5d..4cc4fd6e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -796,10 +796,10 @@ AC_ARG_WITH([test-font-path], - [with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`] - ) - --AS_IF([test -f "$with_test_font_path"], -- [AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])], -+AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"], - [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)] - ) -+AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests]) - - # ================ - # Check for cflags diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 61cb42a438..8c2526ae9d 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz -sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING +sha256 cf90b96b5c7a906a05070e757ee5566d9680db98a279e60567ea5421c38f11de cups-filters-1.28.4.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 237d8afe62..3ba031d5a1 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,12 +4,10 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.27.5 +CUPS_FILTERS_VERSION = 1.28.4 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -# We're patching configure.ac -CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg