diff options
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch | 10 | ||||
| -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 44a22963af..b4e3fb05e7 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 @@ | |||
| 1 | From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 | 1 | From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 Jan 2023 03:09:08 -0800 | 3 | Date: Sat, 21 Jan 2023 03:09:08 -0800 |
| 4 | Subject: [PATCH] cmake: Do not use -isystem | 4 | Subject: [PATCH] cmake: Do not use -isystem |
| @@ -28,6 +28,7 @@ but instead of prepending, it will append to system headers and the | |||
| 28 | issue is addressed | 28 | issue is addressed |
| 29 | 29 | ||
| 30 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 30 | Signed-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 | ||
| 40 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 41 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 41 | index 4768ac8..cdc014d 100644 | 42 | index 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) |
| 57 | diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt | 58 | diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt |
| 58 | index 52e8687..08ab39a 100644 | 59 | index 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 | -- | ||
| 191 | 2.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 165e155ec9..19bdce4d86 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 | " |
| 11 | SRC_URI[sha256sum] = "b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4" | 11 | SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" |
| 12 | 12 | ||
| 13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0" | 13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0" |
| 14 | 14 | ||
