diff options
| -rw-r--r-- | .AURINFO | 17 | ||||
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | 0001-Remove-mupdf-linking-detection.patch | 74 | ||||
| -rw-r--r-- | PKGBUILD | 55 |
5 files changed, 130 insertions, 51 deletions
diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index 6cd0b300955f..000000000000 --- a/.AURINFO +++ /dev/null @@ -1,17 +0,0 @@ -pkgbase = zathura-pdf-mupdf-git - pkgdesc = PDF support for zathura by using the mupdf library - pkgver = 0.2.6.5.ga7bef63 - pkgrel = 1 - url = http://pwmt.org/projects/zathura-pdf-mupdf - arch = i686 - arch = x86_64 - license = custom - makedepends = git - depends = zathura-git - depends = mupdf>=1.4 - provides = zathura-pdf-mupdf - conflicts = zathura-pdf-mupdf - source = zathura-pdf-mupdf::git+git://pwmt.org/zathura-pdf-mupdf.git#branch=develop - -pkgname = zathura-pdf-mupdf-git - @@ -1,18 +1,28 @@ pkgbase = zathura-pdf-mupdf-git - pkgdesc = PDF support for zathura by using the mupdf library - pkgver = 0.2.7.10.g37898c2 - pkgrel = 1 - url = http://pwmt.org/projects/zathura-pdf-mupdf - arch = i686 + pkgdesc = PDF support for zathura (mupdf backend) (Supports PDF, ePub, and OpenXPS) + pkgver = 0.4.1.r8.gc742d4c + pkgrel = 2 + url = https://pwmt.org/projects/zathura-pdf-mupdf arch = x86_64 - license = custom + license = Zlib makedepends = git + makedepends = meson + makedepends = ninja + depends = cairo + depends = gumbo-parser + depends = jbig2dec + depends = libjpeg + depends = libmupdf + depends = openjpeg2 + depends = openssl depends = zathura-git - depends = mupdf>=1.4 provides = zathura-pdf-mupdf conflicts = zathura-pdf-mupdf - source = zathura-pdf-mupdf::git+https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git#branch=develop - md5sums = SKIP + conflicts = zathura-pdf-poppler + conflicts = zathura-pdf-poppler-git + source = zathura-pdf-mupdf-git::git+https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git#branch=develop + source = 0001-Remove-mupdf-linking-detection.patch + sha256sums = SKIP + sha256sums = 2254646722ed253b84e187791b9949fa3502c853929bfa71e611cc7db85fea49 pkgname = zathura-pdf-mupdf-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..7735b4612827 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +* +!PKGBUILD +!.SRCINFO +!.gitignore +!*.patch diff --git a/0001-Remove-mupdf-linking-detection.patch b/0001-Remove-mupdf-linking-detection.patch new file mode 100644 index 000000000000..034d0746533b --- /dev/null +++ b/0001-Remove-mupdf-linking-detection.patch @@ -0,0 +1,74 @@ +From 88004acb11ef180379bbeafc5f45959991448dbb Mon Sep 17 00:00:00 2001 +From: a821 <a821@nospam.mail.de> +Date: Mon, 16 Oct 2023 10:51:57 +0200 +Subject: [PATCH] Remove mupdf linking detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch adapted from official PKGBUILD by Johannes Löthberg. +--- + meson.build | 38 ++++++++++++-------------------------- + 1 file changed, 12 insertions(+), 26 deletions(-) + +diff --git a/meson.build b/meson.build +index 8ac0565..7778122 100644 +--- a/meson.build ++++ b/meson.build +@@ -19,8 +19,6 @@ zathura = dependency('zathura', version: '>=0.5.2') + 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,20 @@ 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') + +- 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, ++ libjpeg, ++ libjbig2dec, ++ libopenjp2, ++ gumbo, ++] + + if get_option('plugindir') == '' + plugindir = zathura.get_variable(pkgconfig: 'plugindir') +-- +2.42.0 + @@ -1,35 +1,42 @@ -# Maintainer: Moritz Lipp <mlq@pwmt.org> +# Maintainer: a821 +# Contributor: Moritz Lipp <mlq@pwmt.org> pkgname=zathura-pdf-mupdf-git -pkgrel=1 -pkgver=0.2.7.10.g37898c2 -pkgdesc="PDF support for zathura by using the mupdf library" -arch=('i686' 'x86_64') -url="http://pwmt.org/projects/zathura-pdf-mupdf" -license=('custom') -depends=('zathura-git' 'mupdf>=1.4') -makedepends=('git') -conflicts=('zathura-pdf-mupdf') +pkgver=0.4.1.r8.gc742d4c +pkgrel=2 +pkgdesc="PDF support for zathura (mupdf backend) (Supports PDF, ePub, and OpenXPS)" +arch=('x86_64') +url="https://pwmt.org/projects/zathura-pdf-mupdf" +license=('Zlib') +depends=('cairo' 'gumbo-parser' 'jbig2dec' 'libjpeg' 'libmupdf' 'openjpeg2' 'openssl' 'zathura-git') +makedepends=('git' 'meson' 'ninja') +conflicts=('zathura-pdf-mupdf' 'zathura-pdf-poppler' 'zathura-pdf-poppler-git') provides=('zathura-pdf-mupdf') -source=('zathura-pdf-mupdf::git+https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git#branch=develop') -md5sums=('SKIP') -_gitname=zathura-pdf-mupdf +source=("$pkgname::git+https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git#branch=develop" + "0001-Remove-mupdf-linking-detection.patch") +sha256sums=('SKIP' + '2254646722ed253b84e187791b9949fa3502c853929bfa71e611cc7db85fea49') -build() { - cd "$srcdir/$_gitname" - make +pkgver() { + cd "$pkgname" + git describe --tags --long | sed 's/-/.r/;s/-/./g' } -package() { - cd "$srcdir/$_gitname" - make DESTDIR="$pkgdir/" install - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +prepare() { + cd "$pkgname" + patch -p1 < ../0001-Remove-mupdf-linking-detection.patch } -pkgver() { - cd "$srcdir/$_gitname" - local ver="$(git describe --long --always)" - printf "%s" "${ver//-/.}" +build() { + cd "$pkgname" + arch-meson build + ninja -C build +} + +package() { + cd "$pkgname" + DESTDIR="$pkgdir/" ninja -C build install + install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" } # vim:set ts=2 sw=2 et: |