Changeset 124f752c

Timestamp:

12/12/2016 07:51:08 PM (7 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

86918e9

Parents:

1a87abcd

Message:

Prune the Xorg bitmap fonts and move them to a separate page. Thanks to akhiezer for noticing that my initial version accidentally dropped the Type1 Adobe Utopia font.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18058 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/installing/installing.xml (modified) (1 diff)
• x/installing/x7app.xml (modified) (4 diffs)
• x/installing/x7font.xml (modified) (5 diffs)
• x/installing/x7legacy.xml (added)
• x/installing/x7lib.xml (modified) (6 diffs)
• x/installing/xterm.xml (modified) (1 diff)
• xsoft/other/tigervnc.xml (modified) (1 diff)
• xsoft/other/xscreensaver.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Reduce the old Xorg fonts to just Type1 and ttf,
+          with (only) the adobe 100dpi bitmap fonts plus old libXfont and
+          bdftopcf moved to new 'x7legacy' page. Fixes
+          <ulink url="&blfs-ticket-root;8621">#8621</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to xf86-input-wacom-0.34.0. Fixes
           <ulink url="&blfs-ticket-root;8612">#8612</ulink>.</para>

packages.ent

@@ -482 +482 @@
 <!-- Part VI -->
 <!-- Chapter 24 -->                               <!-- stable lt .90 micro version -->
-<!ENTITY xorg-version                 "7.7">      <!-- applies to all xorg packages -->
+<!ENTITY xorg-version                 "7">      <!-- applies to all xorg packages -->
 <!ENTITY util-macros-version          "1.19.0">
 <!ENTITY libXau-version               "1.0.8">

x/installing/installing.xml

@@ -78 +78 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7legacy.xml"/>
 </chapter>

x/installing/x7app.xml

@@ -10 +10 @@
   <!ENTITY x7apps-buildsize     "51 MB">
   <!ENTITY x7apps-time          "1.9 SBU">
-
-  <!ENTITY bdftopcf-version                "1.0.5">
-  <!ENTITY bdftopcf-md5sum                 "53a48e1fdfec29ab2e89f86d4b7ca902">
 
   <!ENTITY iceauth-version                 "1.0.7">
@@ -199 +196 @@
 
 <screen><userinput>cat &gt; app-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&bdftopcf-md5sum;  bdftopcf-&bdftopcf-version;.tar.bz2
-&iceauth-md5sum;  iceauth-&iceauth-version;.tar.bz2
+<literal>&iceauth-md5sum;  iceauth-&iceauth-version;.tar.bz2
 &luit-md5sum;  luit-&luit-version;.tar.bz2
 &mkfontdir-md5sum;  mkfontdir-&mkfontdir-version;.tar.bz2
@@ -326 +322 @@
       <seglistitem>
 
-        <seg>bdftopcf, iceauth, luit, mkfontdir, mkfontscale, sessreg,
+        <seg>iceauth, luit, mkfontdir, mkfontscale, sessreg,
         setxkbmap, smproxy, x11perf, x11perfcomp, xauth, xbacklight,
         xcmsdb, xcursorgen, xdpr, xdpyinfo, xdriinfo, xev, xgamma, xhost,
@@ -342 +338 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="bdftopcf-x7">
-        <term><command>bdftopcf</command></term>
-        <listitem>
-          <para>converts an X font from Bitmap Distribution Format to Portable
-          Compiled Format.</para>
-          <indexterm zone="xorg7-app bdftopcf-x7">
-            <primary sortas="b-bdftopcf">bdftopcf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="iceauth-x7">
         <term><command>iceauth</command></term>

x/installing/x7font.xml

@@ -7 +7 @@
   <!ENTITY x7fonts-download-http "&xorg-download-http;/font/">
   <!ENTITY x7fonts-download-ftp  "&xorg-download-ftp;/font/">
-  <!ENTITY x7fonts-size          "15.0 MB">
-  <!ENTITY x7fonts-buildsize     "278 MB">
-  <!ENTITY x7fonts-time          "2.3 SBU">
+  <!ENTITY x7fonts-size          "3.0 MB">
+  <!ENTITY x7fonts-buildsize     "8.8 MB">
+  <!ENTITY x7fonts-time          "0.1 SBU">
 
   <!ENTITY encodings-version               "1.0.4">
   <!ENTITY encodings-md5sum                "0f2d6546d514c5cc4ecf78a60657a5c1">
 
-  <!ENTITY font-adobe-100dpi-version       "1.0.3">
-  <!ENTITY font-adobe-100dpi-md5sum        "1347c3031b74c9e91dc4dfa53b12f143">
-
-  <!ENTITY font-adobe-75dpi-version        "1.0.3">
-  <!ENTITY font-adobe-75dpi-md5sum         "6c9f26c92393c0756f3e8d614713495b">
-
-  <!ENTITY font-adobe-utopia-100dpi-version "1.0.4">
-  <!ENTITY font-adobe-utopia-100dpi-md5sum  "66fb6de561648a6dce2755621d6aea17">
-
-  <!ENTITY font-adobe-utopia-75dpi-version "1.0.4">
-  <!ENTITY font-adobe-utopia-75dpi-md5sum  "e99276db3e7cef6dccc8a57bc68aeba7">
-
   <!ENTITY font-adobe-utopia-type1-version "1.0.4">
   <!ENTITY font-adobe-utopia-type1-md5sum  "fcf24554c348df3c689b91596d7f9971">
@@ -32 +20 @@
   <!ENTITY font-alias-md5sum               "6d25f64796fef34b53b439c2e9efa562">
 
-  <!ENTITY font-arabic-misc-version        "1.0.3">
-  <!ENTITY font-arabic-misc-md5sum         "cc0726e4a277d6ed93b8e09c1f195470">
-
-  <!ENTITY font-bh-100dpi-version          "1.0.3">
-  <!ENTITY font-bh-100dpi-md5sum           "9f11ade089d689b9d59e0f47d26f39cd">
-
-  <!ENTITY font-bh-75dpi-version           "1.0.3">
-  <!ENTITY font-bh-75dpi-md5sum            "565494fc3b6ac08010201d79c677a7a7">
-
-  <!ENTITY font-bh-lucidatypewriter-100dpi-version "1.0.3">
-  <!ENTITY font-bh-lucidatypewriter-100dpi-md5sum  "c8b73a53dcefe3e8d3907d3500e484a9">
-
-  <!ENTITY font-bh-lucidatypewriter-75dpi-version "1.0.3">
-  <!ENTITY font-bh-lucidatypewriter-75dpi-md5sum  "f6d65758ac9eb576ae49ab24c5e9019a">
-
   <!ENTITY font-bh-ttf-version             "1.0.3">
   <!ENTITY font-bh-ttf-md5sum              "e8ca58ea0d3726b94fe9f2c17344be60">
@@ -53 +26 @@
   <!ENTITY font-bh-type1-md5sum            "53ed9a42388b7ebb689bdfc374f96a22">
 
-  <!ENTITY font-bitstream-100dpi-version   "1.0.3">
-  <!ENTITY font-bitstream-100dpi-md5sum    "6b223a54b15ecbd5a1bc52312ad790d8">
-
-  <!ENTITY font-bitstream-75dpi-version    "1.0.3">
-  <!ENTITY font-bitstream-75dpi-md5sum     "d7c0588c26fac055c0dd683fdd65ac34">
-
   <!ENTITY font-bitstream-type1-version    "1.0.3">
   <!ENTITY font-bitstream-type1-md5sum     "5e0c9895d69d2632e2170114f8283c11">
 
-  <!ENTITY font-cronyx-cyrillic-version    "1.0.3">
-  <!ENTITY font-cronyx-cyrillic-md5sum     "e452b94b59b9cfd49110bb49b6267fba">
-
-  <!ENTITY font-cursor-misc-version        "1.0.3">
-  <!ENTITY font-cursor-misc-md5sum         "3e0069d4f178a399cffe56daa95c2b63">
-
-  <!ENTITY font-daewoo-misc-version        "1.0.3">
-  <!ENTITY font-daewoo-misc-md5sum         "0571bf77f8fab465a5454569d9989506">
-
-  <!ENTITY font-dec-misc-version           "1.0.3">
-  <!ENTITY font-dec-misc-md5sum            "6e7c5108f1b16d7a1c7b2c9760edd6e5">
-
   <!ENTITY font-ibm-type1-version          "1.0.3">
   <!ENTITY font-ibm-type1-md5sum           "bfb2593d2102585f45daa960f43cb3c4">
 
-  <!ENTITY font-isas-misc-version          "1.0.3">
-  <!ENTITY font-isas-misc-md5sum           "a2401caccbdcf5698e001784dbd43f1a">
-
-  <!ENTITY font-jis-misc-version           "1.0.3">
-  <!ENTITY font-jis-misc-md5sum            "cb7b57d7800fd9e28ec35d85761ed278">
-
-  <!ENTITY font-micro-misc-version         "1.0.3">
-  <!ENTITY font-micro-misc-md5sum          "143c228286fe9c920ab60e47c1b60b67">
-
-  <!ENTITY font-misc-cyrillic-version      "1.0.3">
-  <!ENTITY font-misc-cyrillic-md5sum       "96109d0890ad2b6b0e948525ebb0aba8">
-
   <!ENTITY font-misc-ethiopic-version      "1.0.3">
   <!ENTITY font-misc-ethiopic-md5sum       "6306c808f7d7e7d660dfb3859f9091d2">
 
-  <!ENTITY font-misc-meltho-version        "1.0.3">
-  <!ENTITY font-misc-meltho-md5sum         "e3e7b0fda650adc7eb6964ff3c486b1c">
-
-  <!ENTITY font-misc-misc-version          "1.1.2">
-  <!ENTITY font-misc-misc-md5sum           "c88eb44b3b903d79fb44b860a213e623">
-
-  <!ENTITY font-mutt-misc-version          "1.0.3">
-  <!ENTITY font-mutt-misc-md5sum           "56b0296e8862fc1df5cdbb4efe604e86">
-
-  <!ENTITY font-schumacher-misc-version    "1.1.2">
-  <!ENTITY font-schumacher-misc-md5sum     "e805feb7c4f20e6bfb1118d19d972219">
-
-  <!ENTITY font-screen-cyrillic-version    "1.0.4">
-  <!ENTITY font-screen-cyrillic-md5sum     "6f3fdcf2454bf08128a651914b7948ca">
-
-  <!ENTITY font-sony-misc-version          "1.0.3">
-  <!ENTITY font-sony-misc-md5sum           "beef61a9b0762aba8af7b736bb961f86">
-
-  <!ENTITY font-sun-misc-version           "1.0.3">
-  <!ENTITY font-sun-misc-md5sum            "948f2e07810b4f31195185921470f68d">
-
   <!ENTITY font-util-version               "1.3.1">
   <!ENTITY font-util-md5sum                "23756dab809f9ec5011bb27fb2c3c7d6">
-
-  <!ENTITY font-winitzki-cyrillic-version  "1.0.3">
-  <!ENTITY font-winitzki-cyrillic-md5sum   "829a3159389b7f96f629e5388bfee67b">
 
   <!ENTITY font-xfree86-type1-version      "1.0.4">
@@ -141 +60 @@
     <title>Introduction to Xorg Fonts</title>
 
-    <para>The <application>Xorg</application> font packages provide
-    needed fonts to the <application>Xorg</application> applications.</para>
+    <para>The <application>Xorg</application> font packages provide some
+    scalable fonts and supporting packages for <application>Xorg</application>
+    applications. Many people will want to install other TTF or OTF fonts in
+    addition to, or instead of, these. Some are listed at <xref
+    linkend="xft-font-protocol"/>.</para>
 
     &lfs7a_checked;
@@ -186 +108 @@
 <literal>&font-util-md5sum;  font-util-&font-util-version;.tar.bz2
 &encodings-md5sum;  encodings-&encodings-version;.tar.bz2
-&font-adobe-100dpi-md5sum;  font-adobe-100dpi-&font-adobe-100dpi-version;.tar.bz2
-&font-adobe-75dpi-md5sum;  font-adobe-75dpi-&font-adobe-75dpi-version;.tar.bz2
-&font-adobe-utopia-100dpi-md5sum;  font-adobe-utopia-100dpi-&font-adobe-utopia-100dpi-version;.tar.bz2
-&font-adobe-utopia-75dpi-md5sum;  font-adobe-utopia-75dpi-&font-adobe-utopia-75dpi-version;.tar.bz2
+&font-alias-md5sum;  font-alias-&font-alias-version;.tar.bz2
 &font-adobe-utopia-type1-md5sum;  font-adobe-utopia-type1-&font-adobe-utopia-type1-version;.tar.bz2
-&font-alias-md5sum;  font-alias-&font-alias-version;.tar.bz2
-&font-arabic-misc-md5sum;  font-arabic-misc-&font-arabic-misc-version;.tar.bz2
-&font-bh-100dpi-md5sum;  font-bh-100dpi-&font-bh-100dpi-version;.tar.bz2
-&font-bh-75dpi-md5sum;  font-bh-75dpi-&font-bh-75dpi-version;.tar.bz2
-&font-bh-lucidatypewriter-100dpi-md5sum;  font-bh-lucidatypewriter-100dpi-&font-bh-lucidatypewriter-100dpi-version;.tar.bz2
-&font-bh-lucidatypewriter-75dpi-md5sum;  font-bh-lucidatypewriter-75dpi-&font-bh-lucidatypewriter-75dpi-version;.tar.bz2
 &font-bh-ttf-md5sum;  font-bh-ttf-&font-bh-ttf-version;.tar.bz2
 &font-bh-type1-md5sum;  font-bh-type1-&font-bh-type1-version;.tar.bz2
-&font-bitstream-100dpi-md5sum;  font-bitstream-100dpi-&font-bitstream-100dpi-version;.tar.bz2
-&font-bitstream-75dpi-md5sum;  font-bitstream-75dpi-&font-bitstream-75dpi-version;.tar.bz2
-&font-bitstream-type1-md5sum;  font-bitstream-type1-&font-bitstream-type1-version;.tar.bz2
-&font-cronyx-cyrillic-md5sum;  font-cronyx-cyrillic-&font-cronyx-cyrillic-version;.tar.bz2
-&font-cursor-misc-md5sum;  font-cursor-misc-&font-cursor-misc-version;.tar.bz2
-&font-daewoo-misc-md5sum;  font-daewoo-misc-&font-daewoo-misc-version;.tar.bz2
-&font-dec-misc-md5sum;  font-dec-misc-&font-dec-misc-version;.tar.bz2
 &font-ibm-type1-md5sum;  font-ibm-type1-&font-ibm-type1-version;.tar.bz2
-&font-isas-misc-md5sum;  font-isas-misc-&font-isas-misc-version;.tar.bz2
-&font-jis-misc-md5sum;  font-jis-misc-&font-jis-misc-version;.tar.bz2
-&font-micro-misc-md5sum;  font-micro-misc-&font-micro-misc-version;.tar.bz2
-&font-misc-cyrillic-md5sum;  font-misc-cyrillic-&font-misc-cyrillic-version;.tar.bz2
 &font-misc-ethiopic-md5sum;  font-misc-ethiopic-&font-misc-ethiopic-version;.tar.bz2
-&font-misc-meltho-md5sum;  font-misc-meltho-&font-misc-meltho-version;.tar.bz2
-&font-misc-misc-md5sum;  font-misc-misc-&font-misc-misc-version;.tar.bz2
-&font-mutt-misc-md5sum;  font-mutt-misc-&font-mutt-misc-version;.tar.bz2
-&font-schumacher-misc-md5sum;  font-schumacher-misc-&font-schumacher-misc-version;.tar.bz2
-&font-screen-cyrillic-md5sum;  font-screen-cyrillic-&font-screen-cyrillic-version;.tar.bz2
-&font-sony-misc-md5sum;  font-sony-misc-&font-sony-misc-version;.tar.bz2
-&font-sun-misc-md5sum;  font-sun-misc-&font-sun-misc-version;.tar.bz2
-&font-winitzki-cyrillic-md5sum;  font-winitzki-cyrillic-&font-winitzki-cyrillic-version;.tar.bz2
 &font-xfree86-type1-md5sum;  font-xfree86-type1-&font-xfree86-type1-version;.tar.bz2</literal>
 EOF</userinput></screen>

x/installing/x7lib.xml

@@ -61 +61 @@
   <!ENTITY libfontenc-version              "1.1.3">
   <!ENTITY libfontenc-md5sum               "0920924c3a9ebc1265517bdd2f9fde50">
-
-  <!ENTITY libXfont-version                "1.5.2">
-  <!ENTITY libXfont-md5sum                 "254ee42bd178d18ebc7a73aacfde7f79">
 
   <!ENTITY libXfont2-version               "2.0.1">
@@ -197 +194 @@
 &libXdamage-md5sum;  libXdamage-&libXdamage-version;.tar.bz2
 &libfontenc-md5sum;  libfontenc-&libfontenc-version;.tar.bz2
-&libXfont-md5sum;  libXfont-&libXfont-version;.tar.bz2
 &libXfont2-md5sum;  libXfont2-&libXfont2-version;.tar.bz2
 &libXft-md5sum;  libXft-&libXft-version;.tar.bz2
@@ -263 +259 @@
       ./configure $XORG_CONFIG
     ;;
-    libXfont-[0-9]* )
+    libXfont2-[0-9]* )
       ./configure $XORG_CONFIG --disable-devel-docs
     ;;
