diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-05 13:39:56 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-04-06 09:02:12 -0700 |
commit | c6f3bec2e9768d9231cc042a9902570610a05ffb (patch) | |
tree | 31fc196a874465bcb057d81ad9b38e72337aac61 /meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch | |
parent | 6f2099cf7806a7d00cdd3b4cda74e9e5574d0479 (diff) | |
download | meta-openembedded-contrib-c6f3bec2e9768d9231cc042a9902570610a05ffb.tar.gz |
poppler: Backport patches to fix build with glib-2.0 2.68+ and GCC11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch')
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch b/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch new file mode 100644 index 0000000000..f4a54a184f --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch @@ -0,0 +1,47 @@ +From 8b0890e2d1623e580d8a849e56c1f3a2984e782d Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe@src.gnome.org> +Date: Fri, 26 Mar 2021 18:17:25 +0100 +Subject: [PATCH 2/2] glib: Remove incorrecly used volatile from enum type + registration code + +Upstream-Status: Backport [https://github.com/freedesktop/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5] +--- + glib/poppler-enums.c.template | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template +index 26a51b4..eefc769 100644 +--- a/glib/poppler-enums.c.template ++++ b/glib/poppler-enums.c.template +@@ -15,9 +15,9 @@ + GType + @enum_name@_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; ++ static volatile gsize g_define_type_id = 0; + +- if (g_once_init_enter (&g_define_type_id__volatile)) { ++ if (g_once_init_enter (&g_define_type_id)) { + static const G@Type@Value values[] = { + /*** END value-header ***/ + +@@ -28,13 +28,13 @@ GType + /*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; +- GType g_define_type_id = ++ GType type = + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + +- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); ++ g_once_init_leave (&g_define_type_id, type); + } + +- return g_define_type_id__volatile; ++ return g_define_type_id; + } + + /*** END value-tail ***/ +-- +2.31.1 + |