diff options
| author | Jiří Klimeš | 2022-04-29 23:19:23 +0200 |
|---|---|---|
| committer | Jiří Klimeš | 2022-04-29 23:49:07 +0200 |
| commit | 9c0cab1e44c334e26c5f6317257078e3e61b6f3e (patch) | |
| tree | d6853c93c8194bfd76ea85a313417c5f7db5e264 | |
| parent | 67056b12ea5f92629c1d5c1e9173fd93ad215f1c (diff) | |
| download | aur-9c0cab1e44c334e26c5f6317257078e3e61b6f3e.tar.gz | |
Fix build with poppler >= 22.03.0
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | pdf2djvu-poppler-fix.patch | 32 |
3 files changed, 50 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = pdf2djvu pkgdesc = Creates DjVu files from PDF files pkgver = 0.9.18.2 - pkgrel = 1 + pkgrel = 2 url = https://jwilk.net/software/pdf2djvu arch = x86_64 license = GPL @@ -14,6 +14,8 @@ pkgbase = pdf2djvu depends = graphicsmagick depends = exiv2 source = https://github.com/jwilk/pdf2djvu/releases/download/0.9.18.2/pdf2djvu-0.9.18.2.tar.xz + source = pdf2djvu-poppler-fix.patch sha256sums = 9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa + sha256sums = 0507a1c71e940873213e45762bab96094249b2d15a756541c687e0e79c3b4f1d pkgname = pdf2djvu @@ -4,15 +4,27 @@ pkgname=pdf2djvu pkgver=0.9.18.2 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('x86_64') url="https://jwilk.net/software/pdf2djvu" license=('GPL') depends=('poppler' 'djvulibre' 'gcc-libs' 'graphicsmagick' 'exiv2') makedepends=('python2-nose' 'ttf-liberation' 'boost') -source=(https://github.com/jwilk/pdf2djvu/releases/download/${pkgver}/pdf2djvu-${pkgver}.tar.xz) -sha256sums=('9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa') +source=( + "https://github.com/jwilk/pdf2djvu/releases/download/${pkgver}/pdf2djvu-${pkgver}.tar.xz" + "pdf2djvu-poppler-fix.patch" +) +sha256sums=( + '9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa' + '0507a1c71e940873213e45762bab96094249b2d15a756541c687e0e79c3b4f1d' +) + +prepare() { + # Fix build for poppler >= 22.03.0 + # remove the patch when this is fixed upstream + patch -p1 < "$srcdir"/pdf2djvu-poppler-fix.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/pdf2djvu-poppler-fix.patch b/pdf2djvu-poppler-fix.patch new file mode 100644 index 000000000000..a8e4be68bc91 --- /dev/null +++ b/pdf2djvu-poppler-fix.patch @@ -0,0 +1,32 @@ +--- src/pdf2djvu-0.9.18.2/pdf-backend.cc.orig 2022-04-29 23:29:42.368147604 +0200 ++++ src/pdf2djvu-0.9.18.2/pdf-backend.cc 2022-04-29 23:29:53.624814042 +0200 +@@ -130,7 +130,11 @@ + */ + + pdf::Document::Document(const std::string &file_name) ++#if POPPLER_VERSION >= 220300 ++: ::PDFDoc(std::make_unique<GooString>(file_name)) ++#else + : ::PDFDoc(new pdf::String(file_name.c_str()), nullptr, nullptr) ++#endif + { + if (!this->isOk()) + throw LoadError(); +--- src/pdf2djvu-0.9.18.2/pdf2djvu.cc.orig 2022-04-29 23:29:28.464814542 +0200 ++++ src/pdf2djvu-0.9.18.2/pdf2djvu.cc 2022-04-29 23:29:59.251480598 +0200 +@@ -89,7 +89,15 @@ + #endif + } + else ++ { ++#if POPPLER_VERSION >= 220300 ++ // Poppler removed copy() method ++ // https://cgit.freedesktop.org/poppler/poppler/commit/poppler/Link.h?id=7a429c3cf9fba67ee736a52aa4f12e0c177f1405 ++ dest.reset(new LinkDest(*orig_dest)); ++#else + dest.reset(orig_dest->copy()); ++#endif ++ } + if (dest.get() != nullptr) + { + int page; |