diff --git a/mingw-w64-mupdf/PKGBUILD b/mingw-w64-mupdf/PKGBUILD index 436e0300bd..a2fd9c1270 100644 --- a/mingw-w64-mupdf/PKGBUILD +++ b/mingw-w64-mupdf/PKGBUILD @@ -9,7 +9,7 @@ pkgname=( "${MINGW_PACKAGE_PREFIX}-mupdf-gl" "${MINGW_PACKAGE_PREFIX}-mupdf-tools" ) -pkgver=1.26.10 +pkgver=1.27.0 pkgrel=1 pkgdesc='Lightweight PDF and XPS viewer (mingw-w64)' arch=('any') @@ -22,19 +22,16 @@ msys2_references=( "cpe: cpe:/a:artifex:mupdf" ) license=('spdx:AGPL-3.0-or-later') -depends=() makedepends=( + "${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkgconf" + "${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-swig" "${MINGW_PACKAGE_PREFIX}-brotli" - "${MINGW_PACKAGE_PREFIX}-bzip2" - "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-curl" "${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-freeglut" - "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-gumbo-parser" - "${MINGW_PACKAGE_PREFIX}-graphite2" - "${MINGW_PACKAGE_PREFIX}-gettext-runtime" "${MINGW_PACKAGE_PREFIX}-harfbuzz" "${MINGW_PACKAGE_PREFIX}-jbig2dec" "${MINGW_PACKAGE_PREFIX}-jxrlib" @@ -45,14 +42,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-openjpeg2" "${MINGW_PACKAGE_PREFIX}-openssl" - "${MINGW_PACKAGE_PREFIX}-pkgconf" - "${MINGW_PACKAGE_PREFIX}-pcre2" - "${MINGW_PACKAGE_PREFIX}-tesseract-ocr" - "${MINGW_PACKAGE_PREFIX}-zint" "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-zxing-cpp" - "${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-swig" "lzip" "unzip" ) @@ -72,10 +62,9 @@ source=("https://mupdf.com/downloads/archive/${_realname}-${pkgver}-source.tar.l "007-cpp-binding-build-fix.patch" "008-python-binding-build-fix.patch" "009-makefile-install-target.patch" - "010-fix_build_with_clang21.patch" ) noextract=("${_realname}-${pkgver}-source.tar.lz") -sha256sums=('a23d51c136c25553b2941b5ab6ffae28c8e7b57ca3a992b62694b235f4f47656' +sha256sums=('61b109c82093a1c39b1b7f58c04b6d8ad6fe8e83e266ce1d8423e1e5c9310911' '92ca3f25217333b48f3c8c50907cf1d0f90fda82d2bd8c48e4256aea290da8c0' 'd0f98dead83ac341cbe21de9ccd3c27538763ab4f88fdea6776900c138d429e4' '9cdf7a1e009be8fa2b1fc270910a401c322ae9df2f2d67dd671191c3af27168c' @@ -85,8 +74,15 @@ sha256sums=('a23d51c136c25553b2941b5ab6ffae28c8e7b57ca3a992b62694b235f4f47656' '329aea6dc1a8a2aaebc41e5c06fda7278e52d6cf8d540c754faa4cc30d1e135d' 'e972cf4811460dcdf831ef3c4bc979630bb3707cfe1fa6c169215895034ab3bb' 'ca0f742cf84939fc709dc5d644bd145bc4cad006523c5411a6090998f447111b' - 'db02aea2df78c01c1671d8b46a490d85a000ae4b660aadb90e48fcb29746b41b' - 'a66d2a9d7a8aa7b9232f490b3663ec5b3157d748842c20cd475163ffb7a192d5') + 'db02aea2df78c01c1671d8b46a490d85a000ae4b660aadb90e48fcb29746b41b') + +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying ${_patch}" + patch -Nbp1 -i "${srcdir}/${_patch}" + done +} prepare() { sed -e "s/VERSION/${pkgver}/" -i "mupdf.pc" @@ -99,21 +95,23 @@ prepare() { # remove bundled packages, we want our system libraries rm -rf thirdparty/{curl,freetype,freeglut,harfbuzz,jbig2dec,libjpeg,openjpeg,brotli,tesseract,zint,zxing-cpp,zlib,gumbo-parser,leptonica} - patch -p1 -i "${srcdir}/001-makerules-search-system-libraries.patch" - patch -p1 -i "${srcdir}/002-makerules-fix-gl-libraries.patch" + apply_patch_with_msg \ + 001-makerules-search-system-libraries.patch \ + 002-makerules-fix-gl-libraries.patch # ARM64 don't support CFLAGS -ssme4.1 if [ ${MSYSTEM} != "CLANGARM64" ]; then - patch -p1 -i "${srcdir}/003-makerules-fix-inline-error.patch" + apply_patch_with_msg \ + 003-makerules-fix-inline-error.patch fi - patch -p1 -i "${srcdir}/004-gl-main-no-msc-ver-no-warning.patch" - patch -p1 -i "${srcdir}/005-win32-build-rules.patch" - patch -p1 -i "${srcdir}/006-makefile-shared-build.patch" - patch -p1 -i "${srcdir}/007-cpp-binding-build-fix.patch" - patch -p1 -i "${srcdir}/008-python-binding-build-fix.patch" - patch -p1 -i "${srcdir}/009-makefile-install-target.patch" - patch -p1 -i "${srcdir}/010-fix_build_with_clang21.patch" + apply_patch_with_msg \ + 004-gl-main-no-msc-ver-no-warning.patch \ + 005-win32-build-rules.patch \ + 006-makefile-shared-build.patch \ + 007-cpp-binding-build-fix.patch \ + 008-python-binding-build-fix.patch \ + 009-makefile-install-target.patch } build() { @@ -146,30 +144,15 @@ package_libmupdf() { pkgdesc='Library for Lightweight PDF and XPS viewer (mingw-w64)' depends=( "${MINGW_PACKAGE_PREFIX}-brotli" - "${MINGW_PACKAGE_PREFIX}-bzip2" + "${MINGW_PACKAGE_PREFIX}-cc-libs" "${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-gumbo-parser" - "${MINGW_PACKAGE_PREFIX}-graphite2" - "${MINGW_PACKAGE_PREFIX}-gettext-runtime" "${MINGW_PACKAGE_PREFIX}-harfbuzz" "${MINGW_PACKAGE_PREFIX}-jbig2dec" - "${MINGW_PACKAGE_PREFIX}-jxrlib" - "${MINGW_PACKAGE_PREFIX}-leptonica" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" - "${MINGW_PACKAGE_PREFIX}-libwinpthread" - "${MINGW_PACKAGE_PREFIX}-libc++" - "${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-openjpeg2" - "${MINGW_PACKAGE_PREFIX}-pcre2" - "${MINGW_PACKAGE_PREFIX}-tesseract-ocr" - "${MINGW_PACKAGE_PREFIX}-zint" "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-zxing-cpp" ) - provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf") - replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf") - conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf") cd build-${MSYSTEM} @@ -182,9 +165,9 @@ package_libmupdf() { } package_python-mupdf() { - pkgdesc="Library for Lightweight PDF and XPS viewer - Python bindings" + pkgdesc="Library for Lightweight PDF and XPS viewer - Python bindings (mingw-w64)" depends=( - "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-cc-libs" "${MINGW_PACKAGE_PREFIX}-libmupdf" "${MINGW_PACKAGE_PREFIX}-python" ) @@ -198,9 +181,6 @@ package_mupdf() { "${MINGW_PACKAGE_PREFIX}-libmupdf" "${MINGW_PACKAGE_PREFIX}-openssl" ) - provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf") - replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf") - conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf") cd build-${MSYSTEM} @@ -218,11 +198,8 @@ package_mupdf-gl() { "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-freeglut" ) - replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-gl") - conflicts=("${MINGW_PACKAGE_PREFIX}-mupdf" - "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-gl") - provides=("${MINGW_PACKAGE_PREFIX}-mupdf=${pkgver}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-gl") + conflicts=("${MINGW_PACKAGE_PREFIX}-mupdf") + provides=("${MINGW_PACKAGE_PREFIX}-mupdf=${pkgver}") cd build-${MSYSTEM} @@ -239,9 +216,6 @@ package_mupdf-tools() { "${MINGW_PACKAGE_PREFIX}-libmupdf" "${MINGW_PACKAGE_PREFIX}-openssl" ) - provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools") - replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools") - conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools") cd build-${MSYSTEM}