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

Christian Hesse eworm at archlinux.org
Wed Apr 27 13:38:22 UTC 2016


    Date: Wednesday, April 27, 2016 @ 15:38:22
  Author: eworm
Revision: 172043

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

Added:
  mupdf/repos/community-i686/PKGBUILD
    (from rev 172042, mupdf/trunk/PKGBUILD)
  mupdf/repos/community-i686/mupdf-1.5-openjpeg-2.1.0.patch
    (from rev 172042, mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch)
  mupdf/repos/community-i686/mupdf.desktop
    (from rev 172042, mupdf/trunk/mupdf.desktop)
  mupdf/repos/community-i686/mupdf.xpm
    (from rev 172042, mupdf/trunk/mupdf.xpm)
  mupdf/repos/community-x86_64/PKGBUILD
    (from rev 172042, mupdf/trunk/PKGBUILD)
  mupdf/repos/community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch
    (from rev 172042, mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch)
  mupdf/repos/community-x86_64/mupdf.desktop
    (from rev 172042, mupdf/trunk/mupdf.desktop)
  mupdf/repos/community-x86_64/mupdf.xpm
    (from rev 172042, mupdf/trunk/mupdf.xpm)
Deleted:
  mupdf/repos/community-i686/PKGBUILD
  mupdf/repos/community-i686/mupdf-1.5-openjpeg-2.1.0.patch
  mupdf/repos/community-i686/mupdf.desktop
  mupdf/repos/community-i686/mupdf.install
  mupdf/repos/community-i686/mupdf.xpm
  mupdf/repos/community-x86_64/PKGBUILD
  mupdf/repos/community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch
  mupdf/repos/community-x86_64/mupdf.desktop
  mupdf/repos/community-x86_64/mupdf.install
  mupdf/repos/community-x86_64/mupdf.xpm

-------------------------------------------------+
 /PKGBUILD                                       |  246 ++++++++++++++++++++++
 /mupdf-1.5-openjpeg-2.1.0.patch                 |   26 ++
 /mupdf.desktop                                  |   30 ++
 community-i686/PKGBUILD                         |  124 -----------
 community-i686/mupdf-1.5-openjpeg-2.1.0.patch   |   13 -
 community-i686/mupdf.desktop                    |   15 -
 community-i686/mupdf.install                    |   12 -
 community-x86_64/PKGBUILD                       |  124 -----------
 community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch |   13 -
 community-x86_64/mupdf.desktop                  |   15 -
 community-x86_64/mupdf.install                  |   12 -
 11 files changed, 302 insertions(+), 328 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-i686/PKGBUILD	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,124 +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.9_a
