summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/poppler/poppler/basename-include.patch9
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.90.1.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.89.0.bb)4
2 files changed, 8 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
index 3d6d7a8f14..4a18ba3504 100644
--- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch
+++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
@@ -5,6 +5,9 @@ Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Rework for poppler 0.90.1
9Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
10
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 12Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
10--- 13---
@@ -12,7 +15,7 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
12 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
13 16
14diff --git a/goo/gbasename.cc b/goo/gbasename.cc 17diff --git a/goo/gbasename.cc b/goo/gbasename.cc
15index 830c1c80..e93eb368 100644 18index 69236d8..3858415 100644
16--- a/goo/gbasename.cc 19--- a/goo/gbasename.cc
17+++ b/goo/gbasename.cc 20+++ b/goo/gbasename.cc
18@@ -46,6 +46,10 @@ 21@@ -46,6 +46,10 @@
@@ -23,9 +26,9 @@ index 830c1c80..e93eb368 100644
23+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) 26+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
24+#endif 27+#endif
25+ 28+
26 std::string gbasename(const char* filename) 29 std::string gbasename(const char *filename)
27 { 30 {
28 #ifdef _MSC_VER 31 #ifdef _MSC_VER
29-- 32--
302.17.0 332.21.3
31 34
diff --git a/meta-oe/recipes-support/poppler/poppler_0.89.0.bb b/meta-oe/recipes-support/poppler/poppler_0.90.1.bb
index f8b7c075ac..bb5a782ae0 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.89.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.90.1.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
7 file://0001-Do-not-overwrite-all-our-build-flags.patch \ 7 file://0001-Do-not-overwrite-all-our-build-flags.patch \
8 file://basename-include.patch \ 8 file://basename-include.patch \
9 " 9 "
10SRC_URI[md5sum] = "92ac57f60ae8c3a1f8bfe01c9530b7b5" 10SRC_URI[md5sum] = "b80a82f14459d31d929db421b0e8cf05"
11SRC_URI[sha256sum] = "fba230364537782cc5d43b08d693ef69c36586286349683c7b127156a8ef9b5c" 11SRC_URI[sha256sum] = "984d82e72e91418d280885298c8bdc855a2fd92665fd52a1345b27235e0c71c4"
12 12
13DEPENDS = "fontconfig zlib cairo lcms glib-2.0" 13DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
14 14