[Lunar-commits] <moonbase> openoffice-src: The same GObject patch is needed for the x86 BUILD, also doing a little consolidation.
Dennis 'stumbles' Veatch
stumbles at lunar-linux.org
Thu Feb 26 15:12:36 CET 2009
commit 161269598783364bd30606e16c9e4377e4240ff7
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date: Thu Feb 26 09:12:36 2009 -0500
openoffice-src: The same GObject patch is needed for the x86 BUILD, also doing
a little consolidation.
---
x11-apps/openoffice-src/BUILD | 94 +++++++++++++++-------------
x11-apps/openoffice-src/DEPENDS | 51 ++++++++-------
x11-apps/openoffice-src/DEPENDS.x86_64 | 102 ------------------------------
x11-apps/openoffice-src/DETAILS | 8 +-
x11-apps/openoffice-src/PRE_BUILD | 3 +-
x11-apps/openoffice-src/PRE_BUILD.x86_64 | 8 ---
6 files changed, 82 insertions(+), 184 deletions(-)
diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index 89e6a8a..db60d97 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -1,12 +1,22 @@
-(
+(
+
+ patch_it $SOURCE_CACHE/$SOURCE8 0 &&
if module_installed qt3; then
- . /etc/profile.d/qt3.rc
- fi &&
+ . /etc/profile.d/qt3.rc
+ fi &&
if module_installed kdelibs3; then
- . /etc/profile.d/kde3.rc
- fi &&
+ . /etc/profile.d/kde3.rc
+ fi &&
+
+ if module_installed qt4; then
+ . /etc/profile.d/qt4.rc
+ fi &&
+
+ if module_installed kdelibs4; then
+ . /etc/profile.d/kde4.rc
+ fi &&
. /etc/profile.d/pkgconfig.rc &&
@@ -16,56 +26,54 @@
# There are symlinks left over if openoffice-bin is installed and
# they do not get removed and the BUILD will tank near the end of
- # the compile, this takes care of that.
- for FILE in ${RM_DESK_TOP} ; do
- rm -f /usr/share/applications/${FILE}.desktop || exit 1
- done &&
+ # the compile, this takes care of that.
+ for FILE in ${RM_DESK_TOP} ; do
+ rm -f /usr/share/applications/${FILE}.desktop || exit 1
+ done &&
sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,6}.mk &&
- ARCH_FLAGS=$CXXFLAGS
+ ARCH_FLAGS=$CXXFLAGS
# All of the options have been carefully chosen. Don't edit them unless you
- # really know what you're doing
+ # really know what you're doing
OPTS="$OPTS --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
- --disable-fontooo --disable-odk --disable-debug --enable-opengl \
- --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
- --enable-mozilla --enable-binfilter --enable-xrender-link \
- --without-fonts --without-ppds --without-afms \
- --with-system-stdlibs --with-system-zlib --enable-minimizer \
- --with-system-jpeg --with-system-expat --with-system-freetype \
- --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
- --with-system-xrender-headers --with-epm=internal --enable-pdfimport \
- --with-use-shell=bash --with-x --with-package-format=native \
- --with-build-version=LunarLinux --enable-presenter-console \
- --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
- --with-system-cairo --with-lang=en --with-dict=ENUS" &&
+ --disable-fontooo --disable-odk --disable-debug --enable-opengl \
+ --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
+ --enable-mozilla --enable-binfilter --enable-xrender-link \
+ --without-fonts --without-ppds --without-afms \
+ --with-system-stdlibs --with-system-zlib --enable-minimizer \
+ --with-system-jpeg --with-system-expat --with-system-freetype \
+ --with-system-libxml --with-system-db --disable-symbols --enable-Xaw \
+ --with-system-xrender-headers --with-epm=internal --enable-pdfimport \
+ --with-use-shell=bash --with-x --with-package-format=native \
+ --with-build-version=LunarLinux --enable-presenter-console \
+ --enable-wiki-publisher --enable-ogltrans --enable-report-builder \
+ --with-system-cairo --with-lang=en --with-dict=ENUS" &&
if module_installed sane-backends ; then
OPTS="$OPTS --with-system-sane-header";
- fi &&
-
- if module_installed sun-jdk; then
- # hsqldb 3rdparty compilation fault will break OO build
- # we can pull out hsqldb 1.9.0 from svn,
- # or downgrade JDK to 1.5 only for OO build:
- cd $SOURCE_DIRECTORY;
- chmod +x $SOURCE8;
- ./$SOURCE8 --accept-license --unpack;
- OPTS="$OPTS --with-jdk-home=$SOURCE_DIRECTORY/jdk1.5.0_17";
- else
- JAVA_VERSION="`installed_version j2sdk`";
+ fi &&
+
+ if module_installed sun-jdk ; then
+ JAVA_VERSION="`installed_version sun-jdk`";
+ OPTS="$OPTS --with-jdk-home=/usr/lib/jdk${JAVA_VERSION}";
+ elif module_installed j2sdk ; then
+ JAVA_VERSION="`installed_version j2sdk`";
OPTS="$OPTS --with-jdk-home=/usr/lib/j2sdk${JAVA_VERSION}";
- fi &&
+ elif module_installed sun-jre ; then
+ JAVA_VERSION="`installed_version sun-jre`";
+ OPTS="$OPTS --with-jdk-home=/usr/lib/jre${JAVA_VERSION}";
+ fi &&
# Apply mandatory and optional patches
patch_it $SOURCE2 0 &&
# As long as OOo-src does not compile against nss it needs its own mozilla
- # tarball (and it also compiles its own mozilla)
- mkdir -p $SOURCE_DIRECTORY/moz/download &&
- cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
+ # tarball (and it also compiles its own mozilla)
+ mkdir -p $SOURCE_DIRECTORY/moz/download &&
+ cp $SOURCE_CACHE/$SOURCE3 $SOURCE_DIRECTORY/moz/download/ &&
cd $SOURCE_DIRECTORY/config_office &&
@@ -73,15 +81,15 @@
default_config &&
# OOo might fail if those are set to some strange values
- umask 0022 &&
- unset LANG LC_ALL &&
+ umask 0022 &&
+ unset LANG LC_ALL &&
cd $SOURCE_DIRECTORY &&
./bootstrap &&
sedit "s/-lxml2/-lxml2\ -lexpat/g" LinuxX86Env.Set.sh &&
- source LinuxX86Env.Set.sh &&
- dmake &&
+ source LinuxX86Env.Set.sh &&
+ dmake &&
prepare_install &&
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 2a3ffa8..96b48b9 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -1,24 +1,25 @@
-depends apache-ant
-depends libIDL
-depends XML-Parser
-depends libxml2
-depends gtk+-2
-depends Archive-Zip
-depends Compress-Zlib
-depends unzip
-depends zip
-depends which
-depends desktop-file-utils
-depends hicolor-icon-theme
-depends IO-Compress-Zlib
-depends gperf
-depends jpeg
-depends expat
+depends %JAVA_SDK
+depends apache-ant
+depends libIDL
+depends XML-Parser
+depends libxml2
+depends gtk+-2
+depends Archive-Zip
+depends Compress-Zlib
+depends unzip
+depends zip
+depends which
+depends desktop-file-utils
+depends hicolor-icon-theme
+depends IO-Compress-Zlib
+depends gperf
+depends jpeg
+depends expat
optional_depends "libxslt" \
"--with-system-libxslt" \
"--without-system-libxslt" \
- "For xslt support"
+ "For xslt support"
optional_depends "sun-jdk" \
"--with-java" \
@@ -28,42 +29,42 @@ optional_depends "sun-jdk" \
optional_depends "openssl" \
"--with-system-openssl" \
"--without-system-openssl" \
- "For openssl support"
+ "For openssl support"
optional_depends "libwpd" \
"--with-system-libwpd" \
"--without-system-libwpd" \
- "For WordPerfect support"
+ "For WordPerfect support"
optional_depends "icu4c" \
"--with-system-icu" \
"--without-system-icu" \
- "For icu support"
+ "For icu support"
optional_depends "boost" \
"--with-system-boost" \
"--without-system-boost" \
- "For boost support"
+ "For boost support"
optional_depends "cups" \
"--enable-cups" \
"--disable-cups" \
- "enable the OpenOffice printing backend"
+ "enable the OpenOffice printing backend"
optional_depends "curl" \
"--with-system-curl" \
"--without-system-curl" \
- "to link against the system cURL library"
+ "to link against the system cURL library"
optional_depends "neon" \
"--enable-neon --with-system-neon" \
"--disable-neon" \
- "for webdav support"
+ "for webdav support"
optional_depends "openldap" \
"--with-openldap" \
"--disable-ldap" \
- "for LDAP support"
+ "for LDAP support"
optional_depends "Python" \
"--with-system-python" \
diff --git a/x11-apps/openoffice-src/DEPENDS.x86_64 b/x11-apps/openoffice-src/DEPENDS.x86_64
deleted file mode 100644
index 96b48b9..0000000
--- a/x11-apps/openoffice-src/DEPENDS.x86_64
+++ /dev/null
@@ -1,102 +0,0 @@
-depends %JAVA_SDK
-depends apache-ant
-depends libIDL
-depends XML-Parser
-depends libxml2
-depends gtk+-2
-depends Archive-Zip
-depends Compress-Zlib
-depends unzip
-depends zip
-depends which
-depends desktop-file-utils
-depends hicolor-icon-theme
-depends IO-Compress-Zlib
-depends gperf
-depends jpeg
-depends expat
-
-optional_depends "libxslt" \
- "--with-system-libxslt" \
- "--without-system-libxslt" \
- "For xslt support"
-
-optional_depends "sun-jdk" \
- "--with-java" \
- "--without-java" \
- "For java components, applets, XML filters support"
-
-optional_depends "openssl" \
- "--with-system-openssl" \
- "--without-system-openssl" \
- "For openssl support"
-
-optional_depends "libwpd" \
- "--with-system-libwpd" \
- "--without-system-libwpd" \
- "For WordPerfect support"
-
-optional_depends "icu4c" \
- "--with-system-icu" \
- "--without-system-icu" \
- "For icu support"
-
-optional_depends "boost" \
- "--with-system-boost" \
- "--without-system-boost" \
- "For boost support"
-
-optional_depends "cups" \
- "--enable-cups" \
- "--disable-cups" \
- "enable the OpenOffice printing backend"
-
-optional_depends "curl" \
- "--with-system-curl" \
- "--without-system-curl" \
- "to link against the system cURL library"
-
-optional_depends "neon" \
- "--enable-neon --with-system-neon" \
- "--disable-neon" \
- "for webdav support"
-
-optional_depends "openldap" \
- "--with-openldap" \
- "--disable-ldap" \
- "for LDAP support"
-
-optional_depends "Python" \
- "--with-system-python" \
- "--without-system-python" \
- "for native Python support"
-
-optional_depends "evolution-data-server" \
- "--enable-evolution2" \
- "--disable-evolution2" \
- "for Evolution addressbook support"
-
-optional_depends "gnome-vfs" \
- "--enable-gnome-vfs --enable-lockdown --enable-gio" \
- "--disable-gnome-vfs --disable-lockdown --disable-gio" \
- "for GNOME-vfs integration"
-
-optional_depends "kdelibs3" \
- "--enable-kde --enable-kdeab" \
- "--disable-kde --disable-kdeab" \
- "to enable KDE support"
-
-optional_depends "Linux-PAM" \
- "--enable-pam-link" \
- "--disable-pam" \
- "for Linux-PAM support"
-
-optional_depends "boost" \
- "--with-system-boost" \
- "--without-system-boost" \
- "to use the already installed boost"
-
-optional_depends "vigra" \
- "--with-system-vigra" \
- "--without-system-vigra" \
- "For generic algorithm support"
diff --git a/x11-apps/openoffice-src/DETAILS b/x11-apps/openoffice-src/DETAILS
index ea7f7bc..7f690fa 100644
--- a/x11-apps/openoffice-src/DETAILS
+++ b/x11-apps/openoffice-src/DETAILS
@@ -1,4 +1,4 @@
- MODULE=openoffice-src
+ MODULE=openoffice-src
VERSION=3.0.1
SOURCE=OOo_${VERSION}_src_core.tar.bz2
SOURCE2=$MODULE-2.2.0-xauth.patch
@@ -7,7 +7,7 @@
SOURCE5=OOo_${VERSION}_src_system.tar.bz2
SOURCE6=OOo_${VERSION}_src_extensions.tar.bz2
SOURCE7=OOo_${VERSION}_src_binfilter.tar.bz2
- SOURCE8=jdk-5.0u17-dlj-linux-i586.bin
+ SOURCE8=OO-3..0.1-kde-GObject.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
SOURCE_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE2_URL=$PATCH_URL/
@@ -16,7 +16,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
SOURCE5_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE6_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
SOURCE7_URL=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/stable/${VERSION}/
- SOURCE8_URL=http://download.java.net/dlj/binaries/
+ SOURCE8_URL=$PATCH_URL
SOURCE_VFY=sha1:2da6b2cf0b75873477f22cc9d69a4f0c8b43b435
SOURCE2_VFY=sha1:58c824ef969b017be5fcd7e4290d7681453aa354
SOURCE3_VFY=sha1:bb2a89b95d7626a63a3787208e0abb99ea595d24
@@ -24,7 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OOO300_m15
SOURCE5_VFY=sha1:8c73821b542c9c96b071550fe0e3e813e21a1246
SOURCE6_VFY=sha1:c695982d166422a838560ef7b134a5665bc61198
SOURCE7_VFY=sha1:d84518159538ef736271177b7ebe4697fc4b811d
- SOURCE8_VFY=sha1:d9f72fbb0aed5c27d7d40671a318597906771fd9
+ SOURCE8_VFY=sha1:b02c888b771b87d35a63a545810b396a340c87d2
WEB_SITE=http://www.openoffice.org
ENTERED=20030805
UPDATED=20090130
diff --git a/x11-apps/openoffice-src/PRE_BUILD b/x11-apps/openoffice-src/PRE_BUILD
index a062a26..2444d6b 100644
--- a/x11-apps/openoffice-src/PRE_BUILD
+++ b/x11-apps/openoffice-src/PRE_BUILD
@@ -5,5 +5,4 @@ cd $SOURCE_DIRECTORY &&
tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1 &&
-cp $SOURCE_CACHE/$SOURCE8 .
+tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1
diff --git a/x11-apps/openoffice-src/PRE_BUILD.x86_64 b/x11-apps/openoffice-src/PRE_BUILD.x86_64
deleted file mode 100644
index 621449b..0000000
--- a/x11-apps/openoffice-src/PRE_BUILD.x86_64
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-tar xf $SOURCE_CACHE/$SOURCE4 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE5 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE7 --strip-components=1 &&
-tar xf $SOURCE_CACHE/$SOURCE6 --strip-components=1
More information about the Lunar-commits
mailing list