diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-11-28 07:33:09 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-11-28 07:33:09 +0000 |
| commit | c62974d342e5dcbd5becbd1f7ed72354794c2887 (patch) | |
| tree | aa2defa3c98644c31d373ee62c068983a93672c2 /app-text | |
| parent | Add to crypto herd. (diff) | |
| download | gentoo-2-c62974d342e5dcbd5becbd1f7ed72354794c2887.tar.gz gentoo-2-c62974d342e5dcbd5becbd1f7ed72354794c2887.tar.bz2 gentoo-2-c62974d342e5dcbd5becbd1f7ed72354794c2887.zip | |
Fix live build
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/mupdf/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/mupdf/files/mupdf-9999-buildsystem.patch | 24 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-9999.ebuild | 4 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog index 0ab17e2bc075..035e72f0f50e 100644 --- a/app-text/mupdf/ChangeLog +++ b/app-text/mupdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.52 2012/11/27 13:17:23 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.53 2012/11/28 07:33:08 xmw Exp $ + + 28 Nov 2012; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild, + +files/mupdf-9999-buildsystem.patch: + Fix live build 27 Nov 2012; Michael Weber <xmw@gentoo.org> mupdf-1.1.ebuild: Fix ar invocation (bug 444926, thanks Agostino Sarubbo) diff --git a/app-text/mupdf/files/mupdf-9999-buildsystem.patch b/app-text/mupdf/files/mupdf-9999-buildsystem.patch new file mode 100644 index 000000000000..d15187486105 --- /dev/null +++ b/app-text/mupdf/files/mupdf-9999-buildsystem.patch @@ -0,0 +1,24 @@ +--- mupdf-1.0-source/Makerules ++++ mupdf-1.0-source/Makerules +@@ -6,7 +6,7 @@ + CFLAGS += -Wall + + ifeq "$(build)" "debug" +-CFLAGS += -pipe -g -DDEBUG ++CFLAGS += -DDEBUG + else ifeq "$(build)" "profile" + CFLAGS += -pipe -O2 -DNDEBUG -pg + LDFLAGS += -pg +@@ -21,9 +21,9 @@ + endif + + ifeq "$(OS)" "Linux" +-SYS_FREETYPE_INC := `pkg-config --cflags freetype2` +-SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg` +-X11_LIBS := -lX11 -lXext ++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2) ++SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg) ++X11_LIBS := $(shell pkg-config --libs x11 xext) + endif + + ifeq "$(OS)" "FreeBSD" diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild index 82642ace58cb..19b3a0e61d23 100644 --- a/app-text/mupdf/mupdf-9999.ebuild +++ b/app-text/mupdf/mupdf-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.22 2012/08/09 06:25:45 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.23 2012/11/28 07:33:08 xmw Exp $ EAPI=4 @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch + epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch if ! use vanilla ; then epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch |