[arch-commits] Commit in mupdf/trunk (PKGBUILD)

[Christian Hesse]

    Date: Thursday, October 4, 2018 @ 16:43:07
  Author: eworm
Revision: 389557

upgpkg: mupdf 1.14.0-1

new upstream release

Modified:
  mupdf/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-04 16:43:01 UTC (rev 389556)
+++ PKGBUILD	2018-10-04 16:43:07 UTC (rev 389557)
@@ -7,7 +7,7 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.13.0
+pkgver=1.14.0
 pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('x86_64')
@@ -17,10 +17,10 @@
              '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.xz"
+source=("https://mupdf.com/downloads/archive/mupdf-${pkgver/_/}-source.tar.xz"
         'mupdf.desktop'
         'mupdf.xpm')
-sha256sums=('746698e0d5cd113bdcb8f65d096772029edea8cf20704f0d15c96cb5449a4904'
+sha256sums=('603e69a96b04cdf9b19a3e41bd7b20c63b39abdcfba81a7460fcdcc205f856df'
             'ccff66979249bd4ab4ba8918660f194eb90eb0ae231b16e36a6cecdcf471883f'
             'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -27,14 +27,11 @@
 prepare() {
   cd $pkgbase-${pkgver/_/}-source
 
+  # fix linking curl
+  sed -i '/SYS_CURL_LIBS/s|$| -lpthread|' Makethird
+
   # remove bundled packages, we want our system libraries
-  rm -rf thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,lcms2,libjpeg,openjpeg,zlib}
-
-  # 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
+  rm -rf thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
 }
 
 build() {
@@ -41,6 +38,9 @@
   CFLAGS+=' -fPIC'
   CXXFLAGS+=' -fPIC'
   export CFLAGS CXXFLAGS
+  
+  USE_SYSTEM_LIBS='yes'
+  export USE_SYSTEM_LIBS
 
   cd $pkgbase-${pkgver/_/}-source
   make build=release libs apps extra
@@ -83,7 +83,7 @@
   conflicts=('mupdf')
   provides=("mupdf=${pkgver}")
   depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2')
+           'libjpeg' 'openjpeg2' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source
 
@@ -102,7 +102,7 @@
   pkgdesc='Tools for Lightweight PDF and XPS viewer'
   depends=('mupdf')
   depends=('freetype2' 'jbig2dec' 'libjpeg'
-         'openjpeg2' 'harfbuzz')
+         'openjpeg2' 'harfbuzz' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source