r559 - in x86/branches/utf8: . etc etc/X11/app-defaults packages packages/Terminal packages/XML-Parser packages/exo packages/vte

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Aug 9 02:05:11 PDT 2005


Author: alexander
Date: 2005-08-09 03:05:09 -0600 (Tue, 09 Aug 2005)
New Revision: 559

Added:
   x86/branches/utf8/packages/Terminal/
   x86/branches/utf8/packages/Terminal/Makefile
   x86/branches/utf8/packages/Terminal/terminalrc
   x86/branches/utf8/packages/XML-Parser/
   x86/branches/utf8/packages/XML-Parser/Makefile
   x86/branches/utf8/packages/exo/
   x86/branches/utf8/packages/exo/Makefile
   x86/branches/utf8/packages/vte/
   x86/branches/utf8/packages/vte/Makefile
Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/etc/X11/app-defaults/XTerm
   x86/branches/utf8/etc/profile
   x86/branches/utf8/etc/vimrc
Log:
Disabled the use of Xft in xterm. Made xterm background black.
Adjusted vimrc in order to account for this.
Added Terminal, made it the default terminal emulator in XFCE.


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/Makefile	2005-08-09 09:05:09 UTC (rev 559)
@@ -183,7 +183,7 @@
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype ch-fontconfig ch-Xorg ch-freefont ch-inputattach \
 	ch-fonts-dejavu ch-update-fontsdir ch-libjpeg ch-libtiff ch-openssh ch-pkgconfig ch-glib2 \
 	ch-libungif ch-imlib2 ch-imlib ch-boehm-gc ch-w3m ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
+	ch-startup-notification ch-gvim ch-xfce ch-vte ch-exo ch-XML-Parser ch-Terminal ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd \
 	ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin \
 	ch-mdadm ch-eject ch-byacc ch-ed ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux ch-nALFS-profile \
@@ -774,6 +774,22 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+vte: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+exo: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+XML-Parser: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+Terminal: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 lua: prep-chroot
 	make -C $(PKG)/$@ chroot
 	make unmount
@@ -1379,6 +1395,18 @@
 ch-xfce: popdev
 	make -C $(PKG)/xfce stage2
 
+ch-vte: popdev
+	make -C $(PKG)/vte stage2
+
+ch-exo: popdev
+	make -C $(PKG)/exo stage2
+
+ch-XML-Parser: popdev
+	make -C $(PKG)/XML-Parser stage2
+
+ch-Terminal: popdev
+	make -C $(PKG)/Terminal stage2
+
 ch-lua: popdev
 	make -C $(PKG)/lua stage2
 

Modified: x86/branches/utf8/etc/X11/app-defaults/XTerm
===================================================================
--- x86/branches/utf8/etc/X11/app-defaults/XTerm	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/etc/X11/app-defaults/XTerm	2005-08-09 09:05:09 UTC (rev 559)
@@ -70,7 +70,7 @@
 *vtMenu*altscreen*Label:  Show Alternate Screen
 
 ! The fonts below are not used at all on this CD
-! because of "locale mode" and Xft
+! because of "locale mode"
 *fontMenu.Label:  VT Fonts
 *fontMenu*fontdefault*Label:	Default
 *fontMenu*font1*Label:	Unreadable
@@ -96,7 +96,7 @@
 *fontMenu*utf8-mode*Label:	UTF-8
 
 *VT100.utf8Fonts.font2:	-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.utf8Fonts.font:	-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+*VT100.utf8Fonts.font:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
 *VT100.utf8Fonts.font3:	-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
 *VT100.utf8Fonts.font4:	-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
 *VT100.utf8Fonts.font5:	-misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
@@ -122,8 +122,11 @@
 ! LiveCD specific customizations are below this line
 
 *VT100*locale: true
-*VT100*faceName: Monospace
 *title: LFS LiveCD
+*background: black
+*foreground: white
 *VT100*scrollBar: true
 *VT100*scrollKey: true
 *VT100*rightScrollBar: true
+*ptyInitialErase: true
+*backarrowKeyIsErase: true

Modified: x86/branches/utf8/etc/profile
===================================================================
--- x86/branches/utf8/etc/profile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/etc/profile	2005-08-09 09:05:09 UTC (rev 559)
@@ -12,6 +12,7 @@
 
 NNTPSERVER=news.linuxfromscratch.org
 
