cvs commit: BLFS/BOOK/xsoft/suites/openoffice openoffice-inst.xml

larry at linuxfromscratch.org larry at linuxfromscratch.org
Thu Oct 24 17:00:54 PDT 2002


larry       02/10/24 17:00:54

  Modified:    BOOK     index.xml
               BOOK/introduction/welcome changelog.xml
               BOOK/x/lib/qt qt-exp.xml qt-inst.xml qt.ent
               BOOK/xsoft/graphweb/mozilla mozilla-exp.xml mozilla-inst.xml
                        mozilla-intro.xml mozilla.ent
               BOOK/xsoft/suites/openoffice openoffice-inst.xml
  Log:
  update to qt-3.0.6, openoffice inst correction, move prefix of mozilla to /usr
  
  Revision  Changes    Path
  1.88      +2 -2      BLFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/index.xml,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- index.xml	22 Oct 2002 22:22:19 -0000	1.87
  +++ index.xml	25 Oct 2002 00:00:54 -0000	1.88
  @@ -2,8 +2,8 @@
   <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
   			"/usr/share/docbook/docbookx.dtd" [
   
  -<!ENTITY version "20021022">
  -<!ENTITY releasedate "October 22nd, 2002">
  +<!ENTITY version "20021024">
  +<!ENTITY releasedate "October 24th, 2002">
   
   <!ENTITY % book SYSTEM "book/book.ent">
   <!ENTITY % preface SYSTEM "preface/preface.ent">
  
  
  
  1.216     +9 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- changelog.xml	22 Oct 2002 22:22:20 -0000	1.215
  +++ changelog.xml	25 Oct 2002 00:00:54 -0000	1.216
  @@ -10,6 +10,15 @@
   
   <itemizedlist>
   
  +<listitem><para>October 24th, 2002 [larry]: Xsoft: Changed prefix on
  +Mozilla to /usr now that make install behaves itself.</para></listitem>
  +
  +<listitem><para>October 24th, 2002 [larry]: X: Updated to
  +qt-3.0.6.</para></listitem>
  +
  +<listitem><para>October 24th, 2002 [billyoc]: Content: Updated to
  +Postgres-7.2.3.</para></listitem>
  +
   <listitem><para>October 22nd, 2002 [larry]: Expanded Gnome Chapter
   introduction.</para></listitem>
   
  
  
  
  1.4       +6 -5      BLFS/BOOK/x/lib/qt/qt-exp.xml
  
  Index: qt-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-exp.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- qt-exp.xml	22 Sep 2002 16:01:27 -0000	1.3
  +++ qt-exp.xml	25 Oct 2002 00:00:54 -0000	1.4
  @@ -18,14 +18,15 @@
   <para><userinput>-thread :</userinput> This command compiles the library
   to support multi-threading.</para>
   
  -<para><userinput>sed 's/[^-]strip/# strip/' src/Makefile.bak > src/Makefile :</userinput> This command comments out the strip commands
  -in the <filename>src/Makefile</filename> which try to strip
  -directories.</para>
  -
  -
   <para><userinput>ln -sf /opt/qt-&qt-version; /opt/qt :</userinput> This command
   standardizes the location of the qt libraries to the ld.so.conf entry
   described below.</para>
  +
  +<para><userinput>cp -r doc/man /opt/qt/doc :</userinput> This command
  +installs the man directory which is missed by make install.</para>
  +
  +<para><userinput>cp -r examples /opt/qt/doc :</userinput> This command
  +installs the examples directory which is missed by make install.</para>
   
   </sect2>
   
  
  
  
  1.4       +4 -6      BLFS/BOOK/x/lib/qt/qt-inst.xml
  
  Index: qt-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-inst.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- qt-inst.xml	21 Sep 2002 21:43:45 -0000	1.3
  +++ qt-inst.xml	25 Oct 2002 00:00:54 -0000	1.4
  @@ -6,19 +6,17 @@
      -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
      -thread &&
   make &&
  -cp src/Makefile src/Makefile.bak &&
  -sed 's/[^-]strip/# strip/' src/Makefile.bak > src/Makefile &&
   make install &&
   ln -sf /opt/qt-&qt-version; /opt/qt &&
  -cp -r doc/man /opt/qt/doc</userinput></screen></para>
  +cp -r doc/man /opt/qt/doc &&
  +cp -r examples /opt/qt/doc</userinput></screen></para>
   
   <note><para>
  -The build time for qt is quite long.  If you want to save some time and don't want the 
  -tutorials and examples, change the first make line above to:
  +The build time for qt is quite long.  If you want to save some time and don't want the tutorials and examples, change the first make line above to:
   </para>
   
   <para>
  -<userinput>make symlinks src-qmake src-moc sub-src sub-tools</userinput>
  +<userinput>make sub-tools</userinput>
   </para>
   </note>
   
  
  
  
  1.5       +4 -4      BLFS/BOOK/x/lib/qt/qt.ent
  
  Index: qt.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- qt.ent	25 Sep 2002 00:35:33 -0000	1.4
  +++ qt.ent	25 Oct 2002 00:00:54 -0000	1.5
  @@ -6,8 +6,8 @@
   <!ENTITY qt-exp SYSTEM "qt-exp.xml">
   <!ENTITY qt-desc SYSTEM "qt-desc.xml">
   <!ENTITY qt-config SYSTEM "qt-config.xml">
  -<!ENTITY qt-buildsize "149 MB">
  -<!ENTITY qt-version "3.0.5">
  +<!ENTITY qt-buildsize "144 MB">
  +<!ENTITY qt-version "3.0.6">
   <!ENTITY qt-download-http "">
  -<!ENTITY qt-download-ftp "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.5.tar.bz2">
  -<!ENTITY qt-size "15.7 MB">
  +<!ENTITY qt-download-ftp "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.6.tar.bz2">
  +<!ENTITY qt-size "13 MB">
  
  
  
  1.3       +8 -1      BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-exp.xml
  
  Index: mozilla-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-exp.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mozilla-exp.xml	23 Sep 2002 14:58:13 -0000	1.2
  +++ mozilla-exp.xml	25 Oct 2002 00:00:54 -0000	1.3
  @@ -8,6 +8,12 @@
   specify that we are building a distribution. The last export specifies that we
   are ok with the LGPL versioned libart.</para>
   
  +<para><userinput>--prefix=&mozilla-prefix;</userinput>: Previously mozilla did
  +not support the make install option. Hence the package was installed in /opt.
  +The package now supports "make install" and follows the FHS guidelines for
  +installation. Hence the book now recommends installation in a system wide prefix
  +such as /usr.</para>
  +
   <para><screen><userinput>--with-system-zlib --with-system-jpeg \
   --with-system-png --with-system-mng"</userinput></screen>
   Use the system versions for these packages.</para>
  @@ -48,7 +54,8 @@
   <para><userinput>ln -nsf mozilla-&mozilla-version; ...</userinput>:
   Mozilla installs headers and libraries in version specific directories. This
   link makes symbolic links so that applications that depend on Mozilla (such as
  -OpenOffice, Galeon, etc.) can use a non version specific path for installation.
  +OpenOffice, Galeon, etc.) don't need to know which version of mozilla is
  +installed.
   </para>
   
   <para><userinput>ln -sf mozilla &mozilla-prefix;/bin/netscape</userinput>: Since 
  
  
  
  1.5       +2 -3      BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-inst.xml
  
  Index: mozilla-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-inst.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mozilla-inst.xml	24 Sep 2002 03:08:45 -0000	1.4
  +++ mozilla-inst.xml	25 Oct 2002 00:00:54 -0000	1.5
  @@ -11,7 +11,7 @@
   rm -rf spellcheck &&
   tar -xjf ../../mozilla-&mozilla-version;-spellchecker.tar.bz2 &&
   cd .. &&
  -patch -Np1 -i mozilla-&mozilla-version;.patch &&
  +patch -Np1 -i ../mozilla-&mozilla-version;.patch &&
   ./configure --prefix=&mozilla-prefix; \
               --enable-default-mozilla-five-home \
               --with-x --with-system-zlib \
  @@ -35,8 +35,7 @@
      dist/lib/libmozreg_s.a &mozilla-prefix;/lib/mozilla-&mozilla-version;/openoffice &&
   ln -nsf mozilla-&mozilla-version; &mozilla-prefix;/include/mozilla &&
   ln -nsf mozilla-&mozilla-version; &mozilla-prefix;/lib/mozilla &&
  -ln -sf &mozilla-prefix;/bin/mozilla /usr/bin/mozilla &&
  -ln -sf &mozilla-prefix;/bin/mozilla /usr/bin/netscape &&
  +ln -sf mozilla &mozilla-prefix;/bin/netscape &&
   cd &mozilla-prefix;/lib/mozilla-&mozilla-version; &&
   export LD_LIBRARY_PATH="&mozilla-prefix;/lib/mozilla-&mozilla-version;" &&
   export MOZILLA_FIVE_HOME="&mozilla-prefix;/lib/mozilla-&mozilla-version;" &&
  
  
  
  1.5       +6 -8      BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-intro.xml
  
  Index: mozilla-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/graphweb/mozilla/mozilla-intro.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mozilla-intro.xml	4 Oct 2002 19:25:58 -0000	1.4
  +++ mozilla-intro.xml	25 Oct 2002 00:00:54 -0000	1.5
  @@ -16,17 +16,15 @@
   stable mozilla releases.</para>
   
   <screen>mozilla depends on:
  -<xref linkend="freetype2"/>, <xref linkend="xfree86"/>, <xref linkend="zip"/>, 
  -<xref linkend="GLib"/>, <xref linkend="GTK"/>,
  -<xref linkend="ORBit"/>, <xref linkend="lcms"/>,
  -<xref linkend="libjpeg"/>, <xref linkend="libmng"/>,
  -<xref linkend="libpng"/>. <xref linkend="which"/></screen>
  +<xref linkend="freetype2"/>, <xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref linkend="GLib"/>, <xref linkend="GTK"/>,
  +<xref linkend="ORBit"/>, <xref linkend="lcms"/>, <xref linkend="libjpeg"/>, <xref linkend="libmng"/>, <xref linkend="libpng"/>. 
  +<xref linkend="which"/></screen>
   
   <para>Download the patch for various minor fixes to the build.
   <screen><ulink url="&ffile-root;/mozilla-1.0.1.patch.bz2"/></screen></para>
   
  -<para>Download the spellchecker (a Mozdev project). The above patch also enables
  -building of the spellcheker.
  +<para>Download the spellchecker (a Mozdev project). The above patch includes a
  +fix to add the spellchecker to the build.
   <screen><ulink url="&ffile-root;/mozilla-1.0.1-spellchecker.tar.bz2"/></screen>
   </para>
   
  @@ -34,6 +32,6 @@
   hint for detailed information at <ulink url="http://tushar.lfsforum.org"/>. 
   Individual patches are also available at the same location. The instructions 
   that follow install the entire suite. To select specific components, refer 
  -the hint.</para>
  +to the hint.</para>
   
   </sect2>
  
  
  
  1.4       +1 -1      BLFS/BOOK/xsoft/graphweb/mozilla/mozilla.ent
  
  Index: mozilla.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/graphweb/mozilla/mozilla.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mozilla.ent	23 Sep 2002 14:58:13 -0000	1.3
  +++ mozilla.ent	25 Oct 2002 00:00:54 -0000	1.4
  @@ -6,7 +6,7 @@
   <!ENTITY mozilla-config SYSTEM "mozilla-config.xml">
   <!ENTITY mozilla-buildsize "550 MB">
   <!ENTITY mozilla-version "1.0.1">
  -<!ENTITY mozilla-prefix "/opt/mozilla">
  +<!ENTITY mozilla-prefix "/usr">
   <!ENTITY mozilla-download-http "http://ftp.mozilla.org/pub/mozilla/releases/mozilla1.0.1/src/mozilla-source-1.0.1.tar.bz2">
   <!ENTITY mozilla-download-ftp "ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla1.0.1/src/mozilla-source-1.0.1.tar.bz2">
   <!ENTITY mozilla-size "39 MB">
  
  
  
  1.2       +1 -0      BLFS/BOOK/xsoft/suites/openoffice/openoffice-inst.xml
  
  Index: openoffice-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/suites/openoffice/openoffice-inst.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openoffice-inst.xml	13 Sep 2002 13:06:04 -0000	1.1
  +++ openoffice-inst.xml	25 Oct 2002 00:00:54 -0000	1.2
  @@ -19,6 +19,7 @@
   chmod +x solenv/bin/zipdep.pl &&
   tcsh -c "source LinuxIntelEnv.Set; ./bootstrap" &&
   tcsh -c "source LinuxIntelEnv.Set; dmake" &&
  +cd instsetoo/unxlngi4.pro/01/normal &&
   ./install --prefix=/opt &&
   for appl in swriter scalc sdraw simpress smath soffice; do \
   ln -sf /opt/openoffice/program/$appl /usr/X11R6/bin/$appl; done
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe blfs-book' in the subject header of the message



More information about the blfs-book mailing list