[arch-commits] Commit in zathura-pdf-mupdf/trunk (2 files)

[Johannes Löthberg]

    Date: Thursday, March 17, 2022 @ 23:16:06
  Author: demize
Revision: 1157276

upgpkg: zathura-pdf-mupdf 0.3.8-1

Added:
  zathura-pdf-mupdf/trunk/0001-Remove-mupdf-linking-detection.patch
Modified:
  zathura-pdf-mupdf/trunk/PKGBUILD

-------------------------------------------+
 0001-Remove-mupdf-linking-detection.patch |   76 ++++++++++++++++++++++++++++
 PKGBUILD                                  |   14 +++--
 2 files changed, 86 insertions(+), 4 deletions(-)

Added: 0001-Remove-mupdf-linking-detection.patch
===================================================================
--- 0001-Remove-mupdf-linking-detection.patch	                        (rev 0)
+++ 0001-Remove-mupdf-linking-detection.patch	2022-03-17 23:16:06 UTC (rev 1157276)
@@ -0,0 +1,76 @@
+From e91e5ad64d20eb4a7df377effc12ec21ba6f5f7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at 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 at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-17 23:15:54 UTC (rev 1157275)
+++ PKGBUILD	2022-03-17 23:16:06 UTC (rev 1157276)
@@ -4,7 +4,7 @@
 # Contributor: Moritz Lipp <mlq at pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.3.7
+pkgver=0.3.8
 pkgrel=1
 
 pkgdesc="PDF support for Zathura (MuPDF backend) (Supports PDF, ePub, and OpenXPS)"
@@ -17,13 +17,19 @@
 depends=('cairo' 'gumbo-parser' 'jbig2dec' 'libjpeg' 'openjpeg2' 'openssl' 'zathura')
 makedepends=('libmupdf' 'meson' 'ninja' 'git')
 
-source=(zathura-pdf-mupdf-$pkgver.tar.gz::https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-$pkgver.tar.xz)
+source=(zathura-pdf-mupdf-$pkgver.tar.gz::https://github.com/pwmt/zathura-pdf-mupdf/archive/$pkgver.tar.gz
+        0001-Remove-mupdf-linking-detection.patch)
 
-sha256sums=('2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d')
+sha256sums=('ba19c187fc8a441dcfb4d793624eadaea99e0d320b1e33ca25dd62be2b68bcea' SKIP)
 
+prepare() {
+  cd zathura-pdf-mupdf-$pkgver
+  patch -p1 <"$srcdir"/0001-Remove-mupdf-linking-detection.patch
+}
+
 build() {
   cd zathura-pdf-mupdf-$pkgver
-  arch-meson -Dlink-external=true build
+  arch-meson build
   ninja -C build
 }