update patch, use mupdf-gl (it's the future)

3 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c96dcca53d..e6b75cdb9e05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mupdf-git
-	pkgdesc = Lightweight PDF, XPS and CBZ viewer
-	pkgver = 20170912.b69387ac
+	pkgdesc = Lightweight PDF, XPS, and E-book viewer
+	pkgver = 20171025.ec07e537
 	pkgrel = 1
 	url = http://mupdf.com/
 	arch = i686
@@ -8,13 +8,11 @@ pkgbase = mupdf-git
 	arch = armv7h
 	license = AGPL3
 	makedepends = git
-	depends = curl
-	depends = freetype2
+	depends = glfw
+	depends = harfbuzz
 	depends = jbig2dec
 	depends = libjpeg-turbo
-	depends = libxext
 	depends = openjpeg2
-	depends = lcms2
 	provides = mupdf
 	conflicts = mupdf
 	source = git://git.ghostscript.com/mupdf.git
@@ -23,7 +21,7 @@ pkgbase = mupdf-git
 	source = desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = b24af44a9f88bcbe1fb649a8055817cfc6908e523b95417779726526a88041f9
+	sha256sums = df0d070fe988c5b1f610d21a90d3028f03c73829c026510b2789d7c1f285fbf5
 	sha256sums = 3240d4ebda002cb2c4f42cd42793c6160f1701d349d0acb797819dfd10d4fedd
 
 pkgname = mupdf-git
diff --git a/PKGBUILD b/PKGBUILD
index 78664d0d9da6..5683374fa511 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,21 @@
 
 pkgname=mupdf-git
 _pkgname=mupdf
-pkgver=20170912.b69387ac
+pkgver=20171025.ec07e537
 pkgrel=1
-pkgdesc='Lightweight PDF, XPS and CBZ viewer'
+pkgdesc='Lightweight PDF, XPS, and E-book viewer'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://mupdf.com/'
 license=('AGPL3')
 makedepends=('git')
-depends=('curl' 'freetype2' 'jbig2dec' 'libjpeg-turbo' 'libxext' 'openjpeg2' 'lcms2')
+depends=('glfw' 'harfbuzz' 'jbig2dec' 'libjpeg-turbo' 'openjpeg2')
 source=('git://git.ghostscript.com/mupdf.git'
         'git://git.ghostscript.com/mujs.git'
         'cmm_ctx_gone.patch'
         'desktop')
 sha256sums=('SKIP'
             'SKIP'
-            'b24af44a9f88bcbe1fb649a8055817cfc6908e523b95417779726526a88041f9'
+            'df0d070fe988c5b1f610d21a90d3028f03c73829c026510b2789d7c1f285fbf5'
             '3240d4ebda002cb2c4f42cd42793c6160f1701d349d0acb797819dfd10d4fedd')
 
 conflicts=("${_pkgname}")
@@ -49,6 +49,10 @@ prepare() {
 build() {
 	cd "${srcdir}/${_pkgname}"
 
+	export HAVE_GLFW='yes'
+	export SYS_GLFW_CFLAGS="$(pkg-config --cflags glfw3)"
+	export SYS_GLFW_LIBS="$(pkg-config --libs glfw3) -lGL"
+
 	make release XCFLAGS="$CFLAGS -fPIC" XLIBS="$LDFLAGS"
 }
 
@@ -56,8 +60,8 @@ package() {
 	cd "${srcdir}/${_pkgname}"
 
 	make install DESTDIR="${pkgdir}" prefix=/usr
-	mv "${pkgdir}"/usr/bin/mupdf-x11-curl "${pkgdir}"/usr/bin/mupdf
-	rm "${pkgdir}"/usr/bin/mupdf-x11
+	mv "${pkgdir}"/usr/bin/mupdf{-gl,}
+	rm "${pkgdir}"/usr/bin/mupdf-x11*
 
 	install -Dm644 ../desktop "${pkgdir}"/usr/share/applications/mupdf.desktop
 	find "${pkgdir}"/usr/share -type f -exec chmod 0644 {} +
diff --git a/cmm_ctx_gone.patch b/cmm_ctx_gone.patch
index 55ce3c56dc77..e49cbc18df76 100644
--- a/cmm_ctx_gone.patch
+++ b/cmm_ctx_gone.patch
@@ -1,6 +1,6 @@
-diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c
---- old/source/fitz/color-lcms.c	2017-07-21 13:15:33.210544762 -1000
-+++ new/source/fitz/color-lcms.c	2017-07-21 13:18:23.943567031 -1000
+diff -Naur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c
+--- old/source/fitz/color-lcms.c	2017-10-25 22:19:28.890575079 -1000
++++ new/source/fitz/color-lcms.c	2017-10-25 22:21:22.919919617 -1000
 @@ -66,7 +66,7 @@
  static int
  fz_lcms_num_devcomps(cmsContext cmm_ctx, fz_iccprofile *profile)
@@ -60,7 +60,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c
  		lcms_src_cs = 0;
 -	src_num_chan = cmsChannelsOf(cmm_ctx, src_cs);
 +	src_num_chan = cmsChannelsOf(src_cs);
- 	src_data_type = (COLORSPACE_SH(lcms_src_cs) | CHANNELS_SH(src_num_chan) | DOSWAP_SH(src->bgr) | BYTES_SH(num_bytes) | EXTRA_SH(src_extras));
+ 	src_data_type = (COLORSPACE_SH(lcms_src_cs) | CHANNELS_SH(src_num_chan) | DOSWAP_SH(src->bgr) | SWAPFIRST_SH(src->bgr && (src_extras != 0)) | BYTES_SH(num_bytes) | EXTRA_SH(src_extras));
  
  	/* dst */
 -	des_cs = cmsGetColorSpace(cmm_ctx, dst->cmm_handle);
@@ -71,7 +71,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c
  		lcms_des_cs = 0;
 -	des_num_chan = cmsChannelsOf(cmm_ctx, des_cs);
 +	des_num_chan = cmsChannelsOf(des_cs);
- 	des_data_type = (COLORSPACE_SH(lcms_des_cs) | CHANNELS_SH(des_num_chan) | DOSWAP_SH(dst->bgr) | BYTES_SH(num_bytes) | EXTRA_SH(dst_extras));
+ 	des_data_type = (COLORSPACE_SH(lcms_des_cs) | CHANNELS_SH(des_num_chan) | DOSWAP_SH(dst->bgr) | SWAPFIRST_SH(dst->bgr && (dst_extras != 0)) | BYTES_SH(num_bytes) | EXTRA_SH(dst_extras));
  
  	/* flags */
 @@ -254,17 +254,17 @@