summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/poppler/poppler/basename-include.patch4
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.84.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_0.82.0.bb)4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
index c18a5f5c0e..3d6d7a8f14 100644
--- a/meta-oe/recipes-support/poppler/poppler/basename-include.patch
+++ b/meta-oe/recipes-support/poppler/poppler/basename-include.patch
@@ -16,8 +16,8 @@ index 830c1c80..e93eb368 100644
16--- a/goo/gbasename.cc 16--- a/goo/gbasename.cc
17+++ b/goo/gbasename.cc 17+++ b/goo/gbasename.cc
18@@ -46,6 +46,10 @@ 18@@ -46,6 +46,10 @@
19 #include <stdlib.h> 19 #include <cstdlib>
20 #include <string.h> 20 #include <cstring>
21 21
22+#if !defined(__GLIBC__) 22+#if !defined(__GLIBC__)
23+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) 23+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
diff --git a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb b/meta-oe/recipes-support/poppler/poppler_0.84.0.bb
index 37f859353d..0f3e505717 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.82.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.84.0.bb
@@ -6,8 +6,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
6 file://0001-Do-not-overwrite-all-our-build-flags.patch \ 6 file://0001-Do-not-overwrite-all-our-build-flags.patch \
7 file://basename-include.patch \ 7 file://basename-include.patch \
8 " 8 "
9SRC_URI[md5sum] = "4d6106c2382c5e66072e0b355acc3640" 9SRC_URI[md5sum] = "e14a8aca8809908ad4364c32c17bcb92"
10SRC_URI[sha256sum] = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df" 10SRC_URI[sha256sum] = "c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731"
11 11
12DEPENDS = "fontconfig zlib cairo lcms glib-2.0" 12DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
13 13