Re: [PR PATCH] [Updated] zathura-pdf-mupdf: update to 0.3.9.

[icp1994 <icp1994@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 717 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages zathura-pdf-mupdf
https://github.com/void-linux/void-packages/pull/40131

zathura-pdf-mupdf: update to 0.3.9.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

This PR contains quite a few changes to get around issues discussed in https://github.com/void-linux/void-packages/issues/35634. It works in my system but if someone could test it in musl (cc @dkwo) that would be useful.

A patch file from https://github.com/void-linux/void-packages/pull/40131.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zathura-pdf-mupdf-40131.patch --]
[-- Type: text/x-diff, Size: 6392 bytes --]

From 210ebcf5cb00b3ed58ae8904e421264d13d0954b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 23 Oct 2022 14:56:40 +0530
Subject: [PATCH 1/3] zathura: update to 0.5.1.

---
 srcpkgs/zathura/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 69193d8ded4e..cffc5b952db0 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.4.9
-revision=2
+version=0.5.1
+revision=1
 build_style=meson
 configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
@@ -12,10 +12,10 @@ checkdepends="gettext-devel check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://git.pwmt.org/pwmt/zathura/"
+homepage="https://pwmt.org/projects/zathura/"
 changelog="https://pwmt.org/projects/zathura/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6
+distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
+checksum=98a661ce271a9d108a7eb8f73e471fd5e727eeff4b246cdb2c9862f8aeab1bb1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"

From 9597f1bb2d47fa820a46037bd612b351e6439e1f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 23 Oct 2022 15:22:33 +0530
Subject: [PATCH 2/3] mupdf: update to 1.20.3.

Add pkg-config file for -devel.
---
 srcpkgs/mupdf/files/mupdf.pc.in | 11 +++++++++++
 srcpkgs/mupdf/template          |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mupdf/files/mupdf.pc.in

diff --git a/srcpkgs/mupdf/files/mupdf.pc.in b/srcpkgs/mupdf/files/mupdf.pc.in
new file mode 100644
index 000000000000..ea2b226d291d
--- /dev/null
+++ b/srcpkgs/mupdf/files/mupdf.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mupdf
+Description: Lightweight PDF and XPS viewer
+URL: https://mupdf.com
+Version: @VERSION@
+Libs: -L${libdir} -lmupdf
+Cflags: -I${includedir}/mupdf
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index c7814cf7f53c..4ac4fc7b40a3 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,6 +1,6 @@
 # Template file for 'mupdf'
 pkgname=mupdf
-version=1.20.0
+version=1.20.3
 revision=1
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://mupdf.com"
 distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.lz"
-checksum=68dbb1cf5e31603380ce3f1c7f6c431ad442fa735d048700f50ab4de4c3b0f82
+checksum=6f73f63ef8aa81991dfd023d4426a548827d1d74e0bfcf2a013acad63b651868
 
 pre_build() {
 	# libmupdf-{threads,pkcs7}.a are required by fbpdf
@@ -50,6 +50,9 @@ do_install() {
 
 	vinstall ${FILESDIR}/mupdf.xpm 644 usr/share/pixmaps
 	vinstall ${FILESDIR}/mupdf.desktop 644 usr/share/applications
+
+	vmkdir usr/lib/pkgconfig
+	sed "s/@VERSION@/${version}/" ${FILESDIR}/mupdf.pc.in > ${DESTDIR}/usr/lib/pkgconfig/mupdf.pc
 }
 
 post_install() {
@@ -60,6 +63,7 @@ mupdf-devel_package() {
 	short_desc+=" - development files"
 	depends="libjpeg-turbo-devel jbig2dec-devel libopenjpeg2-devel"
 	pkg_install() {
+		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove "usr/lib/*.a"
 	}

From 1ecbb640d7d608fdd1583e86f1bfbaf549b4e526 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 24 Oct 2022 00:49:09 +0530
Subject: [PATCH 3/3] zathura-pdf-mupdf: update to 0.3.9.

---
 .../zathura-pdf-mupdf/patches/mupdf-1.20.0.patch | 12 ------------
 srcpkgs/zathura-pdf-mupdf/template               | 16 +++++++---------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch

diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
deleted file mode 100644
index 53b76fe358cb..000000000000
--- a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-from https://gitlab.alpinelinux.org/alpine/aports/-/commit/5c2d1886fdead7c00a00ddcd5d04aaa8d1f53377
---- a/zathura-pdf-mupdf/search.c
-+++ b/zathura-pdf-mupdf/search.c
-@@ -41,7 +41,7 @@
- 
-   fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
-   int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
--      text, hit_bbox, N_SEARCH_RESULTS);
-+      text, NULL, hit_bbox, N_SEARCH_RESULTS);
- 
-   fz_rect r;
-   for (int i = 0; i < num_results; i++) {
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 66f354d29863..1b6891784f02 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,19 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-reverts=0.3.8_1
-version=0.3.7
-revision=6
+version=0.3.9
+revision=1
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+makedepends="mupdf-devel zathura-devel libopenjpeg2-devel tesseract-ocr-devel
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel leptonica-devel mujs-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/"
+homepage="https://pwmt.org/projects/zathura-pdf-mupdf/"
 changelog="https://pwmt.org/projects/zathura-pdf-mupdf/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a
+distfiles="https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${version}.tar.xz"
+checksum=77f795ea1745b695a50b6864e73569d4ed8ac0eaa4ee2e6069e725c932057c07
 conflicts="zathura-pdf-poppler>=0"
 
 post_install() {