r1306 - in trunk/packages: Xorg-modular fontconfig fonts-arphic fonts-baekmuk fonts-dejavu fonts-kochi freefont xfce/desktop-files

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Dec 24 05:38:40 PST 2005


Author: alexander
Date: 2005-12-24 06:38:37 -0700 (Sat, 24 Dec 2005)
New Revision: 1306

Removed:
   trunk/packages/xfce/desktop-files/xcalc.desktop
Modified:
   trunk/packages/Xorg-modular/EXCUSES
   trunk/packages/Xorg-modular/Makefile
   trunk/packages/fontconfig/Makefile
   trunk/packages/fonts-arphic/Makefile
   trunk/packages/fonts-baekmuk/Makefile
   trunk/packages/fonts-dejavu/Makefile
   trunk/packages/fonts-kochi/Makefile
   trunk/packages/freefont/Makefile
Log:
Moved all useful TrueType fonts to /usr/share/fonts
Removed all bitmap fonts


Modified: trunk/packages/Xorg-modular/EXCUSES
===================================================================
--- trunk/packages/Xorg-modular/EXCUSES	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/Xorg-modular/EXCUSES	2005-12-24 13:38:37 UTC (rev 1306)
@@ -8,6 +8,7 @@
 libXprintAppUtil: LFS LiveCD doesn't support printing
 appres: X resources aren't used much with GTK2
 beforelight: We have another screensaver
+bdftopcf: unused, because there are no bitmap fonts on this CD
 bitmap: editing XBM files doesn't fit in the purpose of the CD
 editres: X resources aren't used much with GTK2
 fonttosfnt: fake TTFs are evil
@@ -27,6 +28,7 @@
 viewres: X resources aren't used much with GTK2
 x11perf: useless benchmark
 xbiff: mail never arrives to /var/mail on this CD
+xcalc: didn't survive removal of bitmap fonts
 xclipboard: uses core X fonts that create problems with UTF-8
 xclock: XFCE already has one clock
 xcmsdb: libX11 has XCMS disabled on this CD

Modified: trunk/packages/Xorg-modular/Makefile
===================================================================
--- trunk/packages/Xorg-modular/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/Xorg-modular/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -19,10 +19,13 @@
 download: SHA1SUMS $(FILE1) $(FILE2)
 	awk '/^[^#]/{print $$2}' SHA1SUMS | ( cd $(SRC) ; wget -c -nc -B $(URLBASE) -i /dev/stdin )
 	cat SHA1SUMS | ( cd $(SRC) ; sha1sum -c - ) >download.log
-	ln -sf `awk '/^[^#]/{print "/$(SRC)/"$$2 }' SHA1SUMS` .
+	ln -sf `awk '/^[^#]/{print "$(SRC)/"$$2 }' SHA1SUMS` .
 	@touch $@
 
-stage2: Makefile download symlinks utils proto lib apps drv
+stage2: Makefile download symlinks utils proto lib apps drv fonts
+	echo -e "#!/bin/sh\nexec /usr/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
+	chmod 755 /etc/X11/xinit/xserverrc
+	install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf			
 	@touch $@
 
 symlinks: Makefile
@@ -58,11 +61,11 @@
 	@touch $@
 
 apps:	Y-xbitmaps \
-	N-appres Y-bdftopcf N-beforelight N-bitmap N-editres N-fonttosfnt \
+	N-appres N-bdftopcf N-beforelight N-bitmap N-editres N-fonttosfnt \
 	N-fslsfonts N-fstobdf Y-iceauth N-ico N-lbxproxy N-listres N-luit \
 	N-mkcfm Y-mkfontdir Y-mkfontscale N-oclock N-pclcomp N-proxymngr \
 	Y-rgb N-rstart Y-scripts Y-sessreg Y-setxkbmap N-showfont Y-smproxy \
-	N-twm N-viewres N-x11perf Y-xauth N-xbiff Y-xcalc N-xclipboard \
+	N-twm N-viewres N-x11perf Y-xauth N-xbiff N-xcalc N-xclipboard \
 	N-xclock N-xcmsdb N-xconsole Y-xcursorgen N-xdbedizzy N-xditview \
 	N-xdm Y-xdpyinfo Y-xdriinfo N-xedit N-xev N-xeyes N-xf86dga N-xfd \
 	N-xfindproxy N-xfontsel N-xfs N-xfsinfo N-xfwp Y-xgamma N-xgc \
@@ -101,6 +104,28 @@
 	Y-xf86-video-voodoo
 	@touch $@
 
