[arch-commits] Commit in mupdf/repos (16 files)
Christian Hesse
eworm at archlinux.org
Tue Aug 15 08:29:07 UTC 2017
Date: Tuesday, August 15, 2017 @ 08:29:07
Author: eworm
Revision: 250716
archrelease: copy trunk to community-i686, community-x86_64
Added:
mupdf/repos/community-i686/0001-mupdf-openjpeg.patch
(from rev 250715, mupdf/trunk/0001-mupdf-openjpeg.patch)
mupdf/repos/community-i686/PKGBUILD
(from rev 250715, mupdf/trunk/PKGBUILD)
mupdf/repos/community-i686/mupdf.desktop
(from rev 250715, mupdf/trunk/mupdf.desktop)
mupdf/repos/community-i686/mupdf.xpm
(from rev 250715, mupdf/trunk/mupdf.xpm)
mupdf/repos/community-x86_64/0001-mupdf-openjpeg.patch
(from rev 250715, mupdf/trunk/0001-mupdf-openjpeg.patch)
mupdf/repos/community-x86_64/PKGBUILD
(from rev 250715, mupdf/trunk/PKGBUILD)
mupdf/repos/community-x86_64/mupdf.desktop
(from rev 250715, mupdf/trunk/mupdf.desktop)
mupdf/repos/community-x86_64/mupdf.xpm
(from rev 250715, 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 | 70 +++++++
/PKGBUILD | 256 +++++++++++++++++++++++++++
/mupdf.desktop | 30 +++
community-i686/0001-mupdf-openjpeg.patch | 35 ---
community-i686/PKGBUILD | 128 -------------
community-i686/mupdf.desktop | 15 -
community-x86_64/0001-mupdf-openjpeg.patch | 35 ---
community-x86_64/PKGBUILD | 128 -------------
community-x86_64/mupdf.desktop | 15 -
9 files changed, 356 insertions(+), 356 deletions(-)
Deleted: community-i686/0001-mupdf-openjpeg.patch
===================================================================
--- community-i686/0001-mupdf-openjpeg.patch 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-i686/0001-mupdf-openjpeg.patch 2017-08-15 08:29:07 UTC (rev 250716)
@@ -1,35 +0,0 @@
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index d01de58..6ca3838 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
-
- #else /* HAVE_LURATECH */
-
-+#ifdef __cplusplus
-+extern "C"
-+{
- #define OPJ_STATIC
- #define OPJ_HAVE_INTTYPES_H
- #if !defined(_WIN32) && !defined(_WIN64)
- #define OPJ_HAVE_STDINT_H
- #endif
-+#endif
- #define USE_JPIP
-
--#include <openjpeg.h>
-+#include <openjpeg-2.1/openjpeg.h>
-
- struct fz_jpxd_s
- {
-@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
- *yresp = state.yres;
- }
-
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* HAVE_LURATECH */
-
- #else /* FZ_ENABLE_JPX */
Copied: mupdf/repos/community-i686/0001-mupdf-openjpeg.patch (from rev 250715, mupdf/trunk/0001-mupdf-openjpeg.patch)
===================================================================
--- community-i686/0001-mupdf-openjpeg.patch (rev 0)
+++ community-i686/0001-mupdf-openjpeg.patch 2017-08-15 08:29:07 UTC (rev 250716)
@@ -0,0 +1,35 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index d01de58..6ca3838 100644
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+
+ #else /* HAVE_LURATECH */
+
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #define OPJ_HAVE_INTTYPES_H
+ #if !defined(_WIN32) && !defined(_WIN64)
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+ #define USE_JPIP
+
+-#include <openjpeg.h>
++#include <openjpeg-2.2/openjpeg.h>
+
+ struct fz_jpxd_s
+ {
+@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+ *yresp = state.yres;
+ }
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* HAVE_LURATECH */
+
+ #else /* FZ_ENABLE_JPX */
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-i686/PKGBUILD 2017-08-15 08:29:07 UTC (rev 250716)
@@ -1,128 +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.11
-pkgrel=2
-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')
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
- '0001-mupdf-openjpeg.patch'
- 'mupdf.desktop'
- 'mupdf.xpm')
-sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
- '899ca42045806f69919929c2af1921868c053441648524212aa386c7f14bae4f'
- '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
-
- # this does not build with openssl 1.1.0, so disable checks
- sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
-}
-
-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 250715, mupdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-08-15 08:29:07 UTC (rev 250716)
@@ -0,0 +1,128 @@
+# $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.11
+pkgrel=3
+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' 'libxext')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
+ '0001-mupdf-openjpeg.patch'
+ 'mupdf.desktop'
+ 'mupdf.xpm')
+sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
+ '01ad0365bc7be670a7a11603cb48ef89d85d804029dcf5420aa70846fe5dce4a'
+ '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
+
+ # this does not build with openssl 1.1.0, so disable checks
+ sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
+}
+
+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' 'libxext')
+
+ 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')
+
+ 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')
+
+ 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 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-i686/mupdf.desktop 2017-08-15 08:29:07 UTC (rev 250716)
@@ -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 250715, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-i686/mupdf.desktop (rev 0)
+++ community-i686/mupdf.desktop 2017-08-15 08:29:07 UTC (rev 250716)
@@ -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 250715, mupdf/trunk/mupdf.xpm)
===================================================================
(Binary files differ)
Deleted: community-x86_64/0001-mupdf-openjpeg.patch
===================================================================
--- community-x86_64/0001-mupdf-openjpeg.patch 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-x86_64/0001-mupdf-openjpeg.patch 2017-08-15 08:29:07 UTC (rev 250716)
@@ -1,35 +0,0 @@
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index d01de58..6ca3838 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
-
- #else /* HAVE_LURATECH */
-
-+#ifdef __cplusplus
-+extern "C"
-+{
- #define OPJ_STATIC
- #define OPJ_HAVE_INTTYPES_H
- #if !defined(_WIN32) && !defined(_WIN64)
- #define OPJ_HAVE_STDINT_H
- #endif
-+#endif
- #define USE_JPIP
-
--#include <openjpeg.h>
-+#include <openjpeg-2.1/openjpeg.h>
-
- struct fz_jpxd_s
- {
-@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
- *yresp = state.yres;
- }
-
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* HAVE_LURATECH */
-
- #else /* FZ_ENABLE_JPX */
Copied: mupdf/repos/community-x86_64/0001-mupdf-openjpeg.patch (from rev 250715, mupdf/trunk/0001-mupdf-openjpeg.patch)
===================================================================
--- community-x86_64/0001-mupdf-openjpeg.patch (rev 0)
+++ community-x86_64/0001-mupdf-openjpeg.patch 2017-08-15 08:29:07 UTC (rev 250716)
@@ -0,0 +1,35 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index d01de58..6ca3838 100644
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+
+ #else /* HAVE_LURATECH */
+
++#ifdef __cplusplus
++extern "C"
++{
+ #define OPJ_STATIC
+ #define OPJ_HAVE_INTTYPES_H
+ #if !defined(_WIN32) && !defined(_WIN64)
+ #define OPJ_HAVE_STDINT_H
+ #endif
++#endif
+ #define USE_JPIP
+
+-#include <openjpeg.h>
++#include <openjpeg-2.2/openjpeg.h>
+
+ struct fz_jpxd_s
+ {
+@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+ *yresp = state.yres;
+ }
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* HAVE_LURATECH */
+
+ #else /* FZ_ENABLE_JPX */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-x86_64/PKGBUILD 2017-08-15 08:29:07 UTC (rev 250716)
@@ -1,128 +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.11
-pkgrel=2
-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')
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
- '0001-mupdf-openjpeg.patch'
- 'mupdf.desktop'
- 'mupdf.xpm')
-sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
- '899ca42045806f69919929c2af1921868c053441648524212aa386c7f14bae4f'
- '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
-
- # this does not build with openssl 1.1.0, so disable checks
- sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
-}
-
-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 250715, mupdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-08-15 08:29:07 UTC (rev 250716)
@@ -0,0 +1,128 @@
+# $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.11
+pkgrel=3
+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' 'libxext')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=("https://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz"
+ '0001-mupdf-openjpeg.patch'
+ 'mupdf.desktop'
+ 'mupdf.xpm')
+sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
+ '01ad0365bc7be670a7a11603cb48ef89d85d804029dcf5420aa70846fe5dce4a'
+ '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
+
+ # this does not build with openssl 1.1.0, so disable checks
+ sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' Makerules
+}
+
+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' 'libxext')
+
+ 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')
+
+ 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')
+
+ 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 2017-08-15 08:28:58 UTC (rev 250715)
+++ community-x86_64/mupdf.desktop 2017-08-15 08:29:07 UTC (rev 250716)
@@ -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 250715, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-x86_64/mupdf.desktop (rev 0)
+++ community-x86_64/mupdf.desktop 2017-08-15 08:29:07 UTC (rev 250716)
@@ -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 250715, mupdf/trunk/mupdf.xpm)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list