[arch-commits] Commit in mupdf/repos (16 files)

Christian Hesse eworm at archlinux.org
Thu Dec 1 10:50:47 UTC 2016


    Date: Thursday, December 1, 2016 @ 10:50:46
  Author: eworm
Revision: 197595

archrelease: copy trunk to community-i686, community-x86_64

Added:
  mupdf/repos/community-i686/0001-mupdf-openjpeg.patch
    (from rev 197594, mupdf/trunk/0001-mupdf-openjpeg.patch)
  mupdf/repos/community-i686/PKGBUILD
    (from rev 197594, mupdf/trunk/PKGBUILD)
  mupdf/repos/community-i686/mupdf.desktop
    (from rev 197594, mupdf/trunk/mupdf.desktop)
  mupdf/repos/community-i686/mupdf.xpm
    (from rev 197594, mupdf/trunk/mupdf.xpm)
  mupdf/repos/community-x86_64/0001-mupdf-openjpeg.patch
    (from rev 197594, mupdf/trunk/0001-mupdf-openjpeg.patch)
  mupdf/repos/community-x86_64/PKGBUILD
    (from rev 197594, mupdf/trunk/PKGBUILD)
  mupdf/repos/community-x86_64/mupdf.desktop
    (from rev 197594, mupdf/trunk/mupdf.desktop)
  mupdf/repos/community-x86_64/mupdf.xpm
    (from rev 197594, mupdf/trunk/mupdf.xpm)
Deleted:
  mupdf/repos/community-i686/0001-mupdf-openjpeg.patch
  mupdf/repos/community-i686/PKGBUILD
  mupdf/repos/community-i686/mupdf.desktop
  mupdf/repos/community-i686/mupdf.xpm
  mupdf/repos/community-x86_64/0001-mupdf-openjpeg.patch
  mupdf/repos/community-x86_64/PKGBUILD
  mupdf/repos/community-x86_64/mupdf.desktop
  mupdf/repos/community-x86_64/mupdf.xpm

--------------------------------------------+
 /0001-mupdf-openjpeg.patch                 |   62 ++++++
 /PKGBUILD                                  |  250 +++++++++++++++++++++++++++
 /mupdf.desktop                             |   30 +++
 community-i686/0001-mupdf-openjpeg.patch   |   31 ---
 community-i686/PKGBUILD                    |  125 -------------
 community-i686/mupdf.desktop               |   15 -
 community-x86_64/0001-mupdf-openjpeg.patch |   31 ---
 community-x86_64/PKGBUILD                  |  125 -------------
 community-x86_64/mupdf.desktop             |   15 -
 9 files changed, 342 insertions(+), 342 deletions(-)

Deleted: community-i686/0001-mupdf-openjpeg.patch
===================================================================
--- community-i686/0001-mupdf-openjpeg.patch	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-i686/0001-mupdf-openjpeg.patch	2016-12-01 10:50:46 UTC (rev 197595)
@@ -1,31 +0,0 @@
---- a/source/fitz/load-jpx.c                                                                                                                                                                                        
-+++ b/source/fitz/load-jpx.c
-@@ -484,13 +484,18 @@
- /* Without the definition of OPJ_STATIC, compilation fails on windows
-  * due to the use of __stdcall. We believe it is required on some
-  * linux toolchains too. */
-+
-+#ifdef __cplusplus
-+extern "C"
-+{
- #define OPJ_STATIC
- #ifndef _MSC_VER
- #define OPJ_HAVE_STDINT_H
- #endif
-+#endif
- 
--#include <openjpeg.h>
--
-+#include <openjpeg-2.1/openjpeg.h>
-+    
- /* OpenJPEG does not provide a safe mechanism to intercept
-  * allocations. In the latest version all allocations go
-  * though opj_malloc etc, but no context is passed around.
-@@ -972,3 +977,7 @@
- }
- 
- #endif /* HAVE_LURATECH */
-+
-+#ifdef __cplusplus                                                                                                                                                                                                 
-+}                                                                                                                                                                                                                  
-+#endif

