Skip to content
Snippets Groups Projects
Commit 5616885c authored by Milan P. Stanić's avatar Milan P. Stanić Committed by Natanael Copa
Browse files

main/mupdf: upgrade to 1.15.0

mjsgen and mujstest are removed upstream, so removed here
refactor patches for new version
parent b906b1b5
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,8 @@
# Contributor: Michael Zhou <zhoumichaely@gmail.com>
# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
pkgname=mupdf
pkgver=1.14.0
pkgrel=1
pkgver=1.15.0
pkgrel=0
pkgdesc="Lightweight PDF and XPS viewer"
url="https://mupdf.com"
arch="all"
......@@ -23,6 +23,7 @@ makedepends="freetype-dev
libxi-dev
mesa-dev
glu-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11
$pkgname-gl:_gl $pkgname-tools:_tools"
options="!check"
......@@ -30,6 +31,7 @@ source="https://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz
shared-lib.patch
fix-big-endian.patch
"
# FIXME: shared linking of /usr/lib/libmupdf.so.0
# secfixes:
......@@ -55,7 +57,7 @@ prepare() {
build() {
cd "$builddir"
make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release all extra-apps
make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release libs apps
}
package() {
......@@ -63,7 +65,7 @@ package() {
make USE_SYSTEM_LIBS=yes prefix=/usr DESTDIR="$pkgdir" install
cd build/release
local app; for app in mjsgen mujstest muraster; do
local app; for app in muraster; do
install -Dm755 $app "$pkgdir"/usr/bin/$app
done
......@@ -96,12 +98,10 @@ _tools() {
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/mutool \
"$pkgdir"/usr/bin/mjsgen \
"$pkgdir"/usr/bin/mujstest \
"$pkgdir"/usr/bin/muraster \
"$subpkgdir"/usr/bin/
}
sha512sums="bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf mupdf-1.14.0-source.tar.xz
886371860d5fd35001b436051173f4cf991656d5920bbc60c032d98f45539d20c23ed5ff358bf968f578e16b21fced09349ac5cb6c7a738946430ded3fb644fa shared-lib.patch
9b38fcaad43a3369f660c7fcce71ffe83da19c92589edd1e20787f8f4a1767f88be49fd7c30027e9d2e75df0eb10834cac924385a32408d7f6444adbed537d3f fix-big-endian.patch"
sha512sums="ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd mupdf-1.15.0-source.tar.xz
5f1448005c2126c16f9e05a77486d63991110d343a4094e92d6877b11babb30b2a4c3a07580658e1e6caa805a53caf31595309c9f5203ed0a269e4d9e38af3d1 shared-lib.patch
486d09df319050ddb33dbd1e2e0638a7bc6a3e188032a35b81119c45b0de911629b827b21aa47cde6669b66d73fb22cff54d190a8449151fdc27eace71beefbd fix-big-endian.patch"
......@@ -65,15 +65,6 @@ index 4b8f7f9..dd0925a 100644
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) {
......@@ -108,15 +99,6 @@ index 4b8f7f9..dd0925a 100644
// 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
......@@ -14,7 +14,7 @@
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 $^
TAGS_CMD = $(QUIET_TAGS) ctags -R
WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
@@ -68,6 +69,9 @@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment