[arch-commits] Commit in mupdf/trunk (0001-mupdf-openjpeg.patch PKGBUILD)

[Christian Hesse]

    Date: Tuesday, August 15, 2017 @ 08:28:58
  Author: eworm
Revision: 250715

upgpkg: mupdf 1.11-3

* clean up dependencies
* fix build with openjpeg 2.2 (FS#55145)

Modified:
  mupdf/trunk/0001-mupdf-openjpeg.patch
  mupdf/trunk/PKGBUILD

---------------------------+
 0001-mupdf-openjpeg.patch |    2 +-
 PKGBUILD                  |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: 0001-mupdf-openjpeg.patch
===================================================================
--- 0001-mupdf-openjpeg.patch	2017-08-15 08:28:23 UTC (rev 250714)
+++ 0001-mupdf-openjpeg.patch	2017-08-15 08:28:58 UTC (rev 250715)
@@ -18,7 +18,7 @@
  #define USE_JPIP
  
 -#include <openjpeg.h>
-+#include <openjpeg-2.1/openjpeg.h>
++#include <openjpeg-2.2/openjpeg.h>
  
  struct fz_jpxd_s
  {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-15 08:28:23 UTC (rev 250714)
+++ PKGBUILD	2017-08-15 08:28:58 UTC (rev 250715)
@@ -9,13 +9,13 @@
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.11
-pkgrel=2
+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')
+             '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"
@@ -23,7 +23,7 @@
         'mupdf.desktop'
         'mupdf.xpm')
 sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
-            '899ca42045806f69919929c2af1921868c053441648524212aa386c7f14bae4f'
+            '01ad0365bc7be670a7a11603cb48ef89d85d804029dcf5420aa70846fe5dce4a'
             '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
             'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -74,7 +74,7 @@
 package_mupdf() {
   pkgdesc='Lightweight PDF and XPS viewer'
   depends=('curl' 'desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl')
+           'libjpeg' 'openjpeg2' 'openssl' 'libxext')
 
   cd $pkgbase-${pkgver/_/}-source
 
@@ -94,7 +94,7 @@
   conflicts=('mupdf')
   provides=('mupdf')
   depends=('desktop-file-utils' 'freetype2' 'glfw' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl')
+           'libjpeg' 'openjpeg2')
 
   cd $pkgbase-${pkgver/_/}-source
 
@@ -113,7 +113,7 @@
   pkgdesc='Tools for Lightweight PDF and XPS viewer'
   depends=('mupdf')
   depends=('freetype2' 'jbig2dec' 'libjpeg'
-         'openssl' 'openjpeg2' 'harfbuzz')
+         'openjpeg2' 'harfbuzz')
 
   cd $pkgbase-${pkgver/_/}-source