diff options
author | Milan P. Stanić <mps@arvanta.net> | 2019-05-08 17:18:45 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-08 16:07:03 +0000 |
commit | 5616885c5e67ed09846062b0ba064473615fc366 (patch) | |
tree | e813cd655acfec28e7005877061eac9d40610a72 | |
parent | b906b1b532c74b775fe9ae1c46c5c5e000a7f117 (diff) | |
download | alpine_aports-5616885c5e67ed09846062b0ba064473615fc366.tar.bz2 alpine_aports-5616885c5e67ed09846062b0ba064473615fc366.tar.xz alpine_aports-5616885c5e67ed09846062b0ba064473615fc366.zip |
main/mupdf: upgrade to 1.15.0
mjsgen and mujstest are removed upstream, so removed here
refactor patches for new version
-rw-r--r-- | main/mupdf/APKBUILD | 18 | ||||
-rw-r--r-- | main/mupdf/fix-big-endian.patch | 18 | ||||
-rw-r--r-- | main/mupdf/shared-lib.patch | 2 |
3 files changed, 10 insertions, 28 deletions
diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD index 419a952743..8a574bd8c0 100644 --- a/main/mupdf/APKBUILD +++ b/main/mupdf/APKBUILD | |||
@@ -2,8 +2,8 @@ | |||
2 | # Contributor: Michael Zhou <zhoumichaely@gmail.com> | 2 | # Contributor: Michael Zhou <zhoumichaely@gmail.com> |
3 | # Maintainer: Daniel Sabogal <dsabogalcc@gmail.com> | 3 | # Maintainer: Daniel Sabogal <dsabogalcc@gmail.com> |
4 | pkgname=mupdf | 4 | pkgname=mupdf |
5 | pkgver=1.14.0 | 5 | pkgver=1.15.0 |
6 | pkgrel=1 | 6 | pkgrel=0 |
7 | pkgdesc="Lightweight PDF and XPS viewer" | 7 | pkgdesc="Lightweight PDF and XPS viewer" |
8 | url="https://mupdf.com" | 8 | url="https://mupdf.com" |
9 | arch="all" | 9 | arch="all" |
@@ -23,6 +23,7 @@ makedepends="freetype-dev | |||
23 | libxi-dev | 23 | libxi-dev |
24 | mesa-dev | 24 | mesa-dev |
25 | glu-dev" | 25 | glu-dev" |
26 | |||
26 | subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11 | 27 | subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11 |
27 | $pkgname-gl:_gl $pkgname-tools:_tools" | 28 | $pkgname-gl:_gl $pkgname-tools:_tools" |
28 | options="!check" | 29 | options="!check" |
@@ -30,6 +31,7 @@ source="https://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz | |||
30 | shared-lib.patch | 31 | shared-lib.patch |
31 | fix-big-endian.patch | 32 | fix-big-endian.patch |
32 | " | 33 | " |
34 | |||
33 | # FIXME: shared linking of /usr/lib/libmupdf.so.0 | 35 | # FIXME: shared linking of /usr/lib/libmupdf.so.0 |
34 | 36 | ||
35 | # secfixes: | 37 | # secfixes: |
@@ -55,7 +57,7 @@ prepare() { | |||
55 | 57 | ||
56 | build() { | 58 | build() { |
57 | cd "$builddir" | 59 | cd "$builddir" |
58 | make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release all extra-apps | 60 | make USE_SYSTEM_LIBS=yes prefix=/usr CURL_LIBS='-lcurl -lpthread' build=release libs apps |
59 | } | 61 | } |
60 | 62 | ||
61 | package() { | 63 | package() { |
@@ -63,7 +65,7 @@ package() { | |||
63 | make USE_SYSTEM_LIBS=yes prefix=/usr DESTDIR="$pkgdir" install | 65 | make USE_SYSTEM_LIBS=yes prefix=/usr DESTDIR="$pkgdir" install |
64 | 66 | ||
65 | cd build/release | 67 | cd build/release |
66 | local app; for app in mjsgen mujstest muraster; do | 68 | local app; for app in muraster; do |
67 | install -Dm755 $app "$pkgdir"/usr/bin/$app | 69 | install -Dm755 $app "$pkgdir"/usr/bin/$app |
68 | done | 70 | done |
69 | 71 | ||
@@ -96,12 +98,10 @@ _tools() { | |||
96 | 98 | ||
97 | mkdir -p "$subpkgdir"/usr/bin | 99 | mkdir -p "$subpkgdir"/usr/bin |
98 | mv "$pkgdir"/usr/bin/mutool \ | 100 | mv "$pkgdir"/usr/bin/mutool \ |
99 | "$pkgdir"/usr/bin/mjsgen \ | ||
100 | "$pkgdir"/usr/bin/mujstest \ | ||
101 | "$pkgdir"/usr/bin/muraster \ | 101 | "$pkgdir"/usr/bin/muraster \ |
102 | "$subpkgdir"/usr/bin/ | 102 | "$subpkgdir"/usr/bin/ |
103 | } | 103 | } |
104 | 104 | ||
105 | sha512sums="bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf mupdf-1.14.0-source.tar.xz | 105 | sha512sums="ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd mupdf-1.15.0-source.tar.xz |
106 | 886371860d5fd35001b436051173f4cf991656d5920bbc60c032d98f45539d20c23ed5ff358bf968f578e16b21fced09349ac5cb6c7a738946430ded3fb644fa shared-lib.patch | 106 | 5f1448005c2126c16f9e05a77486d63991110d343a4094e92d6877b11babb30b2a4c3a07580658e1e6caa805a53caf31595309c9f5203ed0a269e4d9e38af3d1 shared-lib.patch |
107 | 9b38fcaad43a3369f660c7fcce71ffe83da19c92589edd1e20787f8f4a1767f88be49fd7c30027e9d2e75df0eb10834cac924385a32408d7f6444adbed537d3f fix-big-endian.patch" | 107 | 486d09df319050ddb33dbd1e2e0638a7bc6a3e188032a35b81119c45b0de911629b827b21aa47cde6669b66d73fb22cff54d190a8449151fdc27eace71beefbd fix-big-endian.patch" |
diff --git a/main/mupdf/fix-big-endian.patch b/main/mupdf/fix-big-endian.patch index a363beaf3e..c1931626bd 100644 --- a/main/mupdf/fix-big-endian.patch +++ b/main/mupdf/fix-big-endian.patch | |||
@@ -65,15 +65,6 @@ index 4b8f7f9..dd0925a 100644 | |||
65 | MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); | 65 | MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); |
66 | buf += 64; | 66 | buf += 64; |
67 | len -= 64; | 67 | len -= 64; |
68 | @@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) | ||
69 | |||
70 | // Destroy the object and return the checksum | ||
71 | static | ||
72 | -void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) | ||
73 | +void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle) | ||
74 | { | ||
75 | _cmsMD5* ctx = (_cmsMD5*) Handle; | ||
76 | cmsUInt32Number count; | ||
77 | @@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) | 68 | @@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) |
78 | if (count < 8) { | 69 | if (count < 8) { |
79 | 70 | ||
@@ -108,15 +99,6 @@ index 4b8f7f9..dd0925a 100644 | |||
108 | 99 | ||
109 | // Temp storage is no longer needed | 100 | // Temp storage is no longer needed |
110 | _cmsFree(ContextID, Mem); | 101 | _cmsFree(ContextID, Mem); |
111 | @@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) | ||
112 | memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); | ||
113 | |||
114 | // And store the ID | ||
115 | - MD5finish(&Icc ->ProfileID, MD5); | ||
116 | + MD5finish(ContextID, &Icc ->ProfileID, MD5); | ||
117 | return TRUE; | ||
118 | |||
119 | Error: | ||
120 | -- | 102 | -- |
121 | 2.18.0.rc0.294.g786209a621 | 103 | 2.18.0.rc0.294.g786209a621 |
122 | 104 | ||
diff --git a/main/mupdf/shared-lib.patch b/main/mupdf/shared-lib.patch index 436b334ff3..3b758a3f37 100644 --- a/main/mupdf/shared-lib.patch +++ b/main/mupdf/shared-lib.patch | |||
@@ -14,7 +14,7 @@ | |||
14 | endif | 14 | endif |
15 | LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) | 15 | LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
16 | +LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS) | 16 | +LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS) |
17 | TAGS_CMD = $(QUIET_TAGS) ctags $^ | 17 | TAGS_CMD = $(QUIET_TAGS) ctags -R |
18 | WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@ | 18 | WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@ |
19 | OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $< | 19 | OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $< |
20 | @@ -68,6 +69,9 @@ | 20 | @@ -68,6 +69,9 @@ |