Date: Wednesday, October 7, 2020 @ 11:31:02 Author: eworm Revision: 720399
upgpkg: mupdf 1.18.0-1: new upstream release Modified: mupdf/trunk/PKGBUILD Deleted: mupdf/trunk/0001-Set-noexecstack-on-linker-generated-binary-data-files.patch ------------------------------------------------------------------+ 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch | 24 ---------- PKGBUILD | 22 +++------ 2 files changed, 9 insertions(+), 37 deletions(-) Deleted: 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch =================================================================== --- 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch 2020-10-07 11:30:59 UTC (rev 720398) +++ 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch 2020-10-07 11:31:02 UTC (rev 720399) @@ -1,24 +0,0 @@ -From: Tor Andersson <tor.anders...@artifex.com> -Date: Thu, 4 Jun 2020 14:38:01 +0000 (+0200) -Subject: Set noexecstack on linker-generated binary data files. -X-Git-Url: https://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=e52e0c2c0297d70d0e4fc293ccd047becb18f322;hp=a86b1fa0119edef1683dc06f035bd329b54613a5 - -Set noexecstack on linker-generated binary data files. - -This will prevent the linker from flagging the mupdf library and -executables as needing an executable stack. ---- - -diff --git a/Makefile b/Makefile -index f812ac074..417663dd8 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,7 @@ endif - LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p - WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@ --OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $< -+OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $< - - # --- Rules --- - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-07 11:30:59 UTC (rev 720398) +++ PKGBUILD 2020-10-07 11:31:02 UTC (rev 720399) @@ -7,22 +7,21 @@ pkgbase=mupdf pkgname=(libmupdf mupdf mupdf-gl mupdf-tools) -pkgver=1.17.0 -pkgrel=3 +pkgver=1.18.0 +pkgrel=1 pkgdesc='Lightweight PDF and XPS viewer' arch=('x86_64') url='https://mupdf.com/' license=('AGPL3') makedepends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' - 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext') + 'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'libxext' + 'gumbo-parser') # we need static libs for zathura-pdf-mupdf options=('staticlibs') source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz" - '0001-Set-noexecstack-on-linker-generated-binary-data-files.patch' 'mupdf.desktop' 'mupdf.xpm') -sha256sums=('c935fb2593d9a28d9b56b59dad6e3b0716a6790f8a257a68fa7dcb4430bc6086' - '53e3ccc9dd613277a1cfb99dcf7e71216c8497a84f6a7663a2fbff9d58a10be5' +sha256sums=('592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a' 'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f' 'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8') @@ -31,9 +30,6 @@ # remove bundled packages, we want our system libraries rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} - - # Set noexecstack on linker-generated binary data files. - patch -Np1 < ../0001-Set-noexecstack-on-linker-generated-binary-data-files.patch } build() { @@ -65,7 +61,7 @@ package_mupdf() { pkgdesc='Lightweight PDF and XPS viewer' depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec' - 'libjpeg' 'openjpeg2' 'openssl' 'libxext') + 'libjpeg' 'openjpeg2' 'openssl' 'libxext' 'gumbo-parser') cd $pkgbase-${pkgver/_/}-source @@ -85,7 +81,7 @@ conflicts=('mupdf') provides=("mupdf=${pkgver}") depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec' - 'libjpeg' 'openjpeg2' 'openssl') + 'libjpeg' 'openjpeg2' 'openssl' 'gumbo-parser') cd $pkgbase-${pkgver/_/}-source @@ -103,8 +99,8 @@ package_mupdf-tools() { pkgdesc='Tools for Lightweight PDF and XPS viewer' depends=('mupdf') - depends=('freetype2' 'jbig2dec' 'libjpeg' - 'openjpeg2' 'harfbuzz' 'openssl') + depends=('freetype2' 'jbig2dec' 'libjpeg' 'openjpeg2' 'harfbuzz' 'openssl' + 'gumbo-parser') cd $pkgbase-${pkgver/_/}-source