summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-07-26 10:56:03 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-07-26 10:56:03 +0000
commita7be3c9cf7eafa7acd36ad4607761f0d77d8d943 (patch)
tree333d7ff1db0b212cbc3c1da278af30e9288fcf13 /dev-tex
parentld with new gcc. Bug #424181 (diff)
downloadgentoo-2-a7be3c9cf7eafa7acd36ad4607761f0d77d8d943.tar.gz
gentoo-2-a7be3c9cf7eafa7acd36ad4607761f0d77d8d943.tar.bz2
gentoo-2-a7be3c9cf7eafa7acd36ad4607761f0d77d8d943.zip
Do not include empty headers. They have been removed from TeX Live 2012 kpathsea, fixes build with that version. Patch from upstream.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-tex')
-rw-r--r--dev-tex/luatex/ChangeLog7
-rw-r--r--dev-tex/luatex/files/kpathsea2012.patch28
-rw-r--r--dev-tex/luatex/luatex-0.70.1.ebuild3
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 192b84164b45..5ded69a2f9be 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-tex/luatex
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.101 2012/07/25 00:36:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.102 2012/07/26 10:56:03 aballier Exp $
+
+ 26 Jul 2012; Alexis Ballier <aballier@gentoo.org> +files/kpathsea2012.patch,
+ luatex-0.70.1.ebuild:
+ Do not include empty headers. They have been removed from TeX Live 2012
+ kpathsea, fixes build with that version. Patch from upstream.
25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> luatex-0.70.1.ebuild:
added prefix support (bug #427834)
diff --git a/dev-tex/luatex/files/kpathsea2012.patch b/dev-tex/luatex/files/kpathsea2012.patch
new file mode 100644
index 000000000000..80c356d9de80
--- /dev/null
+++ b/dev-tex/luatex/files/kpathsea2012.patch
@@ -0,0 +1,28 @@
+From TeX Live svn rev 23421.
+Remove unnecessary headers. Fixes build with kpathsea from TeX Live 2012.
+
+
+Index: source/texk/web2c/luatexdir/luatex.c
+===================================================================
+--- source/texk/web2c/luatexdir/luatex.c (revision 23420)
++++ source/texk/web2c/luatexdir/luatex.c (revision 23421)
+@@ -32,7 +32,6 @@
+ #include <kpathsea/readable.h>
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
+-#include <kpathsea/recorder.h>
+ #ifdef WIN32
+ #include <kpathsea/concatn.h>
+ #endif
+Index: source/texk/web2c/lib/texmfmp.c
+===================================================================
+--- source/texk/web2c/lib/texmfmp.c (revision 23420)
++++ source/texk/web2c/lib/texmfmp.c (revision 23421)
+@@ -17,7 +17,6 @@
+ #include <kpathsea/readable.h>
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
+-#include <kpathsea/recorder.h>
+ #ifdef WIN32
+ #include <kpathsea/concatn.h>
+ #endif
diff --git a/dev-tex/luatex/luatex-0.70.1.ebuild b/dev-tex/luatex/luatex-0.70.1.ebuild
index cb3a309c6094..6a4d9b79a572 100644
--- a/dev-tex/luatex/luatex-0.70.1.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1.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/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.14 2012/07/25 00:36:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.15 2012/07/26 10:56:03 aballier Exp $
EAPI=4
@@ -32,6 +32,7 @@ PRELIBS="libs/obsdcompat"
src_prepare() {
has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
+ epatch "${FILESDIR}/kpathsea2012.patch"
S="${S}/build-aux" elibtoolize --shallow
}