Date: Saturday, October 20, 2018 @ 12:20:03 Author: demize Revision: 398059
upgpkg: zathura-pdf-mupdf 0.3.4-1 Modified: zathura-pdf-mupdf/trunk/PKGBUILD Deleted: zathura-pdf-mupdf/trunk/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch --------------------------------------------------------------+ 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch | 40 ---------- PKGBUILD | 17 +--- 2 files changed, 5 insertions(+), 52 deletions(-) Deleted: 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch =================================================================== --- 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch 2018-10-20 12:12:10 UTC (rev 398058) +++ 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch 2018-10-20 12:20:03 UTC (rev 398059) @@ -1,40 +0,0 @@ -From 3fb0ff750373d45d4f5172ce1d41b74183cd07e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> -Date: Sat, 24 Mar 2018 14:31:18 +0100 -Subject: [PATCH] Explicitly link against jbig2dec, openjp2, and jpeg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Normally these are statically linked into libmupdfthird, but we delete -those to make mupdf use the system libraries. Previously -zathura-pdf-mupdf explicitly linked against them, but this is -technically incorrect since they are supposed to be in libmupdfthird so -that was removed. This commit essentially reverts that in the new build -system. - -Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3b0d7b7..ae2fc9c 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,7 +22,11 @@ cairo = dependency('cairo') - mupdf = cc.find_library('mupdf') - mupdfthird = cc.find_library('mupdfthird') - --build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird] -+jbig2dec = cc.find_library('jbig2dec') -+openjp2 = cc.find_library('openjp2') -+jpeg = cc.find_library('jpeg') -+ -+build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird, jbig2dec, openjp2, jpeg] - - # defines - defines = [ --- -2.16.3 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-20 12:12:10 UTC (rev 398058) +++ PKGBUILD 2018-10-20 12:20:03 UTC (rev 398059) @@ -4,8 +4,8 @@ # Contributor: Moritz Lipp <m...@pwmt.org> pkgname=zathura-pdf-mupdf -pkgver=0.3.3 -pkgrel=3 +pkgver=0.3.4 +pkgrel=1 pkgdesc="PDF support for Zathura (MuPDF backend) (Supports PDF, ePub, and OpenXPS)" url="https://pwmt.org/projects/zathura-pdf-mupdf/" @@ -17,20 +17,13 @@ depends=('zathura' 'jbig2dec' 'openjpeg2' 'libjpeg' 'cairo' 'desktop-file-utils' 'openssl') makedepends=('libmupdf' 'meson' 'ninja') -source=(https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-$pkgver.tar.xz - 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch) +source=(https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-$pkgver.tar.xz) -sha1sums=('a9165f6aec134de86d6ee5c1a2ed5f1aa8f7d0b3' - '3b758fa892a33dda13c799a45a0e0bed6085467c') +sha1sums=('f2adf855a67455f4dccd22c61dcf22cde4c5ae2a') -prepare() { - cd zathura-pdf-mupdf-$pkgver - patch -p1 <"$srcdir"/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch -} - build() { cd zathura-pdf-mupdf-$pkgver - arch-meson build + arch-meson -Dlink-external=true build ninja -C build }