summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kauselmann2018-09-16 18:24:20 +0200
committerFelix Kauselmann2018-09-16 18:24:20 +0200
commit28428987bcce17ef32646105d1ac1ab73617b8bb (patch)
tree72e8b396302192cf8f1a1100fc25951d6e64c41b
parent625a0810b0ac343d81f03c1624e51520884ab976 (diff)
downloadaur-28428987bcce17ef32646105d1ac1ab73617b8bb.tar.gz
Fix build for r3479
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD8
-rw-r--r--openjpeg.patch16
3 files changed, 17 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a3b8ca2609e..e053ddc79249 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Di Jul 31 14:51:01 UTC 2018
+# So Sep 16 11:08:37 UTC 2018
pkgbase = libpdfium-nojs
pkgdesc = Open-source PDF rendering engine.
- pkgver = 3440.r7.a1c1c63d34
- pkgrel = 2
+ pkgver = 3497.r2.139f7fbf60
+ pkgrel = 1
url = https://pdfium.googlesource.com/pdfium/
arch = x86_64
license = BSD
@@ -15,6 +15,7 @@ pkgbase = libpdfium-nojs
depends = lcms2
depends = libjpeg
depends = openjpeg2
+ depends = icu
provides = libpdfium
conflicts = libpdfium-bin
source = git+https://pdfium.googlesource.com/pdfium
@@ -26,7 +27,7 @@ pkgbase = libpdfium-nojs
md5sums = SKIP
md5sums = SKIP
md5sums = 7fbbe2baf9a1fed80ad74278e901fa0e
- md5sums = 18cb7ae314a40fec21949a5f87bb80d3
+ md5sums = bbab1612841a1b2b0802ef75f02b9daf
pkgname = libpdfium-nojs
diff --git a/PKGBUILD b/PKGBUILD
index 9dc824c13854..902aa22ee7df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Felix Kauselmann <licorn at gmail dot com>
pkgname=libpdfium-nojs
-pkgver=3440.r7.a1c1c63d34
-pkgrel=2
+pkgver=3497.r2.139f7fbf60
+pkgrel=1
pkgdesc="Open-source PDF rendering engine."
arch=('x86_64')
url="https://pdfium.googlesource.com/pdfium/"
license=('BSD')
-depends=('freetype2' 'lcms2' 'libjpeg' 'openjpeg2')
+depends=('freetype2' 'lcms2' 'libjpeg' 'openjpeg2' 'icu')
conflicts=('libpdfium-bin')
provides=('libpdfium')
makedepends=('git' 'python2' 'gn' 'ninja')
@@ -23,7 +23,7 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'7fbbe2baf9a1fed80ad74278e901fa0e'
- '18cb7ae314a40fec21949a5f87bb80d3')
+ 'bbab1612841a1b2b0802ef75f02b9daf')
pkgver() {
diff --git a/openjpeg.patch b/openjpeg.patch
index 3f5f490f346a..b666a09669e7 100644
--- a/openjpeg.patch
+++ b/openjpeg.patch
@@ -70,15 +70,15 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace {
-@@ -513,7 +511,6 @@ bool CJPX_Decoder::Init(const unsigned c
- m_Image = nullptr;
+@@ -514,7 +512,6 @@ bool CJPX_Decoder::Init(pdfium::span<con
return false;
- }
+
+ m_Image = pTempImage;
- m_Image->pdfium_use_colorspace = !!m_ColorSpace;
if (!m_Parameters.nb_tile_to_decode) {
- if (!opj_set_decode_area(m_Codec, m_Image, m_Parameters.DA_x0,
-@@ -550,7 +547,7 @@ bool CJPX_Decoder::Init(const unsigned c
+ if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0,
+@@ -548,7 +545,7 @@ bool CJPX_Decoder::Init(pdfium::span<con
// TODO(palmer): Using |opj_free| here resolves the crash described in
// https://crbug.com/737033, but ultimately we need to harmonize the
// memory allocation strategy across OpenJPEG and its PDFium callers.
@@ -89,10 +89,10 @@ author: Michael Gilbert <mgilbert@debian.org>
}
--- a/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
+++ b/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
-@@ -12,7 +12,7 @@
-
+@@ -13,7 +13,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcrt/unowned_ptr.h"
+ #include "third_party/base/span.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg-2.3/openjpeg.h>
@@ -108,7 +108,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
-@@ -80,7 +79,6 @@ config("pdfium_core_config") {
+@@ -75,7 +74,6 @@ config("pdfium_core_config") {
if (is_linux) {
if (current_cpu == "x64") {
defines += [ "_FX_CPU_=_FX_X64_" ]