[arch-commits] Commit in mupdf/repos/community-x86_64 (7 files)

Christian Hesse eworm at archlinux.org
Wed Oct 7 11:31:07 UTC 2020


    Date: Wednesday, October 7, 2020 @ 11:31:07
  Author: eworm
Revision: 720400

archrelease: copy trunk to community-x86_64

Added:
  mupdf/repos/community-x86_64/PKGBUILD
    (from rev 720399, mupdf/trunk/PKGBUILD)
  mupdf/repos/community-x86_64/mupdf.desktop
    (from rev 720399, mupdf/trunk/mupdf.desktop)
  mupdf/repos/community-x86_64/mupdf.xpm
    (from rev 720399, mupdf/trunk/mupdf.xpm)
Deleted:
  mupdf/repos/community-x86_64/0001-Set-noexecstack-on-linker-generated-binary-data-files.patch
  mupdf/repos/community-x86_64/PKGBUILD
  mupdf/repos/community-x86_64/mupdf.desktop
  mupdf/repos/community-x86_64/mupdf.xpm

------------------------------------------------------------------+
 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch |   24 -
 PKGBUILD                                                         |  234 ++++------
 mupdf.desktop                                                    |   30 -
 3 files changed, 130 insertions(+), 158 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:31:02 UTC (rev 720399)
+++ 0001-Set-noexecstack-on-linker-generated-binary-data-files.patch	2020-10-07 11:31:07 UTC (rev 720400)
@@ -1,24 +0,0 @@
-From: Tor Andersson <tor.andersson at 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 ---
- 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-07 11:31:02 UTC (rev 720399)
+++ PKGBUILD	2020-10-07 11:31:07 UTC (rev 720400)
@@ -1,119 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
-# Contributor: xduugu
-
-pkgbase=mupdf
-pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.17.0
-pkgrel=3
-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')
-# 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'
-            'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
-            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
-
-prepare() {
-  cd $pkgbase-${pkgver/_/}-source
-
-  # 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() {
-  CFLAGS+=' -fPIC'
-  CXXFLAGS+=' -fPIC'
-  export CFLAGS CXXFLAGS
-  
-  USE_SYSTEM_LIBS='yes'
-  export USE_SYSTEM_LIBS
-
-  cd $pkgbase-${pkgver/_/}-source
-  make build=release libs apps
-}
-
-package_libmupdf() {
-  pkgdesc='Library for Lightweight PDF and XPS viewer'
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  make build=release prefix="$pkgdir"/usr install
-
-  rm -rf "$pkgdir"/usr/{bin,share/man}
-  mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
-
-  find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
-    -type f -exec chmod 0644 {} +
-}
-
-package_mupdf() {
-  pkgdesc='Lightweight PDF and XPS viewer'
-  depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl' 'libxext')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
-
-  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
-
-  install -d "$pkgdir"/usr/share/doc/mupdf
-  install -m0644  README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
-
-  install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
-  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-}
-
-package_mupdf-gl() {
-  pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
-  conflicts=('mupdf')
-  provides=("mupdf=${pkgver}")
-  depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
-
-  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
-
-  install -d "$pkgdir"/usr/share/doc/mupdf
-  install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
-
-  install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
-  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
-}
-
-package_mupdf-tools() {
-  pkgdesc='Tools for Lightweight PDF and XPS viewer'
-  depends=('mupdf')
-  depends=('freetype2' 'jbig2dec' 'libjpeg'
-         'openjpeg2' 'harfbuzz' 'openssl')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
-  install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
-
-  install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1
-
-  install -d "$pkgdir"/usr/share/doc/mupdf-tools
-  install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf-tools
-}
-

