r1730 - in profiles/BLFS/trunk: chapter10 chapter34 chapter35 config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Feb 8 18:24:28 PST 2005


Author: thomasp
Date: 2005-02-08 19:24:28 -0700 (Tue, 08 Feb 2005)
New Revision: 1730

Modified:
   profiles/BLFS/trunk/chapter10/xscreensaver.xml
   profiles/BLFS/trunk/chapter34/openoffice.xml
   profiles/BLFS/trunk/chapter35/dillo.xml
   profiles/BLFS/trunk/chapter35/firefox.xml
   profiles/BLFS/trunk/chapter35/galeon.xml
   profiles/BLFS/trunk/chapter35/mozilla.xml
   profiles/BLFS/trunk/config_standard/packages/ch35.ent
   profiles/BLFS/trunk/wget/chapter35.urls
Log:
ch 35: mozilla-1.7.5, firefox-1.0, galeon-1.3.18 and dillo-0.8.4

Modified: profiles/BLFS/trunk/chapter10/xscreensaver.xml
===================================================================
--- profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter10/xscreensaver.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -36,7 +36,7 @@
     </make>
   </stage>
   <stage name="Cleanup.">
-    <remove>&build_dir;/</remove>
+    <remove>&build_dir;/&xscreensaver-directory;</remove>
   </stage>
 </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter34/openoffice.xml
===================================================================
--- profiles/BLFS/trunk/chapter34/openoffice.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter34/openoffice.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -129,12 +129,12 @@
 	<target>/opt/gcc-&gcc-33-version;/include/c++/&gcc-33-version;</target>
 	<name>/usr/g++-v3</name>
       </link>
-      <search_replace base="&build_dir;/&openoffice-directory;/solenv/inc">
+      <search_replace base="&build_dir;/OOo-build/&openoffice-directory;/solenv/inc">
         <file>unxlngi4.mk</file>
         <find>-mcpu=pentiumpro</find>
         <replace></replace>
       </search_replace>
-      <configure base="&build_dir;/&openoffice-directory;/config_office">
+      <configure base="&build_dir;/OOo-build/&openoffice-directory;/config_office">
         <param>--with-lang=ENUS</param>
         <param>--with-dict=ENUS</param>
         <param>--without-fonts</param>
@@ -194,8 +194,7 @@
       <execute command="&build_dir;/install-oo.sh" />
     </stage>
     <stage name="Cleanup">
-      <remove>&build_dir;/&openoffice-directory;</remove>
-      <remove>&build_dir;/&gpc-directory;</remove>
+      <remove>&build_dir;/OOo-build</remove>
       <remove>&build_dir;/install-oo.sh</remove>
       <remove>/usr/g++-v3</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter35/dillo.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/dillo.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter35/dillo.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -16,6 +16,12 @@
       <requires>
         <name>gtk+</name>
       </requires>
+      <utilizes>
+      	<name>openssl</name>
+      </utilizes>
+      <utilizes>
+	<name>wget</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -29,7 +35,7 @@
       </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
-        <param>--sysconfdir=/etc</param>
+        <param>--sysconfdir=/etc/dillo</param>
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter35/firefox.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/firefox.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter35/firefox.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -22,12 +22,27 @@
       <requires>
         <name>libidl</name>
       </requires>
-      <requires>
-        <name>libmng</name>
-      </requires>
-      <requires>
-        <name>which</name>
-      </requires>
+      <utilizes>
+	<name>gnupg</name>
+      </utilizes>
+      <utilizes>
+	<name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+	<name>unzip</name>
+      </utilizes>
+      <utilizes>
+	<name>gnome-vfs2</name>
+      </utilizes>
+      <utilizes>
+	<name>libart-lgpl</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>doxygen</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -45,47 +60,57 @@
         <base>&build_dir;/&firefox-directory;</base>
       </stageinfo>
       <configure>
