mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
poppler: Update to 0.64
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
+29
@@ -0,0 +1,29 @@
|
|||||||
|
From d488de23b75b2f3e235f1c184b2253d1402b4c0f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Thu, 10 May 2018 23:47:56 -0700
|
||||||
|
Subject: [PATCH] glib/CMakeLists.txt: Add libpoppler to link along with
|
||||||
|
poppler-glib
|
||||||
|
|
||||||
|
This is required since poppler-glib uses symbols from poppler and
|
||||||
|
we use --as-needed
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
glib/CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
|
||||||
|
index 33c6608..87e1b44 100644
|
||||||
|
--- a/glib/CMakeLists.txt
|
||||||
|
+++ b/glib/CMakeLists.txt
|
||||||
|
@@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
|
||||||
|
get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
|
||||||
|
_list_prefix(_includes _tmp_includes "-I")
|
||||||
|
set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR})
|
||||||
|
- set(Poppler_0_18_gir_LIBS poppler-glib)
|
||||||
|
+ set(Poppler_0_18_gir_LIBS poppler-glib poppler)
|
||||||
|
_list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
|
||||||
|
list(APPEND _abs_introspection_files
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
|
||||||
+10
-8
@@ -2,15 +2,15 @@ SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base"
|
|||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
|
||||||
http://poppler.freedesktop.org/${BP}.tar.xz \
|
file://0001-Do-not-overwrite-all-our-build-flags.patch \
|
||||||
file://0001-Do-not-overwrite-all-our-build-flags.patch \
|
file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \
|
||||||
file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \
|
file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821"
|
SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044"
|
||||||
SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111"
|
SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1"
|
||||||
|
|
||||||
DEPENDS = "fontconfig zlib cairo lcms"
|
DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
|
||||||
|
|
||||||
inherit cmake pkgconfig gobject-introspection
|
inherit cmake pkgconfig gobject-introspection
|
||||||
|
|
||||||
@@ -29,9 +29,11 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
|
|||||||
SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
|
SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
|
||||||
|
|
||||||
EXTRA_OECMAKE += " \
|
EXTRA_OECMAKE += " \
|
||||||
|
-DENABLE_CMS=lcms2 \
|
||||||
-DENABLE_XPDF_HEADERS=ON \
|
-DENABLE_XPDF_HEADERS=ON \
|
||||||
-DBUILD_GTK_TESTS=OFF \
|
-DBUILD_GTK_TESTS=OFF \
|
||||||
-DENABLE_ZLIB=ON \
|
-DENABLE_ZLIB=ON \
|
||||||
|
-DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \
|
||||||
"
|
"
|
||||||
|
|
||||||
do_configure_append() {
|
do_configure_append() {
|
||||||
Reference in New Issue
Block a user