aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-11-22 16:40:04 +0000
committerMilan P. Stanić <mps@arvanta.net>2020-11-26 08:28:38 +0000
commit7b103955397c2da1bccc58797e04303f3ba7a3ad (patch)
tree90acef46d85d434f2859e5b9cdf7f03c14068921
parentbd157aeae229a579dcc2a00b02775070e3e2423c (diff)
downloadaports-7b103955397c2da1bccc58797e04303f3ba7a3ad.tar.gz
aports-7b103955397c2da1bccc58797e04303f3ba7a3ad.tar.bz2
aports-7b103955397c2da1bccc58797e04303f3ba7a3ad.tar.xz
community/mupdf: upgrade to 1.18.0
remove fix-big-endian.patch, doesn't apply and probably not needed anymore fix shared-lib.patch to upgraded Makefile add USE_SYSTEM_GUMBO=no to make to use internal gumbo libs
-rw-r--r--community/mupdf/APKBUILD15
-rw-r--r--community/mupdf/fix-big-endian.patch104
-rw-r--r--community/mupdf/shared-lib.patch20
3 files changed, 16 insertions, 123 deletions
diff --git a/community/mupdf/APKBUILD b/community/mupdf/APKBUILD
index a8c7c22f97..6477a7d861 100644
--- a/community/mupdf/APKBUILD
+++ b/community/mupdf/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Zhou <zhoumichaely@gmail.com>
# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
pkgname=mupdf
-pkgver=1.17.0
-pkgrel=3
+pkgver=1.18.0
+pkgrel=0
pkgdesc="Lightweight PDF and XPS viewer"
url="https://mupdf.com"
arch="all"
@@ -21,14 +21,14 @@ makedepends="freetype-dev
libxrandr-dev
libxi-dev
mesa-dev
- glu-dev"
+ glu-dev
+ "
subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11
$pkgname-gl:_gl $pkgname-tools:_tools"
options="!check"
source="https://mupdf.com/downloads/archive/mupdf-$pkgver-source.tar.xz
shared-lib.patch
- fix-big-endian.patch
https://github.com/ArtifexSoftware/mupdf/commit/32e4e8b4bcbacbf92af7c.patch
https://github.com/ArtifexSoftware/mupdf/commit/b82e9b6d6b46877e5c376.patch
"
@@ -64,7 +64,7 @@ prepare() {
}
build() {
- make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release libs apps
+ make USE_SYSTEM_LIBS=yes USE_SYSTEM_GUMBO=no prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release libs apps
}
package() {
@@ -108,8 +108,7 @@ _tools() {
"$subpkgdir"/usr/bin/
}
-sha512sums="39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5 mupdf-1.17.0-source.tar.xz
-212ea566b6f1d60a1087054a8eb29d0d9ca08eef237219151fc4fe8880461cd86fcb03b0266a7347015af458b557dfd914e827f5ff8fee78e9e50c7f358fc8e0 shared-lib.patch
-486d09df319050ddb33dbd1e2e0638a7bc6a3e188032a35b81119c45b0de911629b827b21aa47cde6669b66d73fb22cff54d190a8449151fdc27eace71beefbd fix-big-endian.patch
+sha512sums="7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8 mupdf-1.18.0-source.tar.xz
+a87c52da91b0fe14c952dc1f83f4492cf1d31d135fc66bc6fb5dcce622af8c740248e10392d7cdba7409373b81e24744aafd46dc1fe5fdfcc54c77555e27420c shared-lib.patch
1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11 32e4e8b4bcbacbf92af7c.patch
91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c b82e9b6d6b46877e5c376.patch"
diff --git a/community/mupdf/fix-big-endian.patch b/community/mupdf/fix-big-endian.patch
deleted file mode 100644
index c1931626bd..0000000000
--- a/community/mupdf/fix-big-endian.patch
+++ /dev/null
@@ -1,104 +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/thirdparty/lcms2/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;
-@@ -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);
---
-2.18.0.rc0.294.g786209a621
-
diff --git a/community/mupdf/shared-lib.patch b/community/mupdf/shared-lib.patch
index ff6dd324cd..3a5e952a5f 100644
--- a/community/mupdf/shared-lib.patch
+++ b/community/mupdf/shared-lib.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index 814a592..07c71ca 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@ include Makethird
+--- a/Makefile 2020-11-22 16:06:50.382848861 +0000
++++ b/Makefile 2020-11-22 16:11:49.044201863 +0000
+@@ -24,7 +24,7 @@
# Do not specify CFLAGS or LIBS on the make invocation line - specify
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
# set a variable that was set on the command line.
@@ -11,15 +9,15 @@ index 814a592..07c71ca 100644
LIBS += $(XLIBS) -lm
ifneq ($(threading),no)
-@@ -58,6 +58,7 @@ ifdef RANLIB
+@@ -62,6 +62,7 @@
RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
endif
LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS)
TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p
WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
- OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
-@@ -68,6 +69,9 @@ $(OUT)/%.a :
+ OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
+@@ -72,6 +73,9 @@
$(AR_CMD)
$(RANLIB_CMD)
@@ -29,10 +27,10 @@ index 814a592..07c71ca 100644
$(OUT)/%.exe: %.c
$(LINK_CMD)
-@@ -189,8 +193,8 @@ generate: source/pdf/js/util.js.h
-
- # --- Library ---
+@@ -214,8 +218,8 @@
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
+ else
-MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdf-third.a
+MUPDF_LIB = $(OUT)/libmupdf.so.0