[arch-commits] Commit in zathura-pdf-mupdf/repos/community-x86_64 (4 files)
Johannes Löthberg
demize at gemini.archlinux.org
Tue Aug 30 18:38:59 UTC 2022
Date: Tuesday, August 30, 2022 @ 18:38:59
Author: demize
Revision: 1288928
archrelease: copy trunk to community-x86_64
Added:
zathura-pdf-mupdf/repos/community-x86_64/0001-Remove-mupdf-linking-detection.patch
(from rev 1288927, zathura-pdf-mupdf/trunk/0001-Remove-mupdf-linking-detection.patch)
zathura-pdf-mupdf/repos/community-x86_64/PKGBUILD
(from rev 1288927, zathura-pdf-mupdf/trunk/PKGBUILD)
Deleted:
zathura-pdf-mupdf/repos/community-x86_64/0001-Remove-mupdf-linking-detection.patch
zathura-pdf-mupdf/repos/community-x86_64/PKGBUILD
-------------------------------------------+
0001-Remove-mupdf-linking-detection.patch | 152 ++++++++++++++--------------
PKGBUILD | 79 +++++++-------
2 files changed, 116 insertions(+), 115 deletions(-)
Deleted: 0001-Remove-mupdf-linking-detection.patch
===================================================================
--- 0001-Remove-mupdf-linking-detection.patch 2022-08-30 18:38:52 UTC (rev 1288927)
+++ 0001-Remove-mupdf-linking-detection.patch 2022-08-30 18:38:59 UTC (rev 1288928)
@@ -1,76 +0,0 @@
-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
-
Copied: zathura-pdf-mupdf/repos/community-x86_64/0001-Remove-mupdf-linking-detection.patch (from rev 1288927, zathura-pdf-mupdf/trunk/0001-Remove-mupdf-linking-detection.patch)
===================================================================
--- 0001-Remove-mupdf-linking-detection.patch (rev 0)
+++ 0001-Remove-mupdf-linking-detection.patch 2022-08-30 18:38:59 UTC (rev 1288928)
@@ -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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-30 18:38:52 UTC (rev 1288927)
+++ PKGBUILD 2022-08-30 18:38:59 UTC (rev 1288928)
@@ -1,39 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Moritz Lipp <mlq at pwmt.org>
-
-pkgname=zathura-pdf-mupdf
-pkgver=0.3.8
-pkgrel=1
-
-pkgdesc="PDF support for Zathura (MuPDF backend) (Supports PDF, ePub, and OpenXPS)"
-url="https://pwmt.org/projects/zathura-pdf-mupdf/"
-arch=('x86_64')
-license=('zlib')
-
-conflicts=('zathura-pdf-poppler')
-
-depends=('cairo' 'gumbo-parser' 'jbig2dec' 'libjpeg' 'openjpeg2' 'openssl' 'zathura')
-makedepends=('libmupdf' 'meson' 'ninja' 'git')
-
-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=('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 build
- ninja -C build
-}
-
-package(){
- DESTDIR="$pkgdir" ninja -C zathura-pdf-mupdf-$pkgver/build install
- install -Dm0644 zathura-pdf-mupdf-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: zathura-pdf-mupdf/repos/community-x86_64/PKGBUILD (from rev 1288927, zathura-pdf-mupdf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-30 18:38:59 UTC (rev 1288928)
@@ -0,0 +1,40 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Moritz Lipp <mlq at pwmt.org>
+
+pkgname=zathura-pdf-mupdf
+pkgver=0.3.9
+pkgrel=1
+
+pkgdesc="PDF support for Zathura (MuPDF backend) (Supports PDF, ePub, and OpenXPS)"
+url="https://pwmt.org/projects/zathura-pdf-mupdf/"
+arch=('x86_64')
+license=('zlib')
+
+conflicts=('zathura-pdf-poppler')
+
+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
+ 0001-Remove-mupdf-linking-detection.patch)
+
+sha256sums=('77f795ea1745b695a50b6864e73569d4ed8ac0eaa4ee2e6069e725c932057c07'
+ '8b51563a782a7dea38711335354bf65e2303b06bfecacf9cc060ecfc7b0851b8')
+
+prepare() {
+ cd zathura-pdf-mupdf-$pkgver
+ patch -p1 <"$srcdir"/0001-Remove-mupdf-linking-detection.patch
+}
+
+build() {
+ cd zathura-pdf-mupdf-$pkgver
+ arch-meson build
+ ninja -C build
+}
+
+package(){
+ DESTDIR="$pkgdir" ninja -C zathura-pdf-mupdf-$pkgver/build install
+ install -Dm0644 zathura-pdf-mupdf-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
More information about the arch-commits
mailing list