package/poppler: bump to version 21.12.0
- Drop patch (not needed since47de887d76) - Disable gperf (added with22a334bbf5) - Disable manual tests (added withdb1bf17777) - Disable Qt6 (added withe225b4b804) - Use ENABLE_BOOST (added with26f8a7d1bc) - C++17 is mandatory since3f8b9e92aa- Update indentation in hash file (two spaces) https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-21.12.0/NEWS Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
60acafc806
commit
1da4ead4c2
@ -1,48 +0,0 @@
|
|||||||
From 1ae5ff981ae0484383c4733c56b72e56a3a37584 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
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 <fontaine.fabrice@gmail.com>
|
|
||||||
[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
|
|
||||||
|
|
||||||
@ -4,7 +4,7 @@ config BR2_PACKAGE_POPPLER
|
|||||||
depends on BR2_INSTALL_LIBSTDCPP
|
depends on BR2_INSTALL_LIBSTDCPP
|
||||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||||
depends on !BR2_STATIC_LIBS
|
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
|
select BR2_PACKAGE_FONTCONFIG
|
||||||
help
|
help
|
||||||
Poppler is a PDF rendering library based on the xpdf-3.0
|
Poppler is a PDF rendering library based on the xpdf-3.0
|
||||||
@ -30,7 +30,7 @@ config BR2_PACKAGE_POPPLER_UTILS
|
|||||||
|
|
||||||
endif
|
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 || \
|
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
|
||||||
!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
||||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731 poppler-0.84.0.tar.xz
|
sha256 acb840c2c1ec07d07e53c57c4b3a1ff3e3ee2d888d44e1e9f2f01aaf16814de7 poppler-21.12.0.tar.xz
|
||||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
POPPLER_VERSION = 0.84.0
|
POPPLER_VERSION = 21.12.0
|
||||||
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
|
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
|
||||||
POPPLER_SITE = http://poppler.freedesktop.org
|
POPPLER_SITE = http://poppler.freedesktop.org
|
||||||
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
|
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
|
||||||
@ -17,8 +17,12 @@ POPPLER_CONF_OPTS = \
|
|||||||
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
|
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
|
||||||
-DBUILD_GTK_TESTS=OFF \
|
-DBUILD_GTK_TESTS=OFF \
|
||||||
-DBUILD_QT5_TESTS=OFF \
|
-DBUILD_QT5_TESTS=OFF \
|
||||||
|
-DBUILD_QT6_TESTS=OFF \
|
||||||
-DBUILD_CPP_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)
|
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||||
POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
|
POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
|
||||||
@ -26,6 +30,9 @@ endif
|
|||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_BOOST),y)
|
ifeq ($(BR2_PACKAGE_BOOST),y)
|
||||||
POPPLER_DEPENDENCIES += boost
|
POPPLER_DEPENDENCIES += boost
|
||||||
|
POPPLER_CONF_OPTS += -DENABLE_BOOST=ON
|
||||||
|
else
|
||||||
|
POPPLER_CONF_OPTS += -DENABLE_BOOST=OFF
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user