summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD19
2 files changed, 12 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb595cca11ef..76e44580868f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = mupdf-git
pkgdesc = Lightweight PDF, XPS and CBZ viewer
- pkgver = 20160630.5da66a0
+ pkgver = 20160709.67af3ff
pkgrel = 1
url = http://mupdf.com/
arch = i686
arch = x86_64
arch = armv7h
- license = GPL3
+ license = AGPL3
makedepends = git
depends = curl
depends = freetype2
@@ -15,7 +15,6 @@ pkgbase = mupdf-git
depends = libxext
provides = mupdf
conflicts = mupdf
- options = staticlibs
source = git://git.ghostscript.com/mupdf.git
source = desktop
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6dead0db9988..a83563a9f51a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
pkgname=mupdf-git
_pkgname=mupdf
-pkgver=20160630.5da66a0
+pkgver=20160709.67af3ff
pkgrel=1
pkgdesc='Lightweight PDF, XPS and CBZ viewer'
arch=('i686' 'x86_64' 'armv7h')
url='http://mupdf.com/'
-license=('GPL3')
+license=('AGPL3')
makedepends=('git')
depends=('curl' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext')
source=('git://git.ghostscript.com/mupdf.git'
@@ -19,7 +19,6 @@ sha1sums=('SKIP'
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-options=('staticlibs')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -32,18 +31,17 @@ prepare() {
git submodule update --init thirdparty/mujs
git submodule update --init thirdparty/openjpeg
- # needed for zathura-pdf-mupdf
- CFLAGS+=' -fPIC'
- CXXFLAGS+=' -fPIC'
-
# fix memento.h confusion
sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird
+
+ # embedding a CJK font into each binary is madness...
+ sed '/TOFU_CJK /c #define TOFU_CJK 1/' -i include/mupdf/fitz/config.h
}
build() {
cd "${srcdir}/${_pkgname}"
- make release XCFLAGS="$CPPFLAGS $CFLAGS" XLIBS="$LDFLAGS"
+ make release XCFLAGS="$CFLAGS -fPIC" XLIBS="$LDFLAGS"
}
package() {
@@ -54,5 +52,8 @@ package() {
rm "${pkgdir}"/usr/bin/mupdf-x11
install -Dm644 ../desktop "${pkgdir}"/usr/share/applications/mupdf.desktop
- find "${pkgdir}"/usr/{include,lib,share} -type f | xargs chmod 644
+ find "${pkgdir}"/usr/share -type f -exec chmod 0644 {} +
+
+ # prevent the static-linking madness from spreading...
+ rm -fr "${pkgdir}"/usr/{include,lib}
}