diff --git a/general.ent b/general.ent index 70141256a5..be78ecc927 100644 --- a/general.ent +++ b/general.ent @@ -1,4 +1,4 @@ - + @@ -466,7 +466,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 957c37e82a..fa163996b8 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + November 15th, 2005 + + + [dj] - Updated to OpenOffice-2.0.0 + + + + November 14th, 2005 diff --git a/xsoft/suites/openoffice.xml b/xsoft/suites/openoffice.xml index ad485e9f38..ac6cb2c8d0 100644 --- a/xsoft/suites/openoffice.xml +++ b/xsoft/suites/openoffice.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -57,7 +57,7 @@ Additional Downloads - Required patch for gcc-&gcc-version;: Required patch for use with gcc-&gcc-version;: @@ -66,64 +66,82 @@ url="&patch-root;/OOo_&openoffice-version;-nptl-1.patch"/> - Required patch if compiling with + Required patch for use with JDK-&jdk-src-version;: - - Required patch for STLport-4.6.2: - - - Required patch for use with glibc-2.3.5: - Optional patch if you wish to use the system freetype: + + + + + + Required update for use with + JDK-&jdk-src-version;. + + + + Optional download if not using the system + Mozilla + + browser. + OpenOffice Dependencies Required - X ( or ), - , + , , - , and - . + , + , + , + , + , + , + , + , and + . Recommended - , - , - , + , , , - , , and - . + , + , and + . Optional - and - . + , + , + , + neon-0.25.4, + , + , and + + . @@ -136,26 +154,48 @@ do patch -Np1 -i ${PATCH} done - Copy the STLport TAR ball into the source tree: + Copy the Beanshell TAR ball into the + source tree and uncompress it: -cp ../STLport-4.6.2.tar.gz stlport/download/ +cp ../bsh-2.0b4.tar.bz2 beanshell/download/ && +bzip2 -d beanshell/download/bsh-2.0b4.tar.bz2 - STLport looks for the c++ headers in the wrong location. Put a - temporary symlink in place to satisfy STLport: + If not using the system-installed Mozilla + or Firefox, copy the + Mozilla source TAR ball into the source + tree: - As the root user: - -ln -sf /usr/include/c++/&gcc-version; /usr/g++-v3 +cp ../mozilla-1.7.5.tar.gz moz/download/ If you want to optimize the build, edit - solenv/inc/unxlngi4.mk and add the desired optimization + solenv/inc/unxlngi6.mk and add the desired optimization flags to the CFLAGSOPT variable. Some users have reported problems with . The best option is to not use any custom optimizations. The following command removes an incorrect option in the above file: sed -i "s:\-mcpu=pentiumpro::" \ - solenv/inc/unxlngi4.mk + solenv/inc/unxlngi6.mk + + + + If you have previously installed Mozilla + + a change + may be needed to the installed headers. As the root user, use these + commands to make the change if needed. + + +cd /usr/include/mozilla-&mozilla-version; && +grep "xptinfo_enum_1" xpcom/xptinfo.h || \ + sed -i 's@enum@enum xptinfo_enum_1@' xpcom/xptinfo.h + + + Configure OpenOffice using the following commands. You may build install sets for specific languages based on your @@ -165,13 +205,34 @@ done If you need other languages, be sure to add ENUS to the list; otherwise the build will fail: + + + If you intend to use the system-installed + Mozilla, replace the + --enable-build-mozilla switch with + --with-system-mozilla. + cd config_office/ && -./configure --with-lang=ENUS \ - --with-dict=ENUS --without-fonts \ - --enable-libsn --with-system-zlib \ - --with-system-freetype \ - --with-system-curl --disable-fontooo \ - --enable-libart && +./configure --prefix=/opt/openoffice-2.0.0 \ + --enable-libart --enable-libsn \ + --disable-fontooo --without-fonts \ + --with-system-stdlibs --with-system-freetype \ + --with-system-zlib --with-system-jpeg \ + --with-system-expat --with-system-libxml \ + --with-system-curl --enable-build-mozilla \ + --with-build-version=BLFS \ + --with-package-format=native --disable-binfilter && cd .. OpenOffice fails to compile if @@ -190,31 +251,31 @@ unset LANG LC_ALL . LinuxIntelEnv.Set.sh && dmake - If you have downloaded localized help content tgz - files, you will need to untar them to the appropriate directory as shown - below and then recreate the installation set: + Install OpenOffice as the + root user with the + following commands: -for i in ../helpcontent_*_unix.tgz - do tar -C solver/645/unxlngi4.pro/pck -zxf $i - done && -rm -rf instsetoo/unxlngi4.pro && -bash -c "source LinuxIntelEnv.Set.sh ; dmake" +cd instsetoo_native/unxlngi6.pro/OpenOffice/\ +install/en-US/linux-2.6-intel/buildroot/opt && +cp -a openoffice.org2.0 /opt/openoffice-2.0.0 - Install OpenOffice using the following - commands to install the US English language set. To install a localized - version, replace the 01 with the international telephone country code for - your country: + Still as the root + user: -cd instsetoo/unxlngi4.pro/01/normal && -sed -i "s:^oo_home=.*:oo_home=openoffice:" install +for appl in sbase scalc sdraw simpress smath soffice spadmin swriter +do + ln -v -sf /opt/openoffice-2.0.0/program/$appl /usr/bin/$appl +done - Now, as the root user: + The icons are not installed by default. While still the + root user, install the icons + with the following commands: -./install --prefix=/opt && -for appl in sagenda scalc sdraw sfax simpress slabel sletter \ - smaster smath smemo soffice spadmin svcard sweb swriter - do ln -v -sf /opt/openoffice/program/$appl /usr/bin/$appl - done +cd ../../../../../../../../sysui/desktop/icons && +install -v -d /usr/share/icons/{HighContrast,hicolor,locolor} -m755 && +cp -a HighContrast/*x* /usr/share/icons/HighContrast && +cp -a hicolor/*x* /usr/share/icons/hicolor && +cp -a locolor/*x* /usr/share/icons/locolor If you have installed and use KDE, there is no furthur configuration @@ -224,50 +285,80 @@ for appl in sagenda scalc sdraw sfax simpress slabel sletter \ commands as the root user: install -v -d /usr/share/applications -m 755 && -cp -v /opt/openoffice/share/gnome/net/ooo645*.desktop \ - /usr/share/applications/ && -rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop +cd /opt/openoffice-2.0.0/share/xdg/ && +for appl in *.desktop +do + sed -i '/Exec/d' $appl + echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl + sed -i '/Icon/d' $appl + echo "Icon=`echo $appl | sed 's/.desktop//'`" >> $appl +done && +sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop && +cp *.desktop /usr/share/applications + + Finally, if you'd like to edit OpenOffice + documents directly from Mozilla or + Firefox, create a symbolic link in your + plugins directory to + /opt/openoffice-2.0.0/program/libnpsoplugin.so. + Additionally, you must enable the plugin from the + Internet Options within any + OpenOffice application. Command Explanations - --with-lang=ENUS: Make install set for the - US English language. - - --with-dict=ENUS: Install dictionaries for - the US English language. - --enable-libart: Use libart instead of gpc for polygon clipping. --enable-libsn: Use startup-notification. + --disable-fontooo: Use + Fontconfig instead of FontOOo. + --without-fonts: Do not install Bitstream Vera - fonts since they are already bundled with X. + fonts since they are already bundled with + X. - --with-system-curl: Use the system - installed curl. + --with-system-*: Use the system libraries + and programs instead of building the packagees included in the build + tree. - : Do not build components that need - java. + --enable-build-mozilla: Build the in-tree + Mozilla suite. - : Do not use gpc. Removes polygon - clipping capability. + --with-build-version=BLFS: + appends "BLFS" to the end of the version string. - ./bootstrap: Create packages required to bootstrap - the build. + --with-package-format=native: diables the + build of RPM packages. + + --disable-binfilter: disables the build of + legacy StarOffice-5 import filters. + + --with-firefox: enables the use of + Firefox in place of the full + Mozilla suite. This will disable the use + of a Thunderbird address book as a data + source. + + --with-lang=[LANG]: + Make install set for the desired language. ENUS is the default. + + --with-dict=[LANG]: + Install dictionaries for the desired language. ENUS is the default. + + ./bootstrap: Build the + dmake utility required to complete the + build. dmake: Compile the package. - sed -i "s:^oo_home=...: Remove version specific - installation directory. - - for appl in sagenda scalc sdraw sfax ...; - do ...: Create links so that the package can be started from the - command-line without changes to the existing path. + for appl in *.desktop...: Edit the *.desktop + files for use with a standard BLFS system. @@ -280,11 +371,9 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktopInstalled Directory - sagenda, scalc, sdraw, sfax, simpress, slabel, - sletter, smaster, smath, smemo, soffice, spadmin, - svcard, sweb, swriter, and support utilities + scalc, sdraw, simpress, smath, soffice, spadmin, and swriter. OpenOffice libraries - /opt/openoffice + /opt/openoffice-2.0.0 @@ -293,13 +382,12 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop - - sagenda + + sbase - create an agenda template and start - swriter. - - sagenda + database application. + + sbase @@ -324,17 +412,6 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop - - sfax - - create a fax template and start - swriter. - - sfax - - - - simpress @@ -345,38 +422,6 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop - - slabel - - create a label template and start - swriter. - - slabel - - - - - - sletter - - create a letter template and start - swriter. - - sletter - - - - - - smaster - - creates a new master document. - - smaster - - - - smath @@ -387,17 +432,6 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop - - smemo - - create a memo template and start - swriter. - - smemo - - - - soffice @@ -421,26 +455,6 @@ rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop - - svcard - - business card application. - - svcard - - - - - - sweb - - an HTML editor. - - sweb - - - - swriter