~alpine/aports

main/mupdf: upgrade to 1.14.0 v2 PROPOSED

Milan P. Stanić
Milan P. Stanić: 1
 main/mupdf: upgrade to 1.14.0

 2 files changed, 10 insertions(+), 139 deletions(-)
Milan P. Stanić
Hi Leonardo,

On Fri, 2019-05-03 at 15:13, Leonardo wrote:
Next
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/660/mbox | git am -3
Learn more about email & git

[alpine-aports] [PATCH v2] main/mupdf: upgrade to 1.14.0 Export this patch

Milan P. Stanić
remove 0001-fix-build-on-big-endian.patch
add note about linking problem of /usr/lib/libmupdf.so.0
---
 main/mupdf/0001-fix-build-on-big-endian.patch | 122 ------------------
 main/mupdf/APKBUILD                           |  27 ++--
 2 files changed, 10 insertions(+), 139 deletions(-)
 delete mode 100644 main/mupdf/0001-fix-build-on-big-endian.patch
diff --git a/main/mupdf/0001-fix-build-on-big-endian.patch b/main/mupdf/0001-fix-build-on-big-endian.patch
deleted file mode 100644
index 9502fdb570..0000000000
--- a/main/mupdf/0001-fix-build-on-big-endian.patch
@@ -1,122 +0,0 @@
From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org>
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Sun, 3 Jun 2018 17:55:46 +0200
Subject: [PATCH] fix build on big endian

0dc1153 ("Spread of context into all procedures and removal from
structures", 2017-04-26) missed a few spots that are relevant on big
endian only.

Add the missing ContextIDs in the call chain so that the build succeeds
again.

Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
----
 src/cmsmd5.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/cmsmd5.c b/src/cmsmd5.c
index 4b8f7f9..dd0925a 100644
---- a/src/cmsmd5.c
+++ b/thirdparty/lcms2/src/cmsmd5.c
@@ -29,7 +29,7 @@
 #ifdef CMS_USE_BIG_ENDIAN
 
 static
-void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
+void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs)
 {
     do {
 
@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
 }
 
 #else
-#define byteReverse(buf, len)
+#define byteReverse(ContextID, buf, len)
 #endif
 
 
@@ -172,7 +172,7 @@ cmsHANDLE  MD5alloc(cmsContext ContextID)
 
 
 static
-void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
 {
     _cmsMD5* ctx = (_cmsMD5*) Handle;
     cmsUInt32Number t;
@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
         }
 
         memmove(p, buf, t);
-        byteReverse(ctx->in, 16);
+        byteReverse(ContextID, ctx->in, 16);
 
         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
         buf += t;
@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
 
     while (len >= 64) {
         memmove(ctx->in, buf, 64);
-        byteReverse(ctx->in, 16);
+        byteReverse(ContextID, ctx->in, 16);
         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
         buf += 64;
         len -= 64;
@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
 
 // Destroy the object and return the checksum
 static
-void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
+void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID,  cmsHANDLE Handle)
 {
     _cmsMD5* ctx = (_cmsMD5*) Handle;
     cmsUInt32Number count;
@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
     if (count < 8) {
 
         memset(p, 0, count);
-        byteReverse(ctx->in, 16);
+        byteReverse(ContextID, ctx->in, 16);
         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
 
         memset(ctx->in, 0, 56);
     } else {
         memset(p, 0, count - 8);
     }
-    byteReverse(ctx->in, 14);
+    byteReverse(ContextID, ctx->in, 14);
 
     ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0];
     ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1];
 
     MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
 
-    byteReverse((cmsUInt8Number *) ctx->buf, 4);
+    byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4);
     memmove(ProfileID ->ID8, ctx->buf, 16);
 
     _cmsFree(ctx ->ContextID, ctx);
@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
     if (MD5 == NULL) goto Error;
 
     // Add all bytes
-    MD5add(MD5, Mem, BytesNeeded);
+    MD5add(ContextID,MD5, Mem, BytesNeeded);
 
     // Temp storage is no longer needed
     _cmsFree(ContextID, Mem);
@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
     memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
 
     // And store the ID
-    MD5finish(&Icc ->ProfileID,  MD5);
+    MD5finish(ContextID, &Icc ->ProfileID,  MD5);
     return TRUE;
 
 Error:
--- 
2.18.0.rc0.294.g786209a621

diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD
index 95eb7de7a3..6d05b267a4 100644
--- a/main/mupdf/APKBUILD
+++ b/main/mupdf/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Zhou <zhoumichaely@gmail.com>
# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
pkgname=mupdf
pkgver=1.13.0
pkgrel=2
pkgver=1.14.0
pkgrel=0
pkgdesc="Lightweight PDF and XPS viewer"
url="https://mupdf.com"
arch="all"
@@ -14,6 +14,8 @@ makedepends="freetype-dev
	jbig2dec-dev
	jpeg-dev
	openjpeg-dev
	readline-dev
	freeglut-dev
	zlib-dev
	libx11-dev
	libxext-dev
@@ -26,8 +28,8 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11
options="!check"
source="https://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz
	shared-lib.patch
	0001-fix-build-on-big-endian.patch
	"
# FIXME: shared linking of /usr/lib/libmupdf.so.0

# secfixes:
#   1.13-r0:
@@ -47,25 +49,17 @@ source="https://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz
builddir="$srcdir/$pkgname-$pkgver-source"
prepare() {
	default_prepare

	# freeglut and lcms2 are mupdf-specific forks:
	# https://src.fedoraproject.org/rpms/mupdf/blob/master/f/mupdf.spec#_15
	local file; for file in thirdparty/*; do
		[ "${file##*/}" != "freeglut" ] && \
		[ "${file##*/}" != "lcms2" ] && \
		[ "${file##*/}" != "mujs" ] && \
			rm -rf "$file"
	done
	rm -rf thirdparty/{curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
}

build() {
	cd "$builddir"
	make prefix=/usr build=release all extra-apps
	make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release all extra-apps
}

package() {
	cd "$builddir"
	make prefix=/usr DESTDIR="$pkgdir" install
	make USE_SYSTEM_LIBS=yes prefix=/usr DESTDIR="$pkgdir" install

	cd build/release
	local app; for app in mjsgen mujstest muraster; do
@@ -107,6 +101,5 @@ _tools() {
		"$subpkgdir"/usr/bin/
}

sha512sums="c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924  mupdf-1.13.0-source.tar.xz
8d3f22908060351e8bb171c7c8248662dd6ac3fb5c765ad0ce33f33c418f6bcfb1982ea8e97b4fefee067c675cac03f76e8b715640dfd3689e8d7738384b6536  shared-lib.patch
420057d091ac810e077ebe77c631670c4a21ad7a817ffabe9a453192b3165d86dcb52f23fa8b36e98dfea6ea895db85cb5049557de89decb94b466311c417430  0001-fix-build-on-big-endian.patch"
sha512sums="bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf  mupdf-1.14.0-source.tar.xz
a925e8c171d36caa0ed2b8ae7adccc2c2508bf6cc67fc113aec6a4afcbe4284eef15935bffe4607d0e0216170c47a262b15cea75a8f6c1ba4f3d562a1228b6ab  shared-lib.patch"
-- 
2.20.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Hi,

On 4/26/19 9:30 PM, Milan P. Stanić wrote:
View this thread in the archives