-        <param>--prefix=/opt/firefox-&firefox-version;</param>
-        <param>--enable-default-toolkit=gtk2</param>
-        <param>--with-x</param>
-        <param>--with-system-zlib</param>
-        <param>--with-system-jpeg</param>
-        <param>--with-system-png</param>
-        <param>--with-system-mng</param>
-        <param>--enable-xft</param>
-        <param>--enable-crypto</param>
-        <param>--disable-accessibility</param>
-        <param>--disable-tests</param>
-        <param>--disable-debug</param>
-        <param>--disable-logging</param>
-        <param>--enable-reorder</param>
-        <param>--enable-strip</param>
-        <param>--disable-pedantic</param>
-        <param>--enable-cpp-rtti</param>
-        <param>--enable-extensions=all</param>
-        <param>--disable-calendar</param>
-        <param>--disable-mailnews</param>
+	<param>--prefix=/usr</param>
+	<param>--with-default-mozilla-five-home=/usr/lib/firefox-&firefox-version;</param>
+	<param>--with-user-appdir=.firefox</param>
+	<param>--with-system-zlib</param>
+	<param>--with-system-png</param>
+	<param>--enable-application=browser</param>
+	<param>--enable-default-toolkit=gtk2</param>
+	<param>--enable-extensions=all,-typeaheadfind</param>
+	<param>--enable-crypto</param>
+	<param>--enable-xft</param>
+	<param>--enable-xinerama</param>
+	<param>--enable-optimize</param>
+	<param>--enable-reorder</param>
+	<param>--enable-strip</param>
+	<param>--enable-cpp-rtti</param>
+	<param>--enable-single-profile</param>
+	<param>--disable-freetype2</param>
+	<param>--disable-accessibility</param>
+	<param>--disable-debug</param>
+	<param>--disable-tests</param>
+	<param>--disable-logging</param>
+	<param>--disable-pedantic</param>
+	<param>--disable-installer</param>
+	<param>--disable-mailnews</param>
+	<param>--disable-ldap</param>
+	<param>--disable-composer</param>
+	<param>--disable-profilesharing</param>
       </configure>
       <make />
       <make>
         <param>install</param>
       </make>
