r2062 - in profiles/BLFS/trunk: chapter04 chapter08 chapter18 chapter23 chapter26 chapter28 chapter29 chapter34 chapter37 chapter43 chapter45

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Mon Oct 3 07:00:46 PDT 2005


Author: jbeckers
Date: 2005-10-03 08:00:33 -0600 (Mon, 03 Oct 2005)
New Revision: 2062

Modified:
   profiles/BLFS/trunk/chapter04/mitkrb.xml
   profiles/BLFS/trunk/chapter08/libusb.xml
   profiles/BLFS/trunk/chapter18/samba.xml
   profiles/BLFS/trunk/chapter23/postgresql.xml
   profiles/BLFS/trunk/chapter26/qt-opt.xml
   profiles/BLFS/trunk/chapter28/kdebase.xml
   profiles/BLFS/trunk/chapter28/kdelibs.xml
   profiles/BLFS/trunk/chapter29/kdegames.xml
   profiles/BLFS/trunk/chapter29/kdepim.xml
   profiles/BLFS/trunk/chapter29/kdevelop.xml
   profiles/BLFS/trunk/chapter34/koffice.xml
   profiles/BLFS/trunk/chapter37/alsa-tools.xml
   profiles/BLFS/trunk/chapter43/docbook-utils.xml
   profiles/BLFS/trunk/chapter45/xpdf.xml
Log:
appleid two patches with these fixes:
* (commented out) installation of remaining programs to alsa-tools
* (commented out) support for A4 paper in xpdf
* whitespace fixes in mitkrb
* fix for libusb
* fix for qt if installed in opt - this one is quite major
* (commented out) support for apidox in kde

thx to Jasmine Iwanek