Copied: mupdf/repos/community-i686/0001-mupdf-openjpeg.patch (from rev 197594, mupdf/trunk/0001-mupdf-openjpeg.patch)
===================================================================
--- community-i686/0001-mupdf-openjpeg.patch	                        (rev 0)
+++ community-i686/0001-mupdf-openjpeg.patch	2016-12-01 10:50:46 UTC (rev 197595)
@@ -0,0 +1,31 @@
+--- a/source/fitz/load-jpx.c                                                                                                                                                                                        
++++ b/source/fitz/load-jpx.c
+@@ -484,13 +484,18 @@
+ /* Without the definition of OPJ_STATIC, compilation fails on windows
+  * due to the use of __stdcall. We believe it is required on some
+  * linux toolchains too. */
++
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+ 
+-#include <openjpeg.h>
+-
++#include <openjpeg-2.1/openjpeg.h>
++    
+ /* OpenJPEG does not provide a safe mechanism to intercept
+  * allocations. In the latest version all allocations go
+  * though opj_malloc etc, but no context is passed around.
+@@ -972,3 +977,7 @@
+ }
+ 
+ #endif /* HAVE_LURATECH */
++
++#ifdef __cplusplus                                                                                                                                                                                                 
++}                                                                                                                                                                                                                  
++#endif

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-i686/PKGBUILD	2016-12-01 10:50:46 UTC (rev 197595)
@@ -1,125 +0,0 @@
-# $Id$
-# 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.10
-pkgrel=1
-pkgdesc='Lightweight PDF and XPS viewer'
-arch=('i686' 'x86_64')
-url='http://mupdf.com'
-license=('AGPL3')
-makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
-             'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
-        '0001-mupdf-openjpeg.patch'
-        'mupdf.desktop'
-        'mupdf.xpm')
-sha256sums=('1185637A93055CDAE8335DB14FEF3E0FBD2ACADAE94EABD2EC0111D89A04A667'
-            'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
-            '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
-            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
-
-prepare() {
-  cd $pkgbase-${pkgver/_/}-source
-
-  # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
-
-  # fix function for openjpeg 2.1.x
-  patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"
-
-  # fix includes for jbig2dec
-  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
-}
-
-build() {
-  CFLAGS+=' -fPIC'
-  CXXFLAGS+=' -fPIC'
-  export CFLAGS CXXFLAGS
-
-  HAVE_GLFW='yes'
-  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
-  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
-  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
-
-  cd $pkgbase-${pkgver/_/}-source
-  make build=release
-}
-
-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=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mupdf-x11-curl "$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')
-  depends=('desktop-file-utils' 'freetype2' 'glfw' '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'
-         'openssl' 'openjpeg2' 'harfbuzz')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
-  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
-
-  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-i686/PKGBUILD (from rev 197594, mupdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-12-01 10:50:46 UTC (rev 197595)
@@ -0,0 +1,125 @@
+# $Id$
+# 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.10_a
+pkgrel=1
+pkgdesc='Lightweight PDF and XPS viewer'
+arch=('i686' 'x86_64')
+url='http://mupdf.com'
+license=('AGPL3')
+makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
+             'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
+        '0001-mupdf-openjpeg.patch'
+        'mupdf.desktop'
+        'mupdf.xpm')
+sha256sums=('aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836'
+            'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
+            '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
+            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
+
+prepare() {
+  cd $pkgbase-${pkgver/_/}-source
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
+  # fix function for openjpeg 2.1.x
+  patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"
+
+  # fix includes for jbig2dec
+  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
+}
+
+build() {
+  CFLAGS+=' -fPIC'
+  CXXFLAGS+=' -fPIC'
+  export CFLAGS CXXFLAGS
+
+  HAVE_GLFW='yes'
+  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
+  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
+  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
+
+  cd $pkgbase-${pkgver/_/}-source
+  make build=release
+}
+
+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=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+           'libjpeg' 'openjpeg2' 'openssl')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-x11-curl "$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')
+  depends=('desktop-file-utils' 'freetype2' 'glfw' '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'
+         'openssl' 'openjpeg2' 'harfbuzz')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
+  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
+
+  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: community-i686/mupdf.desktop
===================================================================
--- community-i686/mupdf.desktop	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-i686/mupdf.desktop	2016-12-01 10:50:46 UTC (rev 197595)
@@ -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/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-i686/mupdf.desktop (from rev 197594, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-i686/mupdf.desktop	                        (rev 0)
+++ community-i686/mupdf.desktop	2016-12-01 10:50:46 UTC (rev 197595)
@@ -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/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: community-i686/mupdf.xpm
===================================================================
(Binary files differ)

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

Deleted: community-x86_64/0001-mupdf-openjpeg.patch
===================================================================
--- community-x86_64/0001-mupdf-openjpeg.patch	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-x86_64/0001-mupdf-openjpeg.patch	2016-12-01 10:50:46 UTC (rev 197595)
@@ -1,31 +0,0 @@
---- a/source/fitz/load-jpx.c                                                                                                                                                                                        
-+++ b/source/fitz/load-jpx.c
-@@ -484,13 +484,18 @@
- /* Without the definition of OPJ_STATIC, compilation fails on windows
-  * due to the use of __stdcall. We believe it is required on some
-  * linux toolchains too. */
-+
-+#ifdef __cplusplus
-+extern "C"
-+{
- #define OPJ_STATIC
- #ifndef _MSC_VER
- #define OPJ_HAVE_STDINT_H
- #endif
-+#endif
- 
--#include <openjpeg.h>
--
-+#include <openjpeg-2.1/openjpeg.h>
-+    
- /* OpenJPEG does not provide a safe mechanism to intercept
-  * allocations. In the latest version all allocations go
-  * though opj_malloc etc, but no context is passed around.
-@@ -972,3 +977,7 @@
- }
- 
- #endif /* HAVE_LURATECH */
-+
-+#ifdef __cplusplus                                                                                                                                                                                                 
-+}                                                                                                                                                                                                                  
-+#endif

Copied: mupdf/repos/community-x86_64/0001-mupdf-openjpeg.patch (from rev 197594, mupdf/trunk/0001-mupdf-openjpeg.patch)
===================================================================
--- community-x86_64/0001-mupdf-openjpeg.patch	                        (rev 0)
+++ community-x86_64/0001-mupdf-openjpeg.patch	2016-12-01 10:50:46 UTC (rev 197595)
@@ -0,0 +1,31 @@
+--- a/source/fitz/load-jpx.c                                                                                                                                                                                        
++++ b/source/fitz/load-jpx.c
+@@ -484,13 +484,18 @@
+ /* Without the definition of OPJ_STATIC, compilation fails on windows
+  * due to the use of __stdcall. We believe it is required on some
+  * linux toolchains too. */
++
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+ 
+-#include <openjpeg.h>
+-
++#include <openjpeg-2.1/openjpeg.h>
++    
+ /* OpenJPEG does not provide a safe mechanism to intercept
+  * allocations. In the latest version all allocations go
+  * though opj_malloc etc, but no context is passed around.
+@@ -972,3 +977,7 @@
+ }
+ 
+ #endif /* HAVE_LURATECH */
++
++#ifdef __cplusplus                                                                                                                                                                                                 
++}                                                                                                                                                                                                                  
++#endif

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-x86_64/PKGBUILD	2016-12-01 10:50:46 UTC (rev 197595)
@@ -1,125 +0,0 @@
-# $Id$
-# 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.10
-pkgrel=1
-pkgdesc='Lightweight PDF and XPS viewer'
-arch=('i686' 'x86_64')
-url='http://mupdf.com'
-license=('AGPL3')
-makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
-             'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
-        '0001-mupdf-openjpeg.patch'
-        'mupdf.desktop'
-        'mupdf.xpm')
-sha256sums=('1185637A93055CDAE8335DB14FEF3E0FBD2ACADAE94EABD2EC0111D89A04A667'
-            'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
-            '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
-            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
-
-prepare() {
-  cd $pkgbase-${pkgver/_/}-source
-
-  # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
-
-  # fix function for openjpeg 2.1.x
-  patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"
-
-  # fix includes for jbig2dec
-  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
-}
-
-build() {
-  CFLAGS+=' -fPIC'
-  CXXFLAGS+=' -fPIC'
-  export CFLAGS CXXFLAGS
-
-  HAVE_GLFW='yes'
-  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
-  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
-  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
-
-  cd $pkgbase-${pkgver/_/}-source
-  make build=release
-}
-
-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=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mupdf-x11-curl "$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')
-  depends=('desktop-file-utils' 'freetype2' 'glfw' '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'
-         'openssl' 'openjpeg2' 'harfbuzz')
-
-  cd $pkgbase-${pkgver/_/}-source
-
-  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
-  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
-
-  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 197594, mupdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-12-01 10:50:46 UTC (rev 197595)
@@ -0,0 +1,125 @@
+# $Id$
+# 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.10_a
+pkgrel=1
+pkgdesc='Lightweight PDF and XPS viewer'
+arch=('i686' 'x86_64')
+url='http://mupdf.com'
+license=('AGPL3')
+makedepends=('curl' 'desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz'
+             'jbig2dec' 'libjpeg' 'mesa-libgl' 'openjpeg2' 'openssl')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
+        '0001-mupdf-openjpeg.patch'
+        'mupdf.desktop'
+        'mupdf.xpm')
+sha256sums=('aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836'
+            'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
+            '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
+            'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
+
+prepare() {
+  cd $pkgbase-${pkgver/_/}-source
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
+  # fix function for openjpeg 2.1.x
+  patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"
+
+  # fix includes for jbig2dec
+  sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
+}
+
+build() {
+  CFLAGS+=' -fPIC'
+  CXXFLAGS+=' -fPIC'
+  export CFLAGS CXXFLAGS
+
+  HAVE_GLFW='yes'
+  SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
+  SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
+  export HAVE_GLFW SYS_GLFW_CFLAGS SYS_GLFW_LIBS
+
+  cd $pkgbase-${pkgver/_/}-source
+  make build=release
+}
+
+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=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
+           'libjpeg' 'openjpeg2' 'openssl')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mupdf-x11-curl "$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')
+  depends=('desktop-file-utils' 'freetype2' 'glfw' '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'
+         'openssl' 'openjpeg2' 'harfbuzz')
+
+  cd $pkgbase-${pkgver/_/}-source
+
+  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
+  install -D -m0755 build/release/mujstest "$pkgdir"/usr/bin/mujstest
+
+  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: community-x86_64/mupdf.desktop
===================================================================
--- community-x86_64/mupdf.desktop	2016-12-01 10:50:37 UTC (rev 197594)
+++ community-x86_64/mupdf.desktop	2016-12-01 10:50:46 UTC (rev 197595)
@@ -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/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 197594, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-x86_64/mupdf.desktop	                        (rev 0)
+++ community-x86_64/mupdf.desktop	2016-12-01 10:50:46 UTC (rev 197595)
@@ -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/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: community-x86_64/mupdf.xpm
===================================================================
(Binary files differ)

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



More information about the arch-commits mailing list