Date: Saturday, August 31, 2013 @ 11:24:47 Author: bpiotrowski Revision: 96532
upgpkg: mupdf 1.3-4 - switch back to shared libraries (except for openjpeg) - make use of CURL_LIBS when shared curl is used - change headers and documentation permissions to 0644 Thank to Leonid Isaev for all the fish and his detailed bug report. (FS#36696) Added: mupdf/trunk/mupdf-1.3-system-libcurl.patch Modified: mupdf/trunk/PKGBUILD --------------------------------+ PKGBUILD | 20 +++++++++++++++----- mupdf-1.3-system-libcurl.patch | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-31 09:00:41 UTC (rev 96531) +++ PKGBUILD 2013-08-31 09:24:47 UTC (rev 96532) @@ -7,16 +7,24 @@ pkgname=mupdf pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') url='http://mupdf.com' license=('GPL3') -depends=('desktop-file-utils' 'libxext' 'openssl') +depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl') install=mupdf.install -source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz) -sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478') +source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz + mupdf-1.3-system-libcurl.patch) +sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478' + '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42') +prepare() { + cd $pkgname-$pkgver-source + rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec} + patch -Np1 -i ../mupdf-1.3-system-libcurl.patch +} + build() { CFLAGS+=' -fPIC' CXXFLAGS+=' -fPIC' @@ -40,5 +48,7 @@ install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - chmod 644 "$pkgdir"/usr/lib/libmupdf{,-js-none}.a + find "$pkgdir"/usr/include \ + "$pkgdir"/usr/share \ + "$pkgdir"/usr/lib -type f | xargs chmod -v 0644 } Added: mupdf-1.3-system-libcurl.patch =================================================================== --- mupdf-1.3-system-libcurl.patch (rev 0) +++ mupdf-1.3-system-libcurl.patch 2013-08-31 09:24:47 UTC (rev 96532) @@ -0,0 +1,21 @@ +--- a/Makerules 2013-08-27 14:35:11.243520354 +0000 ++++ b/Makerules 2013-08-27 15:40:22.583629510 +0000 +@@ -67,6 +67,8 @@ + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz ++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl ++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) + + endif + +--- a/Makethird 2013-08-27 15:41:18.043354692 +0000 ++++ b/Makethird 2013-08-27 15:42:41.332916192 +0000 +@@ -444,5 +444,6 @@ + CURL_CFLAGS := -I$(CURL_DIR)/include + CURL_LIBS := $(SYS_CURL_DEPS) + else +-NOCURL := yes ++CURL_CFLAGS := $(SYS_CURL_CFLAGS) ++CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS) + endif