@@ -297 +293 @@
 
     <para><parameter>--disable-devel-docs</parameter>: Disable generation of
-    text documentation in the libXfont package if
+    text documentation in the libXfont2 package if
     <xref linkend="xmlto"/> is installed without a text browser. Omit
     this parameter (or the entire <command>case</command> statement) if a text
@@ -339 +335 @@
           libXaw7.so, libXaw.so, libXcomposite.so,
           libXcursor.so, libXdamage.so, libXext.so,
-          libXfixes.so, libXfont.so, libXft.so, libXinerama.so,
+          libXfixes.so, libXfont2.so, libXft.so, libXinerama.so,
           libXi.so, libxkbfile.so, libXmu.so, libXmuu.so,
           libXpm.so, libXrandr.so, libXrender.so, libXRes.so,
@@ -546 +542 @@
       </varlistentry>
 
-      <varlistentry id="libXfont">
-        <term><filename class="libraryfile">libXfont.so</filename></term>
+      <varlistentry id="libXfont2">
+        <term><filename class="libraryfile">libXfont2.so</filename></term>
         <listitem>
           <para>is the X font library.</para>
-          <indexterm zone="xorg7-lib libXfont">
-            <primary sortas="c-libXfont">libXfont.so</primary>
+          <indexterm zone="xorg7-lib libXfont2">
+            <primary sortas="c-libXfont2">libXfont2.so</primary>
           </indexterm>
         </listitem>

x/installing/xterm.xml

@@ -64 +64 @@
     <para role="required"><xref linkend="xorg7-app"/></para>
 
+    <bridgehead renderas="sect4">Required (at runtime)</bridgehead>
+    <para role="required">
+      A monospace TTF or OTF font such as DejaVu, listed under
+      <xref linkend="xft-font-protocol"/>
+    </para>
+
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">

xsoft/other/tigervnc.xml

@@ -91 +91 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="pixman"/>, and
-      <xref linkend="xorg7-app"/>
+      <!-- commented until tigervnc can use the 1.19 xorg-server
+      <xref linkend="xorg7-app"/> -->
+      <xref linkend="xorg7-legacy"/>
     </para>
 

xsoft/other/xscreensaver.xml

@@ -97 +97 @@
       <ulink url="http://linas.org/gle/">GLE</ulink> and
       <xref linkend="linux-pam"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
+    <para role="optional">
+      <xref linkend="xorg7-legacy"/> (to enlarge the splash screen, error
+      messages, and password prompt)
     </para>