New commits:
commit 3a07b1c75940cc7b403701314383ec860600aa07
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
xdvik: make it work with system kpathsea
commit 1047c7543390fb28ba4644ae0b21d47b90b334be
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
texlive: work around moved kpathsea/c-auto.h
diff --git a/doc/xdvik/BUILD b/doc/xdvik/BUILD
index 89e9aa0..b1433b5 100755
--- a/doc/xdvik/BUILD
+++ b/doc/xdvik/BUILD
@@ -2,4 +2,5 @@ mkdir -p smgl-build &&
cd smgl-build &&
ln -sf ../configure . &&
OPTS="$XDVIK_OPTS --with-xdvi-x-toolkit=$XDVIK_KIT --with-ps=$XDVIK_PS
--disable-multiplatform $OPTS" &&
+OPTS+=" --disable-native-texlive-build" &&
default_build
diff --git a/doc/xdvik/DEPENDS b/doc/xdvik/DEPENDS
index 8d3ee0e..6363ee8 100755
--- a/doc/xdvik/DEPENDS
+++ b/doc/xdvik/DEPENDS
@@ -8,6 +8,9 @@ else
fi &&
# nothing optional about it we use system libs
depends t1lib --with-system-t1lib &&
+# Without that (rather heavy) dependency, xdvik would
+# install its own copy and conflict with texlive.
+depends texlive --with-system-kpathsea &&
if [[ ${XDVIK_PS} == gs ]]
then
depends POSTSCRIPT-INTERPRETER
diff --git a/doc/xdvik/HISTORY b/doc/xdvik/HISTORY
index 733249e..90b28dd 100644
--- a/doc/xdvik/HISTORY
+++ b/doc/xdvik/HISTORY
@@ -1,3 +1,7 @@
+2016-03-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depends texlive for system kpathsea
+ * BUILD: fixup to make the above work
+
2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, INSTALL: build in separate directory, as build aborts
otherwise
SOURCE_HASH=sha512:9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index b505c11..68fafaf 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,6 +1,8 @@
2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
* INSTALL: Use /usr/share/texmf-dist/web2c instead of
/usr/share/texmf/web2c,
as the latter is no more with current texlive-texmf.
+ Also work around wandering kpathsea/c-auto.h, which others need.
+ * DETAILS: PATCHLEVEL++
2016-02-28 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: updated spell to
20150521
diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index 38c8b52..9d60c55 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -45,4 +45,9 @@ if is_depends_enabled $SPELL LUA; then
mtxrun --generate &&
# generate fonts for luatex & context
OSFONTDIR="${INSTALL_ROOT}/usr/share/texmf-dist/fonts/;${INSTALL_ROOT}/usr/share/texmf/fonts/;${INSTALL_ROOT}/usr/local/share/texmf/fonts"
mtxrun --script fonts --reload
+fi &&
+
+# Fixup for really stupid fuckup. Newer versions should have this fixed.
Please.
+if test -e "$INSTALL_ROOT/usr/lib/kpathsea/c-auto.h"; then
+ ln -s ../../lib/kpathsea/c-auto.h
"$INSTALL_ROOT/usr/include/kpathsea/c-auto.h"
fi
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (3a07b1c75940cc7b403701314383ec860600aa07),
Thomas Orgis, 03/06/2016