From patchwork Mon Dec 27 14:56:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1573389 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=N6fmpLH9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JN14N3WBTz9sVq for ; Tue, 28 Dec 2021 01:57:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 03DE740283; Mon, 27 Dec 2021 14:57:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6XwLGpE2QPHV; Mon, 27 Dec 2021 14:57:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C2CE940933; Mon, 27 Dec 2021 14:57:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3156F1BF3ED for ; Mon, 27 Dec 2021 14:57:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1D0EE60E5B for ; Mon, 27 Dec 2021 14:57:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hY9KtbF9KYfZ for ; Mon, 27 Dec 2021 14:57:46 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by smtp3.osuosl.org (Postfix) with ESMTPS id D09E160E3F for ; Mon, 27 Dec 2021 14:57:45 +0000 (UTC) Received: by mail-wm1-x332.google.com with SMTP id e5so9412550wmq.1 for ; Mon, 27 Dec 2021 06:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ueE+0oVdYV3e6xTpla3e0X3leEPi3bDNfh//quP2wrk=; b=N6fmpLH99jvvuVCl8tqfLLOIYGp77wUtMVHzzD9L46YqSjj/mNa3jiRltdrUUWyC18 5nu09YlPFWCtyj0hkO8C4LJjlZpMXeE1v2xbRQhP4OwfJ8jmAbJ0j2AiB4r/cS+1Mp7Z kKt273u5of+QccW74gxkrOK9CFg8pOJR94gT4CQJ0nG3R2ifKYJKhuBW2OuWfqsYj0CL qEc6Y7DXjy4+1a0jn1k7sUz7w+7WvOEfZ9tsclJcFYFTSosQGuEy2AuI4mmwHlu1MJkB BWPBmbJY5tUKh+cPlxYzntCvd4mO0x0GoQzh5h4fDdvcl9K1ecxMiaUe79qmp71KOA6u 4vqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ueE+0oVdYV3e6xTpla3e0X3leEPi3bDNfh//quP2wrk=; b=g3OLTdK5G7fCwQZV2x6+75i72HqHvI/mvVdM3q2VlqSPoIufhqVm80Fg1GZCIA5xY2 UtvcQTM6aQhl5PK7bjQXErwLhISOlicjVFurJGz7BkWXqbJSIJ6sowA+p4ayd0x7foqr zFh7n0nTrFC5v7oL/6OFez9iRCUJLbFfUajVpUY3tYwguCsXzwxn2b7Txuzg72065PmT GGSvFHkw/pdo3PBj3qc/JKzGB705Y/PNPMTTWkZROMXfev0N5MEltqCTbiz0+0wosb7T TioFhRBYYjojaFtzOMkIGYfhg8c9E3HrP93q490uaBytASuDTvWixs7zK8Umz+nAg9st oLnA== X-Gm-Message-State: AOAM5306O3xezxA4T2Jf9RLmXgxEb1RxF0UBjzfp4qI/y0PvmIDlmLBA FPpYxoiVv7/jvdwFEPM74Wl2wVGb9u44pQ== X-Google-Smtp-Source: ABdhPJxCc4AV+lTqVHwzX8ZoFOz6qjImlPToOMabABB/0fLktYOqwSGAQznJ87VRFs1CvDWI+/VFdw== X-Received: by 2002:a05:600c:4f46:: with SMTP id m6mr7432367wmq.19.1640617063634; Mon, 27 Dec 2021 06:57:43 -0800 (PST) Received: from kali.home (lfbn-ren-1-2129-201.w92-167.abo.wanadoo.fr. [92.167.208.201]) by smtp.gmail.com with ESMTPSA id z17sm18992950wmi.22.2021.12.27.06.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Dec 2021 06:57:43 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 27 Dec 2021 15:56:13 +0100 Message-Id: <20211227145613.1969182-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/poppler: bump to version 21.12.0 X-BeenThere: buildroot@buildroot.org 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: Olivier Schonken , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" - Drop patch (not needed since https://gitlab.freedesktop.org/poppler/poppler/-/commit/47de887d7658cfd68df44b3acf710971054f957b) - Disable gperf (added with https://gitlab.freedesktop.org/poppler/poppler/-/commit/22a334bbf55c900b3efff12a3a676bd14b18decd) - Disable manual tests (added with https://gitlab.freedesktop.org/poppler/poppler/-/commit/db1bf17777068a34e7586236efefb74a42460932) - Disable Qt6 (added with https://gitlab.freedesktop.org/poppler/poppler/-/commit/e225b4b804881de02a5d1beb3f3f908a8f8ddc3d) - Use ENABLE_BOOST (added with https://gitlab.freedesktop.org/poppler/poppler/-/commit/26f8a7d1bc9c6cd511989d74fdb54f233b25d663) - C++17 is mandatory since https://gitlab.freedesktop.org/poppler/poppler/-/commit/3f8b9e92aade630b90943fd3936bdaa089e0603d - Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-21.12.0/NEWS Signed-off-by: Fabrice Fontaine --- ...pler-private.h-fix-build-with-gcc-11.patch | 48 ------------------- package/poppler/Config.in | 4 +- package/poppler/poppler.hash | 4 +- package/poppler/poppler.mk | 11 ++++- 4 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch diff --git a/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch b/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch deleted file mode 100644 index afa887ff8c..0000000000 --- a/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ae5ff981ae0484383c4733c56b72e56a3a37584 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 14 Aug 2021 10:43:13 +0200 -Subject: [PATCH] glib/poppler-private.h: fix build with gcc 11 - -Fix the following build failure with gcc 11: - -In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gthread.h:32, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gasyncqueue.h:32, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib.h:32, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/gobject/gbinding.h:28, - from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib-object.h:22, - from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler.h:22, - from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:19: -/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc: In function 'GType poppler_dest_get_type()': -/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-private.h:155:13: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type - 155 | if (g_once_init_enter (&g_define_type_id__volatile)) { \ - | ^~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:28:1: note: in expansion of macro 'POPPLER_DEFINE_BOXED_TYPE' - 28 | POPPLER_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free) - | ^~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/dfcaac6487aaeb10412c3fe72a23135f8a70fefe - -Signed-off-by: Fabrice Fontaine -[Upstream status: not needed because of -https://gitlab.freedesktop.org/poppler/poppler/-/commit/47de887d7658cfd68df44b3acf710971054f957b] ---- - glib/poppler-private.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/poppler-private.h b/glib/poppler-private.h -index 86b587fd..ff15eab0 100644 ---- a/glib/poppler-private.h -+++ b/glib/poppler-private.h -@@ -152,7 +152,7 @@ gboolean _poppler_convert_pdf_date_to_gtime (const GooString *date, - GType \ - type_name##_get_type (void) \ - { \ -- static volatile gsize g_define_type_id__volatile = 0; \ -+ static gsize g_define_type_id__volatile = 0; \ - if (g_once_init_enter (&g_define_type_id__volatile)) { \ - GType g_define_type_id = \ - g_boxed_type_register_static (g_intern_static_string (#TypeName), \ --- -2.30.2 - diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 521e3e65a8..f59115813d 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_POPPLER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14, constexpr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_FONTCONFIG help Poppler is a PDF rendering library based on the xpdf-3.0 @@ -30,7 +30,7 @@ config BR2_PACKAGE_POPPLER_UTILS endif -comment "poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 5" +comment "poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index a06def6653..cf6c537063 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731 poppler-0.84.0.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 acb840c2c1ec07d07e53c57c4b3a1ff3e3ee2d888d44e1e9f2f01aaf16814de7 poppler-21.12.0.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index a5a97d974b..23f04f6e51 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.84.0 +POPPLER_VERSION = 21.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf @@ -17,8 +17,12 @@ POPPLER_CONF_OPTS = \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ -DBUILD_QT5_TESTS=OFF \ + -DBUILD_QT6_TESTS=OFF \ -DBUILD_CPP_TESTS=OFF \ - -DENABLE_GTK_DOC=OFF + -DBUILD_MANUAL_TESTS=OFF \ + -DENABLE_GTK_DOC=OFF \ + -DENABLE_QT6=OFF \ + -DRUN_GPERF_IF_PRESENT=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic @@ -26,6 +30,9 @@ endif ifeq ($(BR2_PACKAGE_BOOST),y) POPPLER_DEPENDENCIES += boost +POPPLER_CONF_OPTS += -DENABLE_BOOST=ON +else +POPPLER_CONF_OPTS += -DENABLE_BOOST=OFF endif ifeq ($(BR2_PACKAGE_JPEG),y)