summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-04-10 16:27:43 +0800
committerKhem Raj <raj.khem@gmail.com>2023-04-10 09:39:38 -0700
commit02331987d0be340f17760efccd606a8ebd15b864 (patch)
tree6e9a666ffa34563f598706f89f85a8c104dded22
parent05dda95465c98c8617bd2790a73dee796e834060 (diff)
downloadmeta-openembedded-02331987d0be340f17760efccd606a8ebd15b864.tar.gz
poppler: upgrade 23.03.0 -> 23.04.0
Changelog: ========= core: * Fix memory issue when signing fails. Issue #1372 * Internal improvements of signature related code * CairoOutputDev: improve type3 font rendering * Fix memory leak in GlobalParams::findSystemFontFileForFamilyAndStyle utils: * pdftocairo: Fix crash in some special situations * pdfsig: allow holes in -dump signature list * pdfsig: Support --help Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch10
-rw-r--r--meta-oe/recipes-support/poppler/poppler_23.04.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_23.03.0.bb)2
2 files changed, 5 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
index 44a22963a..b4e3fb05e 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
@@ -1,4 +1,4 @@
1From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 1From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Jan 2023 03:09:08 -0800 3Date: Sat, 21 Jan 2023 03:09:08 -0800
4Subject: [PATCH] cmake: Do not use -isystem 4Subject: [PATCH] cmake: Do not use -isystem
@@ -28,6 +28,7 @@ but instead of prepending, it will append to system headers and the
28issue is addressed 28issue is addressed
29 29
30Signed-off-by: Khem Raj <raj.khem@gmail.com> 30Signed-off-by: Khem Raj <raj.khem@gmail.com>
31
31--- 32---
32 CMakeLists.txt | 4 ++-- 33 CMakeLists.txt | 4 ++--
33 glib/CMakeLists.txt | 4 ++-- 34 glib/CMakeLists.txt | 4 ++--
@@ -38,7 +39,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
38 6 files changed, 16 insertions(+), 16 deletions(-) 39 6 files changed, 16 insertions(+), 16 deletions(-)
39 40
40diff --git a/CMakeLists.txt b/CMakeLists.txt 41diff --git a/CMakeLists.txt b/CMakeLists.txt
41index 4768ac8..cdc014d 100644 42index c6c757c..5f1c540 100644
42--- a/CMakeLists.txt 43--- a/CMakeLists.txt
43+++ b/CMakeLists.txt 44+++ b/CMakeLists.txt
44@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) 45@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS})
@@ -53,7 +54,7 @@ index 4768ac8..cdc014d 100644
53+ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) 54+ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR})
54 endif() 55 endif()
55 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") 56 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
56 set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126) 57 set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127)
57diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt 58diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
58index 52e8687..08ab39a 100644 59index 52e8687..08ab39a 100644
59--- a/glib/CMakeLists.txt 60--- a/glib/CMakeLists.txt
@@ -187,6 +188,3 @@ index 1c3ebcb..bc1840a 100644
187 endif() 188 endif()
188 install(TARGETS pdftops DESTINATION bin) 189 install(TARGETS pdftops DESTINATION bin)
189 install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 190 install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
190--
1912.39.1
192
diff --git a/meta-oe/recipes-support/poppler/poppler_23.03.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb
index 165e155ec..19bdce4d8 100644
--- a/meta-oe/recipes-support/poppler/poppler_23.03.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
8 file://basename-include.patch \ 8 file://basename-include.patch \
9 file://0001-cmake-Do-not-use-isystem.patch \ 9 file://0001-cmake-Do-not-use-isystem.patch \
10 " 10 "
11SRC_URI[sha256sum] = "b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4" 11SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1"
12 12
13DEPENDS = "fontconfig zlib cairo lcms glib-2.0" 13DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
14 14