diff options
| author | Juergen Daubert <jue@jue.li> | 2013-08-16 11:22:48 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2013-08-16 11:22:48 +0200 |
| commit | 9ca25e5df2041e093d683a034f851e4eb759f8e5 (patch) | |
| tree | aecd1f7789339507591509ad0237f41fb3b17d8a | |
| parent | 4b684ae67a00e9b6c9cee57054740e337e1ead9b (diff) | |
| download | opt-9ca25e5df2041e093d683a034f851e4eb759f8e5.tar.gz opt-9ca25e5df2041e093d683a034f851e4eb759f8e5.tar.xz | |
mupdf: update to 1.3
| -rw-r--r-- | mupdf/.footprint | 4 | ||||
| -rw-r--r-- | mupdf/.md5sum | 3 | ||||
| -rw-r--r-- | mupdf/Pkgfile | 19 | ||||
| -rw-r--r-- | mupdf/mupdf-sys_curl.patch | 27 |
4 files changed, 44 insertions, 9 deletions
diff --git a/mupdf/.footprint b/mupdf/.footprint index 13aad5ec2..7b72b22b1 100644 --- a/mupdf/.footprint +++ b/mupdf/.footprint @@ -1,7 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mudraw --rwxr-xr-x root/root usr/bin/mupdf +lrwxrwxrwx root/root usr/bin/mupdf -> mupdf-x11-curl +-rwxr-xr-x root/root usr/bin/mupdf-x11 +-rwxr-xr-x root/root usr/bin/mupdf-x11-curl -rwxr-xr-x root/root usr/bin/mutool drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ diff --git a/mupdf/.md5sum b/mupdf/.md5sum index 0c3cb9535..4c8d669af 100644 --- a/mupdf/.md5sum +++ b/mupdf/.md5sum @@ -1 +1,2 @@ -230e7d679f54c91edd1ebe54f6f8bc15 mupdf-1.2-source.zip +fe53c2a56ebd7759f5f965bc4ff66359 mupdf-1.3-source.tar.gz +9a173e6f0067130b77f4daa658087c31 mupdf-sys_curl.patch diff --git a/mupdf/Pkgfile b/mupdf/Pkgfile index 804aa5c26..67d022086 100644 --- a/mupdf/Pkgfile +++ b/mupdf/Pkgfile @@ -1,18 +1,23 @@ # Description: Lightweight PDF and XPS viewer # URL: http://www.mupdf.com/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: freetype libjpeg xorg-libxext +# Depends on: curl freetype libjpeg xorg-libxext name=mupdf -version=1.2 +version=1.3 release=1 -source=(http://mupdf.googlecode.com/files/$name-$version-source.zip) +source=(https://mupdf.googlecode.com/files/$name-$version-source.tar.gz + $name-sys_curl.patch) build() { cd $name-$version-source - rm -r thirdparty/{freetype*,jpeg*,zlib*} - sed -i 's/MUBUSY/MUTOOL/' Makefile - make build=release + + patch -p1 -i $SRC/$name-sys_curl.patch + + rm -r thirdparty/{freetype*,jpeg*,zlib,curl} + make build=release make prefix=$PKG/usr mandir=$PKG/usr/man install - rm -r $PKG/usr/{include,lib} + + ln -s mupdf-x11-curl $PKG/usr/bin/mupdf + rm -r $PKG/usr/{include,lib,share} } diff --git a/mupdf/mupdf-sys_curl.patch b/mupdf/mupdf-sys_curl.patch new file mode 100644 index 000000000..495a9d37c --- /dev/null +++ b/mupdf/mupdf-sys_curl.patch @@ -0,0 +1,27 @@ +diff -Nru mupdf-1.3-source.orig/Makerules mupdf-1.3-source/Makerules +--- mupdf-1.3-source.orig/Makerules 2013-08-16 11:07:13.627597342 +0200 ++++ mupdf-1.3-source/Makerules 2013-08-16 11:09:31.525988042 +0200 +@@ -67,6 +67,8 @@ + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz ++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) ++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread + + endif + +diff -Nru mupdf-1.3-source.orig/Makethird mupdf-1.3-source/Makethird +--- mupdf-1.3-source.orig/Makethird 2013-08-16 11:07:13.730926974 +0200 ++++ mupdf-1.3-source/Makethird 2013-08-16 11:09:04.700283008 +0200 +@@ -443,6 +443,10 @@ + + CURL_CFLAGS := -I$(CURL_DIR)/include + CURL_LIBS := $(SYS_CURL_DEPS) ++ + else +-NOCURL := yes ++ ++CURL_CFLAGS := $(SYS_CURL_CFLAGS) ++CURL_LIBS := $(SYS_CURL_LIBS) ++ + endif |