-      <link>
-        <option>force</option>
-        <target>/opt/firefox-&firefox-version;/bin/firefox</target>
-        <name>/usr/bin/MozillaFirefox</name>
-      </link>
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/include/firefox-&firefox-version;/nss</name>
+      </mkdir>
+      <execute command="cp">
+	<param>-Lf dist/private/nss/*.h dist/public/nss/*.h</param>
+	<param>/usr/include/firefox-&firefox-version;/nss</param>
+      </execute>
       <stage name="Multi-User Operation Setup">
         <stageinfo>
           <environment>
-            <variable name="LD_LIBRARY_PATH">/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
-            <variable name="MOZILLA_FIVE_HOME">/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</variable>
+            <variable name="LD_LIBRARY_PATH">/usr/lib/firefox-&firefox-version;</variable>
+            <variable name="MOZILLA_FIVE_HOME">/usr/lib/firefox-&firefox-version;</variable>
           </environment>
-          <base>/opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version;</base>
+          <base>/usr/lib/firefox-&firefox-version;/</base>
         </stageinfo>
         <execute command="./regxpcom" />
         <execute command="./regchrome" />
-        <execute command="touch `find /opt/firefox-&firefox-version;/lib/mozilla-&firefox-moz-lib-version; -name *.rdf`" />
+        <execute command="touch `find . -name *.rdf`" />
       </stage>
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter35/galeon.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/galeon.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter35/galeon.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -22,6 +22,12 @@
       <requires>
         <name>mozilla</name>
       </requires>
+      <utilizes>
+	<name>nautilus</name>
+      </utilizes>
+      <utilizes>
+	<name>libgtkhtml</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter35/mozilla.xml
===================================================================
--- profiles/BLFS/trunk/chapter35/mozilla.xml	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/chapter35/mozilla.xml	2005-02-09 02:24:28 UTC (rev 1730)
@@ -22,12 +22,27 @@
       <requires>
         <name>libidl</name>
       </requires>
-      <requires>
-        <name>libmng</name>
-      </requires>
-      <requires>
-        <name>which</name>
-      </requires>
+      <utilizes>
+	<name>gnupg</name>
+      </utilizes>
+      <utilizes>
+	<name>libjpeg</name>
+      </utilizes>
+      <utilizes>
+	<name>unzip</name>
+      </utilizes>
+      <utilizes>
+	<name>gnome-vfs2</name>
+      </utilizes>
+      <utilizes>
+	<name>libart-lgpl</name>
+      </utilizes>
+      <utilizes>
+	<name>&krb-impl;</name>
+      </utilizes>
+      <utilizes>
+	<name>doxygen</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -46,29 +61,35 @@
       <configure>
         <param>--prefix=/usr</param>
         <param>--with-default-mozilla-five-home=/usr/lib/mozilla</param>
-        <param>--enable-default-toolkit=gtk2</param>
-        <param>--with-x</param>
         <param>--with-system-zlib</param>
-        <param>--with-system-jpeg</param>
         <param>--with-system-png</param>
-        <param>--with-system-mng</param>
-        <param>--enable-xft</param>
-        <param>--enable-crypto</param>
-        <param>--disable-accessibility</param>
-        <param>--disable-tests</param>
-        <param>--disable-debug</param>
-        <param>--disable-logging</param>
-        <param>--enable-reorder</param>
-        <param>--enable-strip</param>
-        <param>--disable-pedantic</param>
-        <param>--enable-cpp-rtti</param>
-        <param>--enable-extensions=all</param>
+	<param>--enable-application=suite</param>
+        <param>--enable-default-toolkit=gtk2</param>
+	<param>--enable-extensions=all</param>
+	<param>--enable-crypto</param>
+	<param>--enable-xft</param>
+	<param>--enable-xinerama</param>
+	<param>--enable-optimize</param>
+	<param>--enable-reorder</param>
+	<param>--enable-strip</param>
+	<param>--enable-cpp-rtti</param>
+	<param>--enable-calendar</param>
+	<param>--disable-freetype2</param>
+	<param>--disable-accessibility</param>
+	<param>--disable-debug</param>
+	<param>--disable-tests</param>
+	<param>--disable-logging</param>
+	<param>--disable-pedantic</param>
+	<param>--disable-installer</param>
       </configure>
       <make />
       <make>
         <param>install</param>
       </make>
-      <execute command="install -d /usr/include/mozilla-&mozilla-version;/nss" />
+      <mkdir>
+	<option>parents</option>
+	<name>/usr/include/mozilla-&mozilla-version;/nss</name>
+      </mkdir>
       <execute command="cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/mozilla-&mozilla-version;/nss" />
       <execute command="ln -nsf mozilla-&mozilla-version; /usr/include/mozilla" />
       <execute command="ln -nsf mozilla-&mozilla-version; /usr/lib/mozilla" />
@@ -105,7 +126,7 @@
         </stageinfo>
         <execute command="./regxpcom" />
         <execute command="./regchrome" />
-        <execute command="touch `find /usr/lib/mozilla-&mozilla-version; -name *.rdf`" />
+        <execute command="touch `find . -name *.rdf`" />
       </stage>
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/config_standard/packages/ch35.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch35.ent	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/config_standard/packages/ch35.ent	2005-02-09 02:24:28 UTC (rev 1730)
@@ -1,18 +1,17 @@
 <!--************* packages for chapter 35 *************-->
 
-<!ENTITY mozilla-version   "1.6">
+<!ENTITY mozilla-version   "1.7.5">
 <!ENTITY mozilla-package   "mozilla-source-&mozilla-version;.tar.bz2">
 <!ENTITY mozilla-directory "mozilla">
 
-<!ENTITY firefox-version "0.8">
-<!ENTITY firefox-moz-lib-version "1.6">
+<!ENTITY firefox-version "1.0">
 <!ENTITY firefox-package "firefox-source-&firefox-version;.tar.bz2">
 <!ENTITY firefox-directory "mozilla">
 
-<!ENTITY galeon-version   "1.3.14a">
+<!ENTITY galeon-version   "1.3.18">
 <!ENTITY galeon-package   "galeon-&galeon-version;.tar.bz2">
-<!ENTITY galeon-directory "galeon-1.3.14">
+<!ENTITY galeon-directory "galeon-&galeon-version;">
 
-<!ENTITY dillo-version   "0.8.1">
+<!ENTITY dillo-version   "0.8.4">
 <!ENTITY dillo-package   "dillo-&dillo-version;.tar.bz2">
 <!ENTITY dillo-directory "dillo-&dillo-version;">

Modified: profiles/BLFS/trunk/wget/chapter35.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter35.urls	2005-02-09 01:46:05 UTC (rev 1729)
+++ profiles/BLFS/trunk/wget/chapter35.urls	2005-02-09 02:24:28 UTC (rev 1730)
@@ -1,8 +1,4 @@
-ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.6/src/mozilla-source-1.6.tar.bz2
-
-ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2
-
-http://umn.dl.sourceforge.net/sourceforge/galeon/galeon-1.3.14a.tar.bz2
-
-ftp://distro.ibiblio.org/pub/Linux/distributions/sorcerer/sources/dillo/0.8.1/dillo-0.8.1.tar.bz2
-http://www.dillo.org/download/dillo-0.8.2.tar.bz2
+ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/mozilla-source-1.7.5.tar.bz2
+ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/source/firefox-1.0-source.tar.bz2
+http://voxel.dl.sourceforge.net/sourceforge/galeon/galeon-1.3.18.tar.bz2
+ftp://distro.ibiblio.org/pub/Linux/distributions/sorcerer/sources/dillo/0.8.4/dillo-0.8.4.tar.bz2




More information about the alfs-log mailing list