summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-text/mupdf/ChangeLog6
-rw-r--r--app-text/mupdf/files/mupdf-9999-sys_curl.patch11
-rw-r--r--app-text/mupdf/mupdf-9999.ebuild6
3 files changed, 20 insertions, 3 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 93cc331e332c..0f78b2948a93 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/mupdf
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.82 2013/07/17 15:53:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.83 2013/07/20 10:29:40 xmw Exp $
+
+ 20 Jul 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-sys_curl.patch,
+ mupdf-9999.ebuild:
+ Add curl dependency and fix build system.
17 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
mupdf-1.2.ebuild:
diff --git a/app-text/mupdf/files/mupdf-9999-sys_curl.patch b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
new file mode 100644
index 000000000000..8a392a1691d4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
@@ -0,0 +1,11 @@
+--- mupdf-9999/Makerules.orig 2013-07-20 12:17:11.137748315 +0200
++++ mupdf-9999/Makerules 2013-07-20 12:19:23.320095808 +0200
+@@ -63,6 +63,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)
+
+ endif
+
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 8d5f0552889f..eef955a290a4 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.38 2013/06/21 19:13:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.39 2013/07/20 10:29:40 xmw Exp $
EAPI=5
@@ -20,6 +20,7 @@ LIB_DEPEND="dev-libs/openssl[static-libs?]
media-libs/freetype:2[static-libs?]
media-libs/jbig2dec[static-libs?]
media-libs/openjpeg:2[static-libs?]
+ net-misc/curl[static-libs?]
virtual/jpeg[static-libs?]
X? ( x11-libs/libX11[static-libs?]
x11-libs/libXext[static-libs?] )"
@@ -39,7 +40,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-CFLAGS.patch \
"${FILESDIR}"/${P}-openjpeg2.patch \
- "${FILESDIR}"/${P}-pkg-config.patch
+ "${FILESDIR}"/${P}-pkg-config.patch \
+ "${FILESDIR}"/${P}-sys_curl.patch
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-e "/^prefix=/s:=.*:=${EROOR}/usr:" \