Copied: mupdf/repos/community-x86_64/PKGBUILD (from rev 720399, mupdf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-07 11:31:07 UTC (rev 720400)
@@ -0,0 +1,115 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Pierre-Paul Paquin <pierrepaulpaquin at gmail.com>
+# Contributor: xduugu
+
+pkgbase=mupdf
+pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
+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'
+             'gumbo-parser')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz"
+        'mupdf.desktop'
+        'mupdf.xpm')
+sha256sums=('592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a'
+            'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
+            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
+
+prepare() {
+  cd $pkgbase-${pkgver/_/}-source
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+}
+
+build() {
+  CFLAGS+=' -fPIC'
+  CXXFLAGS+=' -fPIC'
+  export CFLAGS CXXFLAGS
+  
+  USE_SYSTEM_LIBS='yes'
+  export USE_SYSTEM_LIBS
+
+  cd $pkgbase-${pkgver/_/}-source
+  make build=release libs apps
+}
+
+package_libmupdf() {
+  pkgdesc='Library for Lightweight PDF and XPS viewer'
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  make build=release prefix="$pkgdir"/usr install
+
+  rm -rf "$pkgdir"/usr/{bin,share/man}
+  mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
+
+  find "$pkgdir"/usr/include "$pkgdir"/usr/share "$pkgdir"/usr/lib \
+    -type f -exec chmod 0644 {} +
+}
+
+package_mupdf() {
+  pkgdesc='Lightweight PDF and XPS viewer'
+  depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+           'libjpeg' 'openjpeg2' 'openssl' 'libxext' 'gumbo-parser')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
+
+  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+  install -d "$pkgdir"/usr/share/doc/mupdf
+  install -m0644  README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+  install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-gl() {
+  pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
+  conflicts=('mupdf')
+  provides=("mupdf=${pkgver}")
+  depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
+           'libjpeg' 'openjpeg2' 'openssl' 'gumbo-parser')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
+
+  install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
+
+  install -d "$pkgdir"/usr/share/doc/mupdf
+  install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf
+
+  install -D -m0644 ../mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+  install -D -m0644 ../mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+}
+
+package_mupdf-tools() {
+  pkgdesc='Tools for Lightweight PDF and XPS viewer'
+  depends=('mupdf')
+  depends=('freetype2' 'jbig2dec' 'libjpeg' 'openjpeg2' 'harfbuzz' 'openssl'
+           'gumbo-parser')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
+  install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
+
+  install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1
+
+  install -d "$pkgdir"/usr/share/doc/mupdf-tools
+  install -m0644 README COPYING CHANGES "$pkgdir"/usr/share/doc/mupdf-tools
+}
+

Deleted: mupdf.desktop
===================================================================
--- mupdf.desktop	2020-10-07 11:31:02 UTC (rev 720399)
+++ mupdf.desktop	2020-10-07 11:31:07 UTC (rev 720400)
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=MuPDF
-GenericName=PDF file viewer
-Exec=mupdf %f
-TryExec=mupdf
-Icon=mupdf
-Terminal=false
-Type=Application
-MimeType=application/epub+zip;application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-Categories=Viewer;Graphics;
-Actions=View
-NoDisplay=true
-[Desktop Action View]
-Name=View with mupdf
-Exec=mupdf %f

Copied: mupdf/repos/community-x86_64/mupdf.desktop (from rev 720399, mupdf/trunk/mupdf.desktop)
===================================================================
--- mupdf.desktop	                        (rev 0)
+++ mupdf.desktop	2020-10-07 11:31:07 UTC (rev 720400)
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=MuPDF
+GenericName=PDF file viewer
+Exec=mupdf %f
+TryExec=mupdf
+Icon=mupdf
+Terminal=false
+Type=Application
+MimeType=application/epub+zip;application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
+Categories=Viewer;Graphics;
+Actions=View
+NoDisplay=true
+[Desktop Action View]
+Name=View with mupdf
+Exec=mupdf %f

Deleted: mupdf.xpm
===================================================================
(Binary files differ)

Copied: mupdf/repos/community-x86_64/mupdf.xpm (from rev 720399, mupdf/trunk/mupdf.xpm)
===================================================================
(Binary files differ)


More information about the arch-commits mailing list