zathura-pdf-mupdf: pulled patch from arch to remove mupdf linking detection

3 files changed, 84 insertions, 4 deletions

diff --git a/zathura-pdf-mupdf/.signature b/zathura-pdf-mupdf/.signature
index 023afdbd2..4ecfd5cca 100644
--- a/zathura-pdf-mupdf/.signature
+++ b/zathura-pdf-mupdf/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF367rGs9VUHm1rkruOsSLio9CZZGFBuDa6669wT7MQpzyP8/mxTXce9amlLw3F2k7sF3A6ewvu2sh9ANXLy/2Lgw=
-SHA256 (Pkgfile) = eaa82536150d2e01ab6892923489c2397547f2ba08b6a8eb4bddf6672b987df9
+RWSagIOpLGJF32wki0bhnwAQOyI5d8R1F/4OHmTftJKg+Hl5y2lg7s7QJzv29R/oREnBfHL5YIOPbFHCZRIL5W5uB9d45xQYCQU=
+SHA256 (Pkgfile) = 6341cb5b25ca46a3d4f4495c00e513defb8547c4df5cb2a9c8176e334a6de4ce
 SHA256 (.footprint) = 6afe2b8de941c5d7fb3d0692f5260d9b8c733331a338279d2844dbd692db7add
 SHA256 (zathura-pdf-mupdf-0.3.8.tar.bz2) = 10fdc3b159e78e56a008a45103b348ac85c5f328824e3708df93a5bb4a43a6c7
+SHA256 (0001-Remove-mupdf-linking-detection.patch) = 8b51563a782a7dea38711335354bf65e2303b06bfecacf9cc060ecfc7b0851b8
diff --git a/zathura-pdf-mupdf/0001-Remove-mupdf-linking-detection.patch b/zathura-pdf-mupdf/0001-Remove-mupdf-linking-detection.patch
new file mode 100644
index 000000000..0b517d66f
--- /dev/null
+++ b/zathura-pdf-mupdf/0001-Remove-mupdf-linking-detection.patch
@@ -0,0 +1,76 @@
+From e91e5ad64d20eb4a7df377effc12ec21ba6f5f7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
+Date: Fri, 18 Mar 2022 00:02:43 +0100
+Subject: [PATCH] Remove mupdf linking detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
+---
+ meson.build | 40 ++++++++++++++--------------------------
+ 1 file changed, 14 insertions(+), 26 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c8c19dc..8174431 100644
+--- a/meson.build
++++ b/meson.build
+@@ -19,8 +19,6 @@ zathura = dependency('zathura', version: '>=0.3.9')
+ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+-mupdf = dependency('mupdf', required: false)
+-mupdfthird = cc.find_library('mupdf-third')
+ 
+ build_dependencies = [
+   zathura,
+@@ -29,32 +27,22 @@ build_dependencies = [
+   cairo,
+ ]
+ 
+-if not mupdf.found()
+-  # normal build of mupdf
+-  mupdf = cc.find_library('mupdf')
+-  build_dependencies += [mupdf, mupdfthird]
+-else
+-  # build from Debian's libmupdf-dev
+-  build_dependencies += [mupdf, mupdfthird]
++mupdf = cc.find_library('mupdf')
++mupdfthird = cc.find_library('mupdf-third')
+ 
+-  libjpeg = dependency('libjpeg')
+-  libjbig2dec = cc.find_library('jbig2dec')
+-  libopenjp2 = dependency('libopenjp2')
+-  gumbo = dependency('gumbo')
+-  tesseract = dependency('tesseract')
+-  leptonica = dependency('lept')
+-  mujs = dependency('mujs')
++libjpeg = dependency('libjpeg')
++libjbig2dec = cc.find_library('jbig2dec')
++libopenjp2 = dependency('libopenjp2')
++gumbo = dependency('gumbo')
+ 
+-  build_dependencies += [
+-    libjpeg,
+-    libjbig2dec,
+-    libopenjp2,
+-    gumbo,
+-    tesseract,
+-    leptonica,
+-    mujs
+-  ]
+-endif
++build_dependencies += [
++  mupdf,
++  mupdfthird,
++  libjpeg,
++  libjbig2dec,
++  libopenjp2,
++  gumbo,
++]
+ 
+ if get_option('plugindir') == ''
+   plugindir = zathura.get_pkgconfig_variable('plugindir')
+-- 
+2.35.1
+
diff --git a/zathura-pdf-mupdf/Pkgfile b/zathura-pdf-mupdf/Pkgfile
index 1bb700a10..8e4113b10 100644
--- a/zathura-pdf-mupdf/Pkgfile
+++ b/zathura-pdf-mupdf/Pkgfile
@@ -5,10 +5,13 @@
 
 name=zathura-pdf-mupdf
 version=0.3.8
-release=1
-source=(https://git.pwmt.org/pwmt/$name/-/archive/$version/$name-$version.tar.bz2)
+release=2
+source=(https://git.pwmt.org/pwmt/$name/-/archive/$version/$name-$version.tar.bz2
+  0001-Remove-mupdf-linking-detection.patch)
 
 build() {
+  patch -Np1 -d $name-$version -i $SRC/0001-Remove-mupdf-linking-detection.patch
+
   meson setup $name-$version build \
     --prefix=/usr \
     --sysconfdir=/etc \