Modified: profiles/BLFS/trunk/chapter04/mitkrb.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/mitkrb.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter04/mitkrb.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd" [
+<!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
+[
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
 <!ENTITY % package_entities SYSTEM "../config/packages/ch04.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">

Modified: profiles/BLFS/trunk/chapter08/libusb.xml
===================================================================
--- profiles/BLFS/trunk/chapter08/libusb.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter08/libusb.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -78,7 +78,7 @@
       </mkdir>
       <copy>
 	<source>apidocs/html/*</source>
-	<name>/usr/share/doc/libusb-&libusb-version;/apidocs</name>
+	<destination>/usr/share/doc/libusb-&libusb-version;/apidocs</destination>
       </copy>
       -->
     </stage>

Modified: profiles/BLFS/trunk/chapter18/samba.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/samba.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter18/samba.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -69,6 +69,8 @@
         <param>--with-piddir=/var/run</param>
         <param>--with-fhs</param>
         <param>--with-smbmount</param>
+	<!-- uncoment to enable linking with pam -->
+	<!-- <param>- -with-pam</param> -->
       </configure>
       <make />
       <make>
@@ -87,7 +89,14 @@
 	<name>/usr/include/libsmbclient.h</name>
 	<name>/usr/lib/samba/libsmbclient.a</name>
       </permissions>
+      <!-- uncomment if linking with pam -->
+      <!--
       <copy>
+        <source>nsswitch/pam_winbind.so</source>
+        <destination>/lib/security</destination>
+      </copy>
+      -->
+      <copy>
         <source>nsswitch/libnss_wins.so</source>
 	<source>nsswitch/libnss_winbind.so</source>
         <destination>/lib</destination>

Modified: profiles/BLFS/trunk/chapter23/postgresql.xml
===================================================================
--- profiles/BLFS/trunk/chapter23/postgresql.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter23/postgresql.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -15,7 +15,6 @@
 <!ENTITY % package_entities_extra SYSTEM "../config/packages/ch43.ent">
 %package_entities_extra;
 
-
 ]>
 <alfs>
   <package name="postgresql" version="&postgresql-version;">

Modified: profiles/BLFS/trunk/chapter26/qt-opt.xml
===================================================================
--- profiles/BLFS/trunk/chapter26/qt-opt.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter26/qt-opt.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -46,7 +46,7 @@
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
-        <digest>&qt-opt-md5;</digest>
+        <digest>&qt-md5;</digest>
 	<archive>&packages_dir;/&qt-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>

Modified: profiles/BLFS/trunk/chapter28/kdebase.xml
===================================================================
--- profiles/BLFS/trunk/chapter28/kdebase.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter28/kdebase.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -97,7 +97,13 @@
         <param>--disable-dependency-tracking</param>
       </configure>
       <make />
+      <!-- Uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
         <param>install</param>
       </make>
     </stage>

Modified: profiles/BLFS/trunk/chapter28/kdelibs.xml
===================================================================
--- profiles/BLFS/trunk/chapter28/kdelibs.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter28/kdelibs.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -89,7 +89,13 @@
 	<param>--enable-fast-malloc=full</param>
       </configure>
       <make />
+      <!-- uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
 	<param>install</param>
       </make>
       &ldconfig;

Modified: profiles/BLFS/trunk/chapter29/kdegames.xml
===================================================================
--- profiles/BLFS/trunk/chapter29/kdegames.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter29/kdegames.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -46,7 +46,13 @@
         <param>--disable-dependency-tracking</param>
       </configure>
       <make />
+      <!-- Uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
         <param>install</param>
       </make>
     </stage>

Modified: profiles/BLFS/trunk/chapter29/kdepim.xml
===================================================================
--- profiles/BLFS/trunk/chapter29/kdepim.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter29/kdepim.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -74,7 +74,13 @@
         <param>--disable-dependency-tracking</param>
       </configure>
       <make />
+      <!-- uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
         <param>install</param>
       </make>
     </stage>

Modified: profiles/BLFS/trunk/chapter29/kdevelop.xml
===================================================================
--- profiles/BLFS/trunk/chapter29/kdevelop.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter29/kdevelop.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -52,7 +52,13 @@
         <param>--disable-dependency-tracking</param>
       </configure>
       <make />
+      <!-- uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
         <param>install</param>
       </make>
       <ownership user="root" group="root">

Modified: profiles/BLFS/trunk/chapter34/koffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/koffice.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter34/koffice.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -77,7 +77,13 @@
         <param>--disable-dependency-tracking</param>
       </configure>
       <make />
+      <!-- uncomment to build api docs -->
+      <!--
       <make>
+        <param>apidox</param>
+      </make>
+      -->
+      <make>
         <param>install</param>
       </make>
     </stage>

Modified: profiles/BLFS/trunk/chapter37/alsa-tools.xml
===================================================================
--- profiles/BLFS/trunk/chapter37/alsa-tools.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter37/alsa-tools.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -23,17 +23,17 @@
         <name>fltk</name>
       </utilizes>
       <utilizes>
-	<name>qt</name>
+        <name>qt</name>
       </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <digest>&alsa-tools-md5;</digest>
-	<archive>&packages_dir;/&alsa-tools-package;</archive>
+        <archive>&packages_dir;/&alsa-tools-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing ac3dec">
+    <stage name="Installing ac3dec and extract_ac3">
       <stageinfo>
         <base>&build_dir;/&alsa-tools-directory;/ac3dec</base>
       </stageinfo>
@@ -49,11 +49,6 @@
       <stageinfo>
         <base>&build_dir;/&alsa-tools-directory;/as10k1</base>
       </stageinfo>
-      <execute command="sed">
-	<param>-i</param>
-	<param>-e "s/^next_cli_arg:/&real-amp;\n\n\tbreak;/"</param>
-	<param>as10k1.c</param>
-      </execute>
       <configure>
         <param>--prefix=/usr</param>
       </configure>
@@ -62,6 +57,23 @@
         <param>install</param>
       </make>
     </stage>
+    <!-- Uncomment if you want to build echomixer (gtk+ is required). -->
+    <!--
+    <stage name="Installing echomixer">
+      <stageinfo>
+        <base>&build_dir;/&alsa-tools-directory;/echomixer</base>
+      </stageinfo>
+      <configure>
+        <param>--prefix=/usr</param>
+      </configure>
+      <make />
+      <make>
+        <param>install</param>
+      </make>
+    </stage>
+    -->
+    <!-- Uncomment if you want to build envy24control (gtk+ is required). -->
+    <!--
     <stage name="Installing envy24control">
       <stageinfo>
         <base>&build_dir;/&alsa-tools-directory;/envy24control</base>
@@ -74,6 +86,49 @@
         <param>install</param>
       </make>
     </stage>
+    -->
+    <!-- Uncomment if you want to build hdspconf (fltk is required). -->
+    <!--
+    <stage name="Installing hdspconf">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/hdspconf</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    -->
+    <stage name="Installing hdsploader">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/hdsploader</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <!-- Uncomment if you want to build hdspmixer (fltk is required). -->
+    <!--
+    <stage name="Installing hdspmixer">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/hdspmixer</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    -->
     <stage name="Installing sb16_csp">
       <stageinfo>
         <base>&build_dir;/&alsa-tools-directory;/sb16_csp</base>
@@ -98,6 +153,121 @@
         <param>install</param>
       </make>
     </stage>
+    <stage name="Installing ld10k1">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/ld10k1</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+         <param>--enable-static</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing mixartloader">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/mixartloader</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing pcxhrloader">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/pcxhrloader</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <!-- Uncomment if you want to build rmedigicontrol (gtk+ is required). -->
+    <!--
+    <stage name="Installing rmedigicontrol">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/rmedigicontrol</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    -->
+    <!-- Uncomment if you want to build qlo10k1 (qt is required). -->
+    <!--
+    <stage name="Installing qlo10k1">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/qlo10k1</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    -->
+    <stage name="Installing sscape_ctl">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/sscape_ctl</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing us428control">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/us428control</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing usx2yloader">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/usx2yloader</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
+    <stage name="Installing vxloader">
+      <stageinfo>
+         <base>&build_dir;/&alsa-tools-directory;/vxloader</base>
+      </stageinfo>
+      <configure>
+         <param>--prefix=/usr</param>
+      </configure>
+      <make/>
+      <make>
+         <param>install</param>
+      </make>
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&alsa-tools-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter43/docbook-utils.xml
===================================================================
--- profiles/BLFS/trunk/chapter43/docbook-utils.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter43/docbook-utils.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -46,6 +46,7 @@
     <stageinfo>
       <base>&build_dir;/&docbook-utils-directory;</base>
     </stageinfo>
+    <execute command="sed -i 's:/html::' doc/HTML/Makefile.in" />
     <configure>
       <param>--prefix=/usr</param>
     </configure>

Modified: profiles/BLFS/trunk/chapter45/xpdf.xml
===================================================================
--- profiles/BLFS/trunk/chapter45/xpdf.xml	2005-10-03 03:40:38 UTC (rev 2061)
+++ profiles/BLFS/trunk/chapter45/xpdf.xml	2005-10-03 14:00:33 UTC (rev 2062)
@@ -71,6 +71,8 @@
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc</param>
         <param>--with-freetype2-includes=/usr/include/freetype2</param>
+        <!-- uncomment to make A4 paper default -->
+	<!-- <param>- -enable-a4-paper</param>-->
       </configure>
       <make />
       <make>




More information about the alfs-log mailing list