New upstream version

2 files changed, 17 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2ebd166060d..6ce3b4b02252 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May  2 10:49:47 UTC 2018
+# Fri Jun  1 13:47:05 UTC 2018
 pkgbase = libpdfium-nojs
 	pkgdesc = Open-source PDF rendering engine.
-	pkgver = 3359.r2.2e8701bf5
+	pkgver = 3396.r4.7b8cd8daf
 	pkgrel = 1
 	url = https://pdfium.googlesource.com/pdfium/
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 53ce09252724..a805603acc8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Felix Kauselmann <licorn at gmail dot com>
 
 pkgname=libpdfium-nojs
-pkgver=3359.r2.2e8701bf5
+pkgver=3396.r4.7b8cd8daf
 pkgrel=1
 pkgdesc="Open-source PDF rendering engine."
 arch=('x86_64')
@@ -52,6 +52,17 @@ prepare() {
   cd "$srcdir/pdfium/build"
   git checkout $(awk '/build_revision/ {print substr($2,2,40)}' $srcdir/pdfium/DEPS) -q
 
+  # Use system provided icu library (unbundling)
+	mkdir -p "$srcdir/pdfium/third_party/icu"
+  ln -sf "$srcdir/build/linux/unbundle/icu.gn" "$srcdir/pdfium/third_party/icu/BUILD.gn"
+
+	# Download and decode shim header script needed to unbundle icu (gittiles is weird)
+  mkdir -p "$srcdir/tools/generate_shim_headers/"
+	echo "Downloading generate_shim_headers script from buildtools."
+  curl https://chromium.googlesource.com/chromium/src/+/master/tools/generate_shim_headers/generate_shim_headers.py?format=TEXT \
+    | base64 --decode > "$srcdir/tools/generate_shim_headers/generate_shim_headers.py"
+	echo "Done."
+
   # Patch BUILD.gn to build a shared library
   cd "$srcdir/pdfium"
   sed -i 's/jumbo_static_library("pdfium")/shared_library("pdfium")/g' BUILD.gn
@@ -65,9 +76,6 @@ prepare() {
 	 public/fpdfview.h
   sed -i '/"PNG_PREFIX",/a     "FPDFSDK_EXPORTS",' BUILD.gn
 
-  # set pdfium version in pc file
-  sed "s/@VERSION@/${pkgver}/g" -i "${srcdir}/libpdfium.pc"
-
 }
 
 build() {
@@ -96,6 +104,9 @@ build() {
   gn gen out/Release --script-executable=/usr/bin/python2 --args="${_flags[*]}"
   ninja -C out/Release pdfium
 
+	# set pdfium version in pc file
+	sed "s/@VERSION@/${pkgver}/g" -i "${srcdir}/libpdfium.pc"
+
 }
 
 package() {