mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 07:37:14 +00:00
Code Issues Projects Releases Wiki Activity

poppler: upgrade 0.71.0 -> 0.75.0

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2019-03-22 11:21:26 +01:00
committed by Khem Raj
parent 2c417a5680
commit 735c2b3803
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/poppler/poppler/0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch
+6 -3
View File
@@ -15,15 +15,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 33c6608..87e1b44 100644 index 6f91669..ca5021f 100644
--- a/glib/CMakeLists.txt --- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt
@@ -127,7 +127,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) @@ -135,7 +135,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
_list_prefix(_includes _tmp_includes "-I") _list_prefix(_includes _tmp_includes "-I")
set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}) set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
- set(Poppler_0_18_gir_LIBS poppler-glib) - set(Poppler_0_18_gir_LIBS poppler-glib)
+ set(Poppler_0_18_gir_LIBS poppler-glib poppler) + set(Poppler_0_18_gir_LIBS poppler-glib poppler)
_list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
list(APPEND _abs_introspection_files list(APPEND _abs_introspection_files
${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
--
2.20.1
meta-oe/recipes-support/poppler/poppler/basename-include.patch
+1 -1
View File
@@ -8,8 +8,8 @@ Index: poppler-0.64.0/utils/pdfsig.cc
--- poppler-0.64.0.orig/utils/pdfsig.cc --- poppler-0.64.0.orig/utils/pdfsig.cc
+++ poppler-0.64.0/utils/pdfsig.cc +++ poppler-0.64.0/utils/pdfsig.cc
@@ -35,6 +35,10 @@ @@ -35,6 +35,10 @@
#include "Win32Console.h"
#include "numberofcharacters.h" #include "numberofcharacters.h"
#include <libgen.h>
+#if !defined(__GLIBC__) +#if !defined(__GLIBC__)
+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
meta-oe/recipes-support/poppler/poppler_0.71.0.bb → meta-oe/recipes-support/poppler/poppler_0.75.0.bb
+3 -3
View File
@@ -8,8 +8,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \
file://basename-include.patch \ file://basename-include.patch \
" "
SRC_URI[md5sum] = "b505011e49e922c83f3ffb57ab40bc28" SRC_URI[md5sum] = "3fb4ca803d989742695ca586c5cc489e"
SRC_URI[sha256sum] = "badbecd2dddf63352fd85ec08a9c2ed122fdadacf2a34fcb4cc227c4d01f2cf9" SRC_URI[sha256sum] = "3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a"
DEPENDS = "fontconfig zlib cairo lcms glib-2.0" DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
@@ -40,7 +40,7 @@ EXTRA_OECMAKE += " \
do_configure_append() { do_configure_append() {
# poppler macro uses pkg-config to check for g-ir runtimes. Something # poppler macro uses pkg-config to check for g-ir runtimes. Something
# makes them point to /usr/bin. Align them to sysroot - that's where the # makes them point to /usr/bin. Align them to sysroot - that's where the
# git-wrappers are: # gir-wrappers are:
sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja
} }