mupdf: update to 1.24.2

Use the same naming as Arch Linux

mingw-w64-mupdf/001-makerules-search-system-libraries.patch

@@ -1,13 +1,11 @@
 --- a/Makerules
 +++ b/Makerules
-@@ -180,9 +180,8 @@
-     endif
-   endif
+@@ -171,7 +171,7 @@
+   CFLAGS += -DCLUSTER
+ endif
  
--else ifeq ($(OS),Linux)
-+else ifeq ($(OS),$(filter $(OS),Linux MINGW Windows_NT))
-   ifeq ($(PYODIDE_ROOT),)
--    HAVE_OBJCOPY := yes
-   else
-     # Pyodide's ld does not support -b so we cannot use it to create object
-     # files containing font data, so leave HAVE_OBJCOPY unset. And we need
+-ifeq ($(OS),Linux)
++ifeq ($(OS),$(filter $(OS),Linux MINGW Windows_NT))
+     LINUX_OR_OPENBSD := yes
+ endif
+ ifeq ($(OS),OpenBSD)

mingw-w64-mupdf/002-makerules-fix-gl-libraries.patch

@@ -1,11 +1,11 @@
 --- a/Makerules
 +++ b/Makerules
-@@ -239,7 +239,7 @@
-   HAVE_GLUT := yes
-   ifeq ($(HAVE_GLUT),yes)
- 	SYS_GLUT_CFLAGS :=
--	SYS_GLUT_LIBS := -lglut -lGL
-+	SYS_GLUT_LIBS := -lfreeglut -lopengl32
+@@ -270,7 +270,7 @@
+       SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl)
+     else
+       SYS_GLUT_CFLAGS :=
+-      SYS_GLUT_LIBS := -lglut -lGL
++      SYS_GLUT_LIBS := -lfreeglut -lopengl32
+     endif
    endif
  
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)

mingw-w64-mupdf/PKGBUILD

@@ -3,23 +3,23 @@
 _realname=mupdf
 pkgbase=mingw-w64-${_realname}
 pkgname=(
-  "${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf"
-  "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf"
-  "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-gl"
-  "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools"
+  "${MINGW_PACKAGE_PREFIX}-libmupdf"
+  "${MINGW_PACKAGE_PREFIX}-mupdf"
+  "${MINGW_PACKAGE_PREFIX}-mupdf-gl"
+  "${MINGW_PACKAGE_PREFIX}-mupdf-tools"
 )
-pkgver=1.23.11
+pkgver=1.24.2
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://mupdf.com/'
+msys2_repository_url='https://github.com/ArtifexSoftware/mupdf/'
+msys2_documentation_url='https://mupdf.readthedocs.io/'
 msys2_references=(
   'archlinux: mupdf'
   "cpe: cpe:/a:artifex:mupdf"
 )
-msys2_repository_url='https://github.com/ArtifexSoftware/mupdf/'
-msys2_documentation_url='https://mupdf.readthedocs.io/'
-url='https://mupdf.com/'
 license=('spdx:AGPL-3.0-or-later')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-freetype"
@@ -33,18 +33,20 @@ depends=(
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-freeglut"
+  "lzip"
+  "unzip"
 )
-source=("https://mupdf.com/downloads/archive/${_realname}-${pkgver}-source.tar.gz"
+source=("https://mupdf.com/downloads/archive/${_realname}-${pkgver}-source.tar.lz"
         "001-makerules-search-system-libraries.patch"
         "002-makerules-fix-gl-libraries.patch"
 )
-noextract=("${_realname}-${pkgver}-source.tar.gz")
-sha256sums=('478f2a167feae2a291c8b8bc5205f2ce2f09f09b574a6eb0525bfad95a3cfe66'
-            'd48618e70548bd94a87d06a0b925249e6991058063646f272a42fdd396d7b97d'
-            '24a6366579f4abcfa3fc533c1ffcf9c5e36cb35dcc22b9d92921296f8943eac4')
+noextract=("${_realname}-${pkgver}-source.tar.lz")
+sha256sums=('b86ba258c5cc6711367e4bbe2d283389a33ac19f00a513462f6c60d05b00601c'
+            'ab93d8d1ff69752ef897fa56134d17d8dda1ea19ee7a9c368090ed7effb3101c'
+            '082b0fd6f162b91ff2bc263e24440ad7297e1ab5db7e1e2d76f1f0d5215af8ad')
 
 prepare() {
-  tar -xf "${_realname}-${pkgver}-source.tar.gz" || true
+  tar -xf "${_realname}-${pkgver}-source.tar.lz" || true
 
   cd "${_realname}-${pkgver}-source"
 
@@ -56,7 +58,8 @@ prepare() {
 }
 
 build() {
-  cd "${_realname}-${pkgver}-source"
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  cp -r ${_realname}-${pkgver}-source build-${MSYSTEM} && cd build-${MSYSTEM}
 
   make USE_SYSTEM_LIBS=yes HAVE_GLUT=yes HAVE_WIN32=yes WINDRES=windres prefix=${MINGW_PREFIX} \
     DESTDIR=install build=release libs apps install
@@ -65,17 +68,23 @@ build() {
 package_libmupdf() {
   pkgdesc='Library for Lightweight PDF and XPS viewer (mingw-w64)'
   depends=()
+  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf")
+  replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf")
 
-  cd "${_realname}-${pkgver}-source"
+  cd build-${MSYSTEM}
 
-  install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/mupdf-libmupdf" README COPYING CHANGES
+  install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/libmupdf" README COPYING CHANGES
   cp -r install${MINGW_PREFIX}/{include,lib} "${pkgdir}${MINGW_PREFIX}/"
 }
 
 package_mupdf() {
   pkgdesc='Lightweight PDF and XPS viewer (mingw-w64)'
+  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf")
+  replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf")
 
-  cd "${_realname}-${pkgver}-source"
+  cd build-${MSYSTEM}
 
   install -D -m0755 install${MINGW_PREFIX}/bin/mupdf-w32 "${pkgdir}${MINGW_PREFIX}/bin/mupdf.exe"
   install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/mupdf" README COPYING CHANGES
@@ -87,10 +96,13 @@ package_mupdf() {
 package_mupdf-gl() {
   pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend (mingw-w64)'
   depends+=("${MINGW_PACKAGE_PREFIX}-freeglut")
-  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf")
-  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf=${pkgver}")
+  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")
 
-  cd "${_realname}-${pkgver}-source"
+  cd build-${MSYSTEM}
 
   install -D -m0755 install${MINGW_PREFIX}/bin/mupdf-gl "${pkgdir}${MINGW_PREFIX}/bin/mupdf.exe"
   install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/mupdf" README COPYING CHANGES
@@ -101,8 +113,11 @@ package_mupdf-gl() {
 
 package_mupdf-tools() {
   pkgdesc='Tools for Lightweight PDF and XPS viewer (mingw-w64)'
+  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools")
+  replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools")
+  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools")
 
-  cd "${_realname}-${pkgver}-source"
+  cd build-${MSYSTEM}
 
   install -D -m0755 -t "${pkgdir}${MINGW_PREFIX}/bin" install${MINGW_PREFIX}/bin/mu{raster,tool}
   install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/mupdf-tools" README COPYING CHANGES
@@ -114,7 +129,7 @@ package_mupdf-tools() {
 
 # generate wrappers
 for _name in "${pkgname[@]}"; do
-  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-${_realname}-}"
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
   _func="$(declare -f "${_short}")"
   eval "${_func/#${_short}/package_${_name}}"
 done