Date: Sunday, May 13, 2018 @ 10:37:46 Author: demize Revision: 321603
archrelease: copy trunk to community-x86_64 Added: zathura-pdf-mupdf/repos/community-x86_64/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch (from rev 321602, zathura-pdf-mupdf/trunk/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch) zathura-pdf-mupdf/repos/community-x86_64/PKGBUILD (from rev 321602, zathura-pdf-mupdf/trunk/PKGBUILD) Deleted: zathura-pdf-mupdf/repos/community-x86_64/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch zathura-pdf-mupdf/repos/community-x86_64/PKGBUILD --------------------------------------------------------------+ 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch | 80 ++++----- PKGBUILD | 82 +++++----- 2 files changed, 81 insertions(+), 81 deletions(-) Deleted: 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch =================================================================== --- 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch 2018-05-13 10:37:39 UTC (rev 321602) +++ 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch 2018-05-13 10:37:46 UTC (rev 321603) @@ -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 - Copied: zathura-pdf-mupdf/repos/community-x86_64/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch (from rev 321602, zathura-pdf-mupdf/trunk/0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch) =================================================================== --- 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch (rev 0) +++ 0001-Explicitly-link-against-jbig2dec-openjp2-and-jpeg.patch 2018-05-13 10:37:46 UTC (rev 321603) @@ -0,0 +1,40 @@ +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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-13 10:37:39 UTC (rev 321602) +++ PKGBUILD 2018-05-13 10:37:46 UTC (rev 321603) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Moritz Lipp <m...@pwmt.org> - -pkgname=zathura-pdf-mupdf -pkgver=0.3.3 -pkgrel=3 - -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=('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) - -sha1sums=('a9165f6aec134de86d6ee5c1a2ed5f1aa8f7d0b3' - '3b758fa892a33dda13c799a45a0e0bed6085467c') - -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 - 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 321602, zathura-pdf-mupdf/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-13 10:37:46 UTC (rev 321603) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Moritz Lipp <m...@pwmt.org> + +pkgname=zathura-pdf-mupdf +pkgver=0.3.3 +pkgrel=3 + +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=('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) + +sha1sums=('a9165f6aec134de86d6ee5c1a2ed5f1aa8f7d0b3' + '3b758fa892a33dda13c799a45a0e0bed6085467c') + +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 + 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 +}