Merge pull request #10504 from lazka/pdf2djvu-rebuild

pdf2djvu: build with C++17
This commit is contained in:
Christoph Reiter
2022-01-08 11:41:12 +01:00
committed by GitHub
2 changed files with 24 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
--- pdf2djvu-0.9.18.2/configure.ac.orig 2022-01-08 11:16:17.403000000 +0100
+++ pdf2djvu-0.9.18.2/configure.ac 2022-01-08 11:16:12.473049700 +0100
@@ -31,7 +31,7 @@
AC_PROG_CXX
-P_CXX11
+AX_CXX_COMPILE_STDCXX_17()
AC_SYS_LARGEFILE

View File

@@ -4,7 +4,7 @@ _realname=pdf2djvu
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.9.18.2
pkgrel=2
pkgrel=3
pkgdesc="Creates DjVu files from PDF files"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,11 +18,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-poppler"
"${MINGW_PACKAGE_PREFIX}-graphicsmagick"
"${MINGW_PACKAGE_PREFIX}-libiconv")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"autoconf-archive"
"${MINGW_PACKAGE_PREFIX}-autotools")
checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose")
source=(https://github.com/jwilk/pdf2djvu/releases/download/${pkgver}/pdf2djvu-${pkgver}.tar.xz{,.asc})
source=(https://github.com/jwilk/pdf2djvu/releases/download/${pkgver}/pdf2djvu-${pkgver}.tar.xz{,.asc}
"001-cxx17-for-poppler.patch")
sha256sums=('9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa'
'SKIP')
'SKIP'
'4c50966b0fc05d78f6ec78b20df587fb5e1861f3ff326ee66c8baf10ec3cb39f')
validpgpkeys=('CDB5A1243ACDB63009AD07212D4EB3A6015475F5') # Jakub Wilk <jwilk@jwilk.net>
noextract=(pdf2djvu-${pkgver}.tar.xz)
@@ -32,12 +35,19 @@ prepare() {
cp ${srcdir}/${_realname}-${pkgver}/tests/test-antialias-off.tex \
${srcdir}/${_realname}-${pkgver}/tests/test-antialias-on.tex
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i "${srcdir}/001-cxx17-for-poppler.patch"
autoreconf -fvi
}
build() {
[[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
cp -rf ${_realname}-${pkgver} build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
# exiv2 depends on std::auto_ptr which got removed.
# should be fixed in exiv2 0.28
CXXFLAGS+=" -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1" \
./configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \