Merge remote branch 'nutyx-2009/master'

1 files changed, 12 insertions, 78 deletions

diff --git a/extra/openoffice-3.2/Pkgfile b/extra/openoffice-3.2/Pkgfile
index 5df08319e..e37dce5a5 100644
--- a/extra/openoffice-3.2/Pkgfile
+++ b/extra/openoffice-3.2/Pkgfile
@@ -2,9 +2,7 @@
 # URL:         http://www.openoffice.org
 # Packager:    Sibelle at free dot fr
 # Maintainer:  NuTyX packager team
-# Depends on:  crypto++, xmlsec, bison, subversion, libart_lgpl, xorg-libxtst, linux-pam, sane, p5-archive-zip, xulrunner, ant, cairo, gperf, cups, poppler, gconf, curl, python, libwpd, redland, xorg-libxaw, neon, dbus-glib, icu, libxslt, hicolor-icon-theme, desktop-file-utils, openldap, lucene, boost, hunspell, hsqldb-java, beanshell, saxon, vigra, hyphen, lpsolve, libmspack, myodbc, libgraphite, qt, gtk2
-
-#pstoedit
+# Depends on:  crypto++, xmlsec, bison, libart_lgpl, xorg-libxtst, sane, p5-archive-zip, xulrunner, ant, cairo, gperf, cups, poppler, gconf, curl, python, libwpd, redland, xorg-libxaw, neon, dbus-glib, icu, libxslt, hicolor-icon-theme, desktop-file-utils, openldap, lucene, boost, hunspell, hsqldb-java, beanshell, saxon, vigra, hyphen, lpsolve, libmspack, myodbc, libgraphite, gtk, pstoedit
 
 name=openoffice
 version=3.2.0
@@ -33,7 +31,6 @@ build() {
 	install -D -m644 startcenter.desktop \
         	$PKG/usr/share/ede/programs/Applications/startcenter.desktop
 	source /etc/profile
-	mkdir -p $PKG/opt
 	mkdir -p $PKG/usr/bin
         mkdir -p $PKG/usr/share/icons
         mkdir -p $PKG/usr/share/applications
@@ -42,7 +39,7 @@ build() {
         unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
         [ -z "${JAVA_HOME}" ] && . /etc/profile
         JAVAHOME=${JAVA_HOME}
-        [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+        [ -z "${MOZ_PLUGIN_PATH}" ] && export MOZ_PLUGIN_PATH="/usr/lib/firefox/plugins"
         [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
 	# some speedups
@@ -55,20 +52,18 @@ build() {
         cd $OOdir
 
 	# build fixes
-	patch -Np0 -i ../buildfix-gcc44.diff
-        patch -Np0 -i ../buildfix_FormulaMissingHeader.diff
-        patch -Np0 -i ../buildfix_system_db48.diff
+#	patch -Np0 -i ../buildfix-gcc44.diff
+#        patch -Np0 -i ../buildfix_FormulaMissingHeader.diff
+#        patch -Np0 -i ../buildfix_system_db48.diff
 
 	# allows soffice to find the user's firefox profile so that it can read
         # its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 
-        patch -Np0 -i $SRC/soffice-detect-mozilla-certificates.diff
+#        patch -Np0 -i $SRC/soffice-detect-mozilla-certificates.diff
 
 	# remove the startup wizard
-        patch -Np0 -i $SRC/default-no-startup-wizard.diff
+#        patch -Np0 -i $SRC/default-no-startup-wizard.diff
         # enables the default system-file-picker in case we have that built
-        patch -Np0 -i $SRC/default-system-fpicker.diff
-
-	EXTRAOPTS="--with-stlport --without-system-graphite"
+#        patch -Np0 -i $SRC/default-system-fpicker.diff
 
 	cd $SRC/$OOdir
 
@@ -83,77 +78,16 @@ build() {
         # Need to recreate the configure script because of patches
         autoreconf -v
 
-	./configure --with-build-version="$version NuTyX $OOdir" \
-		--with-vendor="NuTyX"\
-	        --prefix=/usr --exec-prefix=/usr\
-	        --with-lang="fr"\
-	        --with-dict=ALL\
-	        --disable-gnome-vfs\
-	        --disable-qadevooo\
-	        --disable-reportdesign\
-	        --disable-systray\
-	        --disable-mathmldtd\
-	        --enable-binfilter\
-	        --enable-cairo\
-	        --enable-crashdump=yes\
-	        --enable-cups\
-	        --enable-dbus\
-	        --enable-evolution2\
-	        --enable-gio\
-	        --enable-gtk\
-	        --enable-graphite\
-	        --enable-ldap\
-	        --enable-lockdown\
-	        --enable-mediawiki\
-	        --enable-minimizer\
-	        --enable-odk\
-	        --enable-opengl\
-	        --enable-pdfimport\
-	        --enable-presenter-console\
-	        --enable-report-builder\
-	        --enable-vba\
-	        --enable-verbose\
-	        --enable-wiki-publisher\
-	        --with-package-format=native\
-	        --without-fonts\
-	        --without-afms\
-	        --without-gpc\
-	        --without-nas\
-	        --without-ppds\
-	        --without-system-agg\
-	        --without-system-lucene\
-	        --with-openldap\
-	        --with-system-stdlibs\
-	        --with-system-libs\
-	        --with-system-sane-header\
-	        --with-system-mozilla=libxul\
-	        --with-system-xrender-headers\
-	        --with-system-headers\
-	        --with-system-redland\
-	        --with-alloc=system\
-	        --with-jdk-home=${JAVA_HOME}\
-	        --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-	        --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-	        --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-	        --with-use-shell=bash\
-	         $EXTRAOPTS
-        
-#	umask 0022
-#	unset LANG LC_ALL
-
+./configure --with-build-version="$version NuTyX $OOdir" --with-vendor="NuTyX" --prefix=/usr --exec-prefix=/usr --with-lang="fr" --with-dict=ALL --disable-gnome-vfs --disable-qadevooo --disable-systray --disable-mathmldtd --enable-binfilter --enable-cairo --enable-crashdump=yes --enable-cups --enable-dbus --enable-evolution2 --enable-gio --enable-gtk --enable-graphite --enable-ldap --enable-lockdown --enable-minimizer --enable-odk --enable-opengl --enable-pdfimport --enable-presenter-console --enable-report-builder --enable-vba --enable-wiki-publisher --with-package-format=native --without-fonts --without-afms --without-ppds --without-system-agg --without-system-lucene --with-system-stdlibs --with-system-libs --disable-mozilla --with-system-headers --with-alloc=system --with-jdk-home=${JAVA_HOME} --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar --with-use-shell=bash --without-stlport --disable-pam --with-system-zlib --with-intro-bitmaps=$SRC/OOO320_m12/ooo_custom_images/nologo/introabout/intro.bmp
 	# Setup environment for build
 	source LinuxX86Env.Set.sh
 
 	# Build dmake utility
 	./bootstrap
  
-#	cd instsetoo_native
-#        build.pl -P${SMP} #${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all \
-#	cp /usr/include/X11/extensions/Xrender.h x11_extensions/inc/Xrender.h
-
-	dmake -P2
-
-	cd $SRC/$OOdir
+	cd instsetoo_native
+        build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all
+	cp /usr/include/X11/extensions/Xrender.h x11_extensions/inc/Xrender.h
 
         # install binaries
         cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/