+# Idea: provide only required "cursor" and "fixed" fonts to X core protocol
+#     take cursor.pfa from font-xfree86-type1
+#     and cour*.pfa from font-ibm-type1, alias that to "fixed"
+# Put them into /usr/lib/X11/fonts/Type1
+#     Make them invisible to fontconfig because they
+#     confuse its font substitution algorithm
+# None of the installed applications should use X core font protocol.
+#
+# Useful TrueType fonts should go to /usr/share/fonts
+# and be visible to fontconfig
+
+EXTRA_FLAGS-font-bh-ttf=--with-fontdir=/usr/share/fonts
+EXTRA_FLAGS-font-misc-ethiopic=--with-otf-fontdir=/usr/share/fonts --with-ttf-fontdir=no
+EXTRA_FLAGS-font-misc-meltho=--with-fontdir=/usr/share/fonts
+
+fonts:	Y-font-bh-ttf Y-font-misc-ethiopic Y-font-misc-meltho \
+	Y-font-xfree86-type1 Y-font-ibm-type1
+# Want huge cursors? replace 31 with 63
+	@echo 'cursor -xfree86-cursor-medium-r-normal--31-0-100-100-p-0-adobe-fontspecific' >/usr/lib/X11/fonts/Type1/fonts.alias
+	@echo 'fixed -ibm-courier-bold-r-normal--18-0-100-100-m-0-iso8859-1' >>/usr/lib/X11/fonts/Type1/fonts.alias
+	@touch $@
+
 N-%:
 	@$(call echo_message, NOT building)
 	@grep '^$*' EXCUSES
@@ -135,7 +160,7 @@
 	# May well be just an unnecessary precaution
 	autoreconf --force --install --verbose
 	./configure --help
-	./configure --prefix=/usr --localstatedir=/var
+	./configure --prefix=/usr --localstatedir=/var $(EXTRA_FLAGS-$*)
 	make $(PM)
 	make DESTDIR=$(ROOT)/debug/$* install
 	make install

Modified: trunk/packages/fontconfig/Makefile
===================================================================
--- trunk/packages/fontconfig/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/fontconfig/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -27,6 +27,7 @@
 	# UGLY HACK BELOW. Remove when Greek is supported in DejaVu Sans Mono.
 	# Needed in order to avoid fallback to (ugly) FreeMono in Terminal.
 	sed -i -e '/prefer/,+2s,^\(.*Sans\) Mono\(.*$$\),&\n\1\2,' /etc/fonts/fonts.conf
+	cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/fonts-arphic/Makefile
===================================================================
--- trunk/packages/fonts-arphic/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/fonts-arphic/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -1,7 +1,7 @@
 # Arphic fonts Makefile
 
 NM= fonts-arphic
-LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+LOCATION= /usr/share/fonts
 BASE= http://cle.linux.org.tw/fonts/Arphic
 
 FILE1= bkai00mp.ttf

Modified: trunk/packages/fonts-baekmuk/Makefile
===================================================================
--- trunk/packages/fonts-baekmuk/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/fonts-baekmuk/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -3,7 +3,7 @@
 NM= baekmuk-ttf
 VRS= 2.2
 DIR= $(NM)-$(VRS)
-LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+LOCATION= /usr/share/fonts
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://kldp.net/frs/download.php/1429/$(FILE)

Modified: trunk/packages/fonts-dejavu/Makefile
===================================================================
--- trunk/packages/fonts-dejavu/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/fonts-dejavu/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -3,7 +3,7 @@
 NM= dejavu-ttf
 VRS= 2.0
 DIR= $(NM)-$(VRS)
-LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+LOCATION= /usr/share/fonts
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/dejavu/$(FILE)

Modified: trunk/packages/fonts-kochi/Makefile
===================================================================
--- trunk/packages/fonts-kochi/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/fonts-kochi/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -3,7 +3,7 @@
 NM= kochi-substitute
 VRS= 20030628
 DIR= $(NM)-$(VRS)
-LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+LOCATION= /usr/share/fonts
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://osdn.dl.sourceforge.jp/efont/4845/$(FILE)

Modified: trunk/packages/freefont/Makefile
===================================================================
--- trunk/packages/freefont/Makefile	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/freefont/Makefile	2005-12-24 13:38:37 UTC (rev 1306)
@@ -3,7 +3,7 @@
 NM= freefont-ttf
 VRS= 20050407
 DIR= $(NM)-$(VRS)
-LOCATION= /usr/X11R6/lib/X11/fonts/TTF
+LOCATION= /usr/share/fonts
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)

Deleted: trunk/packages/xfce/desktop-files/xcalc.desktop
===================================================================
--- trunk/packages/xfce/desktop-files/xcalc.desktop	2005-12-24 13:35:05 UTC (rev 1305)
+++ trunk/packages/xfce/desktop-files/xcalc.desktop	2005-12-24 13:38:37 UTC (rev 1306)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=xcalc
-Name=XCalc
-Comment=Scientific calculator
-Comment[ru]=Научный калькулятор
-Terminal=0
-Categories=Application;System




More information about the livecd mailing list