Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (4833bc34e1b39b3bb1213f14f8e529734de3367c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Finn Haedicke <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (4833bc34e1b39b3bb1213f14f8e529734de3367c)
  • Date: Tue, 10 Nov 2009 06:58:39 -0600

GIT changes to devel-texlive grimoire by Finn Haedicke
<finn_haedicke AT gmx.net>:

latex/texlive/BUILD | 1
latex/texlive/HISTORY | 5 ++--
latex/texlive/PRE_BUILD | 26 ---------------------
latex/texlive/fix_scripts.patch | 22 ------------------
latex/texlive/fix_scripts_2.patch | 29 -----------------------
latex/texlive/rename_getline.patch | 45
-------------------------------------
6 files changed, 4 insertions(+), 124 deletions(-)

New commits:
commit 4833bc34e1b39b3bb1213f14f8e529734de3367c
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>

texlive: removed old patches

commit 82cf92d515080e203f7d79bb9d917970c580a04b
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>

texlive: removed getline fixes (not needed)

commit c282990884f58bd0026d43e38eef7c7642c9ccec
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>

texlive: use appropriate flag instead of changing configure

diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index 76eefc6..5f164de 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -20,6 +20,7 @@ LIBS="-lpng" $SOURCE_DIRECTORY/configure
--prefix=${INSTALL_ROOT}/usr \
--without-luatex \
--without-graphite \
--disable-multiplatform \
+ --disable-native-texlive-build \
--without-x \
$OPTS &&
make_single &&
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 3b199bb..c66f622 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,9 +1,10 @@
2009-11-10 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: updated to 20091107, fixed source
+ * BUILD: added flag to build with external libs
* PRE_BUILD,fix_scripts_3.patch,texmf.cnd_fix.patch
- disabled old patches, new patches for install path /usr/share/texmf
+ replaced old patches for install path /usr/share/texmf
updated texmf.cnf patch
- disabled check in configure
+ removed getline fixes/patches

2009-09-28 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: conflict -> conflicts
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 121909a..a1ce13f 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -6,8 +6,6 @@ cd $SOURCE_DIRECTORY &&
#--
## these two patches fix the scripts so that it gets
## installed to FHS locations
-#patch -p0 < $SPELL_DIRECTORY/fix_scripts.patch &&
-#patch -p0 < $SPELL_DIRECTORY/fix_scripts_2.patch &&
patch -p1 < $SPELL_DIRECTORY/fix_scripts_3.patch &&
#--
#--
@@ -16,30 +14,6 @@ patch -p1 < $SPELL_DIRECTORY/fix_scripts_3.patch &&
sed "s:/usr/share:$INSTALL_ROOT/usr/share:g"
$SPELL_DIRECTORY/texmf.cnf_fix.patch | patch -p0 &&
#--
#--
-## getline rename where it's defined
-patch -p0 < $SPELL_DIRECTORY/rename_getline.patch &&
-#--
-#--
-## this has been suggested by Finn Haedicke
-sed -i '/^[^#]*\.p:/ {n; a \
- sed -i "s/getline/tex_getline/g" $@
-}' texk/web2c/Makefile.in &&
-#sed -i '/^[^#]*\.p:/ {n; a \
-# sed -i "s/getline/tex_getline/g" $@
-#}' texk/web2c/omegadir/omega.mk &&
-#--
-#--
-## cleanup all the extra getlines
-#sed -i "s/getline/tex_getline/g" texk/web2c/mpware/mpto.c &&
-sed -i "s/getline/tex_getline/g" texk/afm2pl/afm2pl.c &&
-sed -i "s/getline/tex_getline/g" texk/dvipsk/afm2tfm.c &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/newobj.h &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/newobj.c &&
-sed -i "s/getline/tex_getline/g" texk/ttf2pk/parse.c &&
-#--
-## disable checking for system libs
-sed -i '23408s/test .*;/false ;/' configure &&
-#--
## removing as much internal things as possible
rm -rf utils/{dialog,gzip,lzma,ps2eps,psutils,t1utils,texinfo,pdfopen} &&
rm -rf
libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
diff --git a/latex/texlive/fix_scripts.patch b/latex/texlive/fix_scripts.patch
deleted file mode 100644
index 041145b..0000000
--- a/latex/texlive/fix_scripts.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- texk/texlive/Makefile.in.orig 2009-08-05 18:57:18.000000000 +0200
-+++ texk/texlive/Makefile.in 2009-08-05 18:57:43.000000000 +0200
-@@ -107,15 +107,10 @@
- target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr
'[A-Z]' '[a-z]'`; \
- target=$$target; \
- rm -f $$target; \
-- case "$(scriptdir)" in \
-- */bin) d=..;; \
-- */bin/*) d=../..;; \
-- *) echo "$(scriptdir): strange directory for linked scripts" >&2;\
-- exit 1;; \
-- esac; \
-- $(SHELL) $(srcdir)/../mkinstalldirs $(prefix)/`dirname $$s`; \
-- $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s`
$(prefix)/$$s; \
-- ln -s $$d/$$s $$target; \
-+ d=../share/; \
-+ $(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/`dirname $$s`; \
-+ $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s`
$(datadir)/$$s; \
-+ ln -vs $$d/$$s $$target; \
- done
- rm -f $(scriptdir)/getnonfreefonts-sys
- ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
diff --git a/latex/texlive/fix_scripts_2.patch
b/latex/texlive/fix_scripts_2.patch
deleted file mode 100644
index 88f1d39..0000000
--- a/latex/texlive/fix_scripts_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- texk/tex4htk/Makefile.in.orig 2009-08-05 19:17:14.000000000 +0200
-+++ texk/tex4htk/Makefile.in 2009-08-05 19:18:01.000000000 +0200
-@@ -32,19 +32,19 @@
- install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-- $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht"
-- for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done
-- for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done
-+ $(INSTALL) -d "$(datadir)/texmf-dist/scripts/tex4ht"
-+ for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(datadir)/texmf-dist/scripts/tex4ht/$$p.sh"; done
-+ for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p
"$(datadir)/texmf-dist/scripts/tex4ht/$$p.pl"; done
- if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \
- d=../../texmf-dist/scripts/tex4ht; \
-- elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \
-- d=../texmf-dist/scripts/tex4ht; \
-+ elif test -d "$(bindir)/../share/texmf-dist/scripts/tex4ht"; then \
-+ d=../share/texmf-dist/scripts/tex4ht; \
- else \
- echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \
- exit 1; \
- fi; \
-- for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.sh
$(bindir)/$$p; done; \
-- for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.pl
$(bindir)/$$p; done
-+ for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -vs $$d/$$p.sh
$(bindir)/$$p; done; \
-+ for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -vs $$d/$$p.pl
$(bindir)/$$p; done
-
- uninstall-exec:
- for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
diff --git a/latex/texlive/rename_getline.patch
b/latex/texlive/rename_getline.patch
deleted file mode 100644
index fb7cd9b..0000000
--- a/latex/texlive/rename_getline.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- texk/web2c/tangleboot.p.orig 2009-08-06 13:53:53.000000000 +0200
-+++ texk/web2c/tangleboot.p 2009-08-06 13:54:25.000000000 +0200
-@@ -577,7 +577,7 @@
- if not inputln(webfile)then begin begin writeln(stdout);
- write(stdout,'! WEB file ended during a change');error;end;
- inputhasended:=true;goto 10;end;if linesdontmatch then n:=n+1;end;
--10:end;{:132}{135:}procedure getline;label 20;
-+10:end;{:132}{135:}procedure tex_getline;label 20;
- begin 20:if changing then{137:}begin line:=line+1;
- if not inputln(changefile)then begin begin writeln(stdout);
- write(stdout,'! Change file ended without @z');error;end;buffer[0]:=64;
-@@ -604,13 +604,13 @@
- 60:controlcode:=135;61:controlcode:=2;92:controlcode:=3;
- others:controlcode:=0 end;end;{:139}{140:}function skipahead:eightbits;
- label 30;var c:eightbits;
--begin while true do begin if loc>limit then begin getline;
-+begin while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin c:=136;goto 30;end;end;buffer[limit+1]:=64;
- while buffer[loc]<>64 do loc:=loc+1;if loc<=limit then begin loc:=loc+2;
- c:=controlcode(buffer[loc-1]);if(c<>0)or(buffer[loc-1]=62)then goto 30;
- end;end;30:skipahead:=c;end;{:140}{141:}procedure skipcomment;label 10;
- var bal:eightbits;c:ASCIIcode;begin bal:=0;
--while true do begin if loc>limit then begin getline;
-+while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin begin writeln(stdout);
- write(stdout,'! Input ended in mid-comment');error;end;goto 10;end;end;
- c:=buffer[loc];loc:=loc+1;{142:}if c=64 then begin c:=buffer[loc];
-@@ -622,7 +622,7 @@
- then bal:=bal+1 else if c=125 then begin if bal=0 then goto 10;
- bal:=bal-1;end{:142};end;10:end;{:141}{145:}function getnext:eightbits;
- label 20,30,31;var c:eightbits;d:eightbits;j,k:0..longestname;
--begin 20:if loc>limit then begin getline;
-+begin 20:if loc>limit then begin tex_getline;
- if inputhasended then begin c:=136;goto 31;end;end;c:=buffer[loc];
- loc:=loc+1;
- if scanninghex then{146:}if((c>=48)and(c<=57))or((c>=65)and(c<=70))then
-@@ -647,7 +647,7 @@
- 64:{150:}begin c:=controlcode(buffer[loc]);loc:=loc+1;
- if c=0 then goto 20 else if c=13 then scanninghex:=true else if c=135
- then{151:}begin{153:}k:=0;
--while true do begin if loc>limit then begin getline;
-+while true do begin if loc>limit then begin tex_getline;
- if inputhasended then begin begin writeln(stdout);
- write(stdout,'! Input ended in section name');error;end;goto 30;end;end;
- d:=buffer[loc];{154:}if d=64 then begin d:=buffer[loc+1];



  • [SM-Commit] GIT changes to devel-texlive grimoire by Finn Haedicke (4833bc34e1b39b3bb1213f14f8e529734de3367c), Finn Haedicke, 11/10/2009

Archive powered by MHonArc 2.6.24.

Top of Page