From 559a072a675c2569771949c8f12f0d6e75c818d3 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 31 Oct 2020 20:12:25 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/poppler.git#ef2899ea951d10b4c387cb4755908a04e2e9d87f --- poppler-gcc11.patch | 26 ++++++++++++++++++++++++++ poppler.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 poppler-gcc11.patch diff --git a/poppler-gcc11.patch b/poppler-gcc11.patch new file mode 100644 index 0000000..f6614c3 --- /dev/null +++ b/poppler-gcc11.patch @@ -0,0 +1,26 @@ +diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template +index 26a51b4..27be2b9 100644 +--- a/glib/poppler-enums.c.template ++++ b/glib/poppler-enums.c.template +@@ -15,7 +15,7 @@ + GType + @enum_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)) { + static const G@Type@Value values[] = { +diff --git a/glib/poppler-private.h b/glib/poppler-private.h +index 7726ec7..436bca5 100644 +--- a/glib/poppler-private.h ++++ b/glib/poppler-private.h +@@ -167,7 +167,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), \ diff --git a/poppler.spec b/poppler.spec index 2cd0a1d..6996a16 100644 --- a/poppler.spec +++ b/poppler.spec @@ -4,7 +4,7 @@ Summary: PDF rendering library Name: poppler Version: 0.90.0 -Release: 6%{?dist} +Release: 7%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz @@ -27,6 +27,9 @@ Patch6: poppler-0.90.0-qt4-update.patch Patch7: poppler-0.90.0-position-independent-code.patch +# Bogus volatiles detected by gcc-11 +Patch8: %{name}-gcc11.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gettext-devel @@ -253,6 +256,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Sat Oct 31 2020 Jeff Law - 0.90.0-7 +- Fix bogus volatiles caught by gcc-11 + * Tue Aug 04 2020 Marek Kasik - 0.90.0-6 - Align poppler with - https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds