diff options
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.64.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.63.0.bb) | 18 |
2 files changed, 39 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch new file mode 100644 index 000000000..7ed795ef7 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From d488de23b75b2f3e235f1c184b2253d1402b4c0f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 10 May 2018 23:47:56 -0700 | ||
4 | Subject: [PATCH] glib/CMakeLists.txt: Add libpoppler to link along with | ||
5 | poppler-glib | ||
6 | |||
7 | This is required since poppler-glib uses symbols from poppler and | ||
8 | we use --as-needed | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | glib/CMakeLists.txt | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt | ||
18 | index 33c6608..87e1b44 100644 | ||
19 | --- a/glib/CMakeLists.txt | ||
20 | +++ b/glib/CMakeLists.txt | ||
21 | @@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) | ||
22 | get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) | ||
23 | _list_prefix(_includes _tmp_includes "-I") | ||
24 | set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}) | ||
25 | - set(Poppler_0_18_gir_LIBS poppler-glib) | ||
26 | + set(Poppler_0_18_gir_LIBS poppler-glib poppler) | ||
27 | _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") | ||
28 | list(APPEND _abs_introspection_files | ||
29 | ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb index 8acb35628..1e87ae6e6 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.64.0.bb | |||
@@ -2,15 +2,15 @@ SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | SRC_URI = " \ | 5 | SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ |
6 | http://poppler.freedesktop.org/${BP}.tar.xz \ | 6 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ |
7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ | 7 | file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ |
8 | file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ | 8 | file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ |
9 | " | 9 | " |
10 | SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821" | 10 | SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" |
11 | SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111" | 11 | SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" |
12 | 12 | ||
13 | DEPENDS = "fontconfig zlib cairo lcms" | 13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0" |
14 | 14 | ||
15 | inherit cmake pkgconfig gobject-introspection | 15 | inherit cmake pkgconfig gobject-introspection |
16 | 16 | ||
@@ -29,9 +29,11 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} | |||
29 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" | 29 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" |
30 | 30 | ||
31 | EXTRA_OECMAKE += " \ | 31 | EXTRA_OECMAKE += " \ |
32 | -DENABLE_CMS=lcms2 \ | ||
32 | -DENABLE_XPDF_HEADERS=ON \ | 33 | -DENABLE_XPDF_HEADERS=ON \ |
33 | -DBUILD_GTK_TESTS=OFF \ | 34 | -DBUILD_GTK_TESTS=OFF \ |
34 | -DENABLE_ZLIB=ON \ | 35 | -DENABLE_ZLIB=ON \ |
36 | -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ | ||
35 | " | 37 | " |
36 | 38 | ||
37 | do_configure_append() { | 39 | do_configure_append() { |