-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' 'openssl')
-install=mupdf.install
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
-        mupdf-1.5-openjpeg-2.1.0.patch
-        mupdf.desktop
-	mupdf.xpm)
-md5sums=('658b90788a57d858dcb069cf326e11c3'
-         '8e71587ad9b86e10c9144618ab43149b'
-         '39b54f82a763aac54e352315a0ee9037'
-         'f3f35e7320bafde331250de1c99186a1')
-
-prepare() {
-  cd $pkgbase-${pkgver/_/}-source
-
-  # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
-
-  patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
-
-  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 172042, mupdf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-04-27 13:38:22 UTC (rev 172043)
@@ -0,0 +1,123 @@
+# $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.9_a
+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' 'openssl')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
+        mupdf-1.5-openjpeg-2.1.0.patch
+        mupdf.desktop
+	mupdf.xpm)
+md5sums=('658b90788a57d858dcb069cf326e11c3'
+         '8e71587ad9b86e10c9144618ab43149b'
+         '39b54f82a763aac54e352315a0ee9037'
+         'f3f35e7320bafde331250de1c99186a1')
+
+prepare() {
+  cd $pkgbase-${pkgver/_/}-source
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
+  patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
+
+  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-1.5-openjpeg-2.1.0.patch
===================================================================
--- community-i686/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-i686/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,13 +0,0 @@
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index dd7bf9e..b7c8680 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
--	opj_stream_set_user_data(stream, &sb);
-+	opj_stream_set_user_data(stream, &sb, NULL);
- 	/* Set the length to avoid an assert */
- 	opj_stream_set_user_data_length(stream, size);
- 

Copied: mupdf/repos/community-i686/mupdf-1.5-openjpeg-2.1.0.patch (from rev 172042, mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch)
===================================================================
--- community-i686/mupdf-1.5-openjpeg-2.1.0.patch	                        (rev 0)
+++ community-i686/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:22 UTC (rev 172043)
@@ -0,0 +1,13 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index dd7bf9e..b7c8680 100644
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
+ 	opj_stream_set_read_function(stream, fz_opj_stream_read);
+ 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-	opj_stream_set_user_data(stream, &sb);
++	opj_stream_set_user_data(stream, &sb, NULL);
+ 	/* Set the length to avoid an assert */
+ 	opj_stream_set_user_data_length(stream, size);
+ 

Deleted: community-i686/mupdf.desktop
===================================================================
--- community-i686/mupdf.desktop	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-i686/mupdf.desktop	2016-04-27 13:38:22 UTC (rev 172043)
@@ -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 172042, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-i686/mupdf.desktop	                        (rev 0)
+++ community-i686/mupdf.desktop	2016-04-27 13:38:22 UTC (rev 172043)
@@ -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.install
===================================================================
--- community-i686/mupdf.install	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-i686/mupdf.install	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-

Deleted: community-i686/mupdf.xpm
===================================================================
(Binary files differ)

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

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-x86_64/PKGBUILD	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,124 +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.9_a
-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' 'openssl')
-install=mupdf.install
-# we need static libs for zathura-pdf-mupdf
-options=('staticlibs')
-source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
-        mupdf-1.5-openjpeg-2.1.0.patch
-        mupdf.desktop
-	mupdf.xpm)
-md5sums=('658b90788a57d858dcb069cf326e11c3'
-         '8e71587ad9b86e10c9144618ab43149b'
-         '39b54f82a763aac54e352315a0ee9037'
-         'f3f35e7320bafde331250de1c99186a1')
-
-prepare() {
-  cd $pkgbase-${pkgver/_/}-source
-
-  # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
-
-  patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
-
-  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 172042, mupdf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-04-27 13:38:22 UTC (rev 172043)
@@ -0,0 +1,123 @@
+# $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.9_a
+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' 'openssl')
+# we need static libs for zathura-pdf-mupdf
+options=('staticlibs')
+source=(http://mupdf.com/downloads/mupdf-${pkgver/_/}-source.tar.gz
+        mupdf-1.5-openjpeg-2.1.0.patch
+        mupdf.desktop
+	mupdf.xpm)
+md5sums=('658b90788a57d858dcb069cf326e11c3'
+         '8e71587ad9b86e10c9144618ab43149b'
+         '39b54f82a763aac54e352315a0ee9037'
+         'f3f35e7320bafde331250de1c99186a1')
+
+prepare() {
+  cd $pkgbase-${pkgver/_/}-source
+
+  # remove bundled packages, we want our system libraries
+  rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+
+  patch -p1 -i ../mupdf-1.5-openjpeg-2.1.0.patch
+
+  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-1.5-openjpeg-2.1.0.patch
===================================================================
--- community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,13 +0,0 @@
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index dd7bf9e..b7c8680 100644
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
--	opj_stream_set_user_data(stream, &sb);
-+	opj_stream_set_user_data(stream, &sb, NULL);
- 	/* Set the length to avoid an assert */
- 	opj_stream_set_user_data_length(stream, size);
- 

Copied: mupdf/repos/community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch (from rev 172042, mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch)
===================================================================
--- community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch	                        (rev 0)
+++ community-x86_64/mupdf-1.5-openjpeg-2.1.0.patch	2016-04-27 13:38:22 UTC (rev 172043)
@@ -0,0 +1,13 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index dd7bf9e..b7c8680 100644
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
+ 	opj_stream_set_read_function(stream, fz_opj_stream_read);
+ 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-	opj_stream_set_user_data(stream, &sb);
++	opj_stream_set_user_data(stream, &sb, NULL);
+ 	/* Set the length to avoid an assert */
+ 	opj_stream_set_user_data_length(stream, size);
+ 

Deleted: community-x86_64/mupdf.desktop
===================================================================
--- community-x86_64/mupdf.desktop	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-x86_64/mupdf.desktop	2016-04-27 13:38:22 UTC (rev 172043)
@@ -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 172042, mupdf/trunk/mupdf.desktop)
===================================================================
--- community-x86_64/mupdf.desktop	                        (rev 0)
+++ community-x86_64/mupdf.desktop	2016-04-27 13:38:22 UTC (rev 172043)
@@ -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.install
===================================================================
--- community-x86_64/mupdf.install	2016-04-27 13:38:16 UTC (rev 172042)
+++ community-x86_64/mupdf.install	2016-04-27 13:38:22 UTC (rev 172043)
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-

Deleted: community-x86_64/mupdf.xpm
===================================================================
(Binary files differ)

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



More information about the arch-commits mailing list