-export PATH INPUTRC G_FILENAME_ENCODING PKG_CONFIG_PATH XML_CATALOG_FILES WWW_HOME NNTPSERVER
+TERMCMD=Terminal
+export PATH INPUTRC G_FILENAME_ENCODING PKG_CONFIG_PATH XML_CATALOG_FILES WWW_HOME NNTPSERVER TERMCMD
 
 source /etc/bashrc

Modified: x86/branches/utf8/etc/vimrc
===================================================================
--- x86/branches/utf8/etc/vimrc	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/etc/vimrc	2005-08-09 09:05:09 UTC (rev 559)
@@ -3,12 +3,7 @@
 set nocompatible
 set backspace=2
 syntax on
-if (&term == "iterm") || (&term == "putty")
-  set background=dark
-endif
-if (&term == "xterm") || (&term == "xterm-color")
-  set background=light
-endif
+set background=dark
 set ruler
 
 " End /etc/vimrc

Added: x86/branches/utf8/packages/Terminal/Makefile
===================================================================
--- x86/branches/utf8/packages/Terminal/Makefile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/packages/Terminal/Makefile	2005-08-09 09:05:09 UTC (rev 559)
@@ -0,0 +1,29 @@
+# Terminal Makefile
+
+# Package versions
+NM= Terminal
+VRS= 0.2.4
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://www.os-works.com/files/projects/terminal/0.2/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f /usr/bin/Terminal ] ; then unpack $(FILE) && cd $(DIR) && \
+	 ./configure --prefix=/usr --libexecdir=/usr/sbin && \
+	 make -j3 && make install && \
+	 mkdir /etc/xdg/Terminal && \
+	 install -m644 ../terminalrc /etc/xdg/Terminal/terminalrc ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)

Added: x86/branches/utf8/packages/Terminal/terminalrc
===================================================================
--- x86/branches/utf8/packages/Terminal/terminalrc	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/packages/Terminal/terminalrc	2005-08-09 09:05:09 UTC (rev 559)
@@ -0,0 +1,9 @@
+[Configuration]
+CommandUpdateRecords=FALSE
+FontName=Monospace 14
+MiscCursorBlinks=TRUE
+ShortcutsNoMenukey=TRUE
+ShortcutsNoMnemonics=TRUE
+TitleInitial=LFS LiveCD
+HelperWebbrowser=firefox
+HelperMailreader=thunderbird

Added: x86/branches/utf8/packages/XML-Parser/Makefile
===================================================================
--- x86/branches/utf8/packages/XML-Parser/Makefile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/packages/XML-Parser/Makefile	2005-08-09 09:05:09 UTC (rev 559)
@@ -0,0 +1,26 @@
+# XML::Parser Makefile
+
+# Package versions
+NM= XML-Parser
+VRS= 2.34
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.gz
+URL= http://www.cpan.org/authors/id/M/MS/MSERGEANT/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/lib/perl5/site_perl/5.8.?/i486-linux/auto/XML/Parser ] ; then unpack $(FILE) && cd $(DIR) && \
+	 perl Makefile.PL && make && make install ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)

Added: x86/branches/utf8/packages/exo/Makefile
===================================================================
--- x86/branches/utf8/packages/exo/Makefile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/packages/exo/Makefile	2005-08-09 09:05:09 UTC (rev 559)
@@ -0,0 +1,27 @@
+# exo Makefile
+
+# Package versions
+NM= exo
+VRS= 0.3.0
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://www.os-works.com/files/projects/libexo/0.3/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/include/exo-0.3 ] ; then unpack $(FILE) && cd $(DIR) && \
+	 ./configure --prefix=/usr --disable-python && \
+	 make -j3 && make install ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)

Added: x86/branches/utf8/packages/vte/Makefile
===================================================================
--- x86/branches/utf8/packages/vte/Makefile	2005-08-09 00:42:26 UTC (rev 558)
+++ x86/branches/utf8/packages/vte/Makefile	2005-08-09 09:05:09 UTC (rev 559)
@@ -0,0 +1,28 @@
+# VTE Makefile
+
+# Package versions
+NM= vte
+VRS= 0.11.13
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://ftp.gnome.org/pub/GNOME/sources/$(NM)/0.11/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/lib/vte ] ; then unpack $(FILE) && cd $(DIR) && \
+	 sed -i -e 's%\\177:%&kh=\\EOH:@7=\\EOF:%g' termcaps/xterm && \
+	 ./configure --prefix=/usr --disable-python --libexecdir=/usr/sbin && \
+	 make -j3 && make install ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)




More information about the livecd mailing list