[arch-commits] Commit in openoffice-base/trunk (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Jun 12 09:41:04 UTC 2008
Date: Thursday, June 12, 2008 @ 05:41:04
Author: andyrtr
Revision: 2691
upgpkg: openoffice-base 2.4.1-1
Added:
openoffice-base/trunk/shell.patch
Modified:
openoffice-base/trunk/ChangeLog
openoffice-base/trunk/PKGBUILD
openoffice-base/trunk/jvmfwk-gij-paths.diff
-----------------------+
ChangeLog | 6 ++
PKGBUILD | 110 +++++++++++++++++++-----------------------------
jvmfwk-gij-paths.diff | 7 +--
shell.patch | 42 ++++++++++++++++++
4 files changed, 96 insertions(+), 69 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2008-06-12 06:56:31 UTC (rev 2690)
+++ ChangeLog 2008-06-12 09:41:04 UTC (rev 2691)
@@ -1,3 +1,9 @@
+openoffice-base 2.4.1-1
+- try shell.patch to non-gtk solve integration
+- disable crashdump that would break with gcc-4.3
+- use system Xrender-headers and sane headers again
+- cleanup deps/makedeps
+
openoffice-base 2.4.0-1
- rebuild against extra
- rc6 is final
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-06-12 06:56:31 UTC (rev 2690)
+++ PKGBUILD 2008-06-12 09:41:04 UTC (rev 2691)
@@ -2,50 +2,31 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base
-pkgver=2.4.0
-pkgrel=2 # =RC6(identical)
+pkgver=2.4.1
+pkgrel=1 # =RC2(identical)
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=('i686' 'x86_64')
-_OO_milestone=ooh680-m12
-#_OO_milestone=OOH680_m12
+#_OO_milestone=ooh680-m17
+_OO_milestone=OOH680_m17
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.5' 'gtk2>=2.12.7'
- 'hunspell>=1.2.2-2' 'perl' 'python>=2.5.1' 'libwpd' 'libsndfile'
- 'startup-notification>=0.9' 'xalan-java' 'libxaw' 'libcups' 'hsqldb-java'
- 'neon>=0.27.2' 'dbus-glib' 'nss' 'pstoedit')
+depends=('curl' 'gtk2>=2.12.9' 'hunspell>=1.2.2-2' 'python>=2.5.2' 'libwpd'
+ 'libxaw' 'neon>=0.28.2' 'dbus-glib' 'nss')
# 'xmlsec' - broken
# "icu>=3.8" broken
-# for gnu java/ecj
-makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'kdelibs'
- 'libart-lgpl' 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
- 'xulrunner>=1.8.1.11' 'java-gcj-compat' 'apache-ant' 'cairo' 'autoconf')
- # 'boost' - we use internal one. jfreereport is broken with system-boost/has no effect on size
-# for SUN Java
-#makedepends=('boost' 'bison' 'ccache' 'cvs' 'curl' 'findutils'
-# 'flex' 'gawk' 'gcc-libs' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
-# 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.8.1.3'
-# 'jdk' 'apache-ant' 'cairo')
+# for gnu java/ecj: 'java-gcj-compat'
+# for SUN Java: 'jdk'
+makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libcups' 'kdelibs'
+ 'libart-lgpl' 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
+ 'xulrunner>=1.8.1.14' 'apache-ant' 'hsqldb-java' 'cairo' 'autoconf' 'java-gcj-compat')
-#MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
-#MIRROR=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/
+MIRROR=ftp://ftp.gwdg.de/pub/openoffice # has all late but is fast
#MIRROR=ftp://ftp-1.gwdg.de/pub/openoffice/developer
-#MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/
-#MIRROR=http://go-oo.org/packages/SRC680/
-MIRROR=http://download.go-oo.org/OOH680/
+#MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org
+#MIRROR=http://download.go-oo.org/OOH680
-source=(#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
- #$MIRROR/OOH680/OOo-Dev_${pkgver}_src_{core,binfilter,system}.tar.bz2
- #$MIRROR/contrib/rc/${pkgver}/OOo_${pkgver}_${_OO_milestone}_src_{core,binfilter}.tar.bz2
- #$MIRROR/contrib/rc/${pkgver}/OOo_${_OO_milestone}_src_{core,binfilter}.tar.bz2
- #$MIRROR/contrib/rc/2.2.0rc3/OOo_${pkgver}rc3_src_{core,binfilter}.tar.bz2
- #$MIRROR/contrib/rc/2.2.0rc4/OOo_${pkgver}rc4_${_OO_milestone}_src_{core,binfilter}.tar.bz2
- #$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
- #$MIRROR/devel/build/Sources/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
- #$MIRROR/SRC680_m223/OOo-Dev_SRC680_m224_src_{core,binfilter}.tar.bz2
- http://download.go-oo.org/OOH680/${_OO_milestone}-{core,binfilter,system}.tar.bz2
- #$MIRROR/OOH680_m6/OOo-Dev_${_OO_milestone}_src_{core,binfilter,system}.tar.bz2
+source=($MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
template.desktop
default-no-startup-wizard.diff
default-system-fpicker.diff
@@ -56,27 +37,29 @@
libxmlsec-findcerts.diff
soffice-detect-mozilla-certificates.diff
gtkunixprintdialog.diff
- soffice.diff
+ shell.patch
gcc43.diff
+ openoffice.org-2.4.0.oooXXXXX.ucb.newneon.patch
#http://oooconv.free.fr/fontooo/FontOOo.sxw
FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
awt_x86_64.diff) # only for Sun builds needed
options=('!distcc' 'ccache' '!emptydirs')
-md5sums=('b676821a9f137b1401d6a591ebcb01e0'
- 'f3568308373429aff9ebfc72a2dfcc28'
- '09fcd5a0bb64da783ff71666abf1194b'
+md5sums=('f2e45d3bc56467a0f226c6538dee8e46'
+ '247e99b322cdd402d60c460532f6b2b0'
+ 'e80b0b72b6d4a0520779e040faf85f03'
'a728dcd463c1aa7ca5db75146377a0d1'
'0faab33566196ddc9c405d68cf614663'
'39e4c1b1e864b22ee4650b2bff44c695'
- '8980e21cef021d050ab1d4a13c85eb08'
+ '097e8899383941a9bbafe50f0ba80ad8'
'e5ab0c8dec93a5245d42dc7de0490b66'
'4c76c07e867d51c416ea258220a90a6a'
'28f37939e38d22bb3feaac8d17215673'
'a8b96e9d0ce92a8f6690f277b1cfacc9'
'1dc7480a04f572ad136d35923a2af66d'
'076d59389390afe6f1cd91a4f5cbab23'
- '44174ef4e71ba835fcd2a59733213cc9'
+ 'a51200f770c635355c430cc5052db8cf'
'52c9d2cd8465c3c58103310e381c9060'
+ 'f1588a6b1ab30220c7995c48a00b2eac'
'1fc1ca5205730655eab2d2e119aa06fe'
'83bb5e235c4e4062eed404829d760c14')
@@ -86,19 +69,28 @@
# just to make sure that it will detect the desired JDK/JVM - we want gcc-gcj/ecj
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
[ -z "${JAVA_HOME}" ] && . /etc/profile.d/java-gcj-compat.sh
+# [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh
JAVAHOME=${JAVA_HOME}
[ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
[ -z "${KDEDIR}" ] && . /etc/profile.d/kde.sh
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-# [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh
cd $startdir/src/${_OO_milestone}/
+ # some speedups
+ export SMP="6"
+ MAXMODULESFLAG="-P${SMP}"
+ MAXPROCESSESFLAG="-P${SMP}"
+ export nodep=true
+ export NO_HIDS=true
+
# build fixes
# gcj build fix to find our gcj libs paths
patch -Np0 -i ../jvmfwk-gij-paths.diff || return 1
# fix build with internal xmlsec
patch -Np0 -i ../libxmlsec-system-nss.diff || return 1
+ # fix build with external neon
+ patch -Np1 -i ../openoffice.org-2.4.0.oooXXXXX.ucb.newneon.patch || return 1
# gcc4.3 fixes
patch -Np0 -i ../gcc43.diff || return 1
@@ -111,7 +103,8 @@
# important bugfixes
- # nothing right now :)
+ # try to fix non-gtk integration see http://qa.openoffice.org/issues/show_bug.cgi?id=75190
+ patch -Np0 -i ../shell.patch || return 1
# fix font hinting
patch -Np0 -i ../fix-font-hinting.diff || return 1
@@ -123,20 +116,18 @@
# enables the default system-file-picker in case we have that built
patch -Np0 -i ../default-system-fpicker.diff || return 1
-
# add gtkprint dialog for gtk environment
patch -Np0 -i ../gtkunixprintdialog.diff || return 1
# arch related fixes & configure options
- if [ "$CARCH" = "i686" ]; then
- EXTRAOPTS="--with-arch=x86 " # --without-stlport4 - still broken
- fi
+# if [ "$CARCH" = "i686" ]; then
+# EXTRAOPTS="--with-arch=x86 " # --without-stlport4 - still broken
+# fi
if [ "$CARCH" = "x86_64" ]; then
- EXTRAOPTS="--with-arch=x86_64 "
# fixes to build with SUN jdk/jre
# http://qa.openoffice.org/issues/show_bug.cgi?id=74749
- # sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
+ sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
# http://qa.openoffice.org/issues/show_bug.cgi?id=74751
# patch -Np0 -i ../awt_x86_64.diff || return 1
fi
@@ -149,34 +140,28 @@
export ARCH_FLAGS="$CFLAGS"
# Need to recreate the configure script because of patches
- autoconf || return 1
+ autoreconf -v || return 1
./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
--prefix=/usr --exec-prefix=/usr\
- --with-binfilter\
--disable-ldap\
--with-lang="en-US"\
--disable-gnome-vfs\
- --disable-mono\
--disable-odk\
--disable-qadevooo\
--disable-systray\
- --disable-gpc\
--enable-gtk\
--enable-kde\
--enable-cups\
--enable-dbus\
--enable-cairo\
--enable-evolution2\
- --enable-crashdump\
- --enable-libsn\
+ --enable-crashdump=no\
--enable-vba\
--with-package-format=native\
--with-system-db\
- --with-system-cairo\
--with-system-curl\
--with-system-expat\
- --with-system-fonts\
--with-system-freetype\
--with-system-hunspell\
--with-system-jpeg\
@@ -186,19 +171,18 @@
--with-system-mozilla\
--with-system-neon\
--with-system-python\
- --with-system-sane-header\
--with-system-sndfile\
--with-system-stdlibs\
+ --with-system-sane-header\
--with-system-xrender-headers\
--with-system-zlib\
--without-fonts\
--without-myspell-dicts\
--without-nas\
- --without-docdir\
--without-afms\
--without-myspell-dicts\
+ --without-stlport\
--with-jdk-home=${JAVA_HOME} \
- --with-java-home=${JAVA_HOME} \
--with-system-hsqldb\
--with-hsqldb-jar=/usr/share/java/hsqldb.jar\
--with-system-xerces\
@@ -225,10 +209,8 @@
# Build dmake utility
./bootstrap || return 1
- # to compile with SMP add -P2 or above, remove any -Px if your cou has only one core or if you want to fix it for non smp build
cd instsetoo_native
- build.pl -P1 --all || return 1
-
+ build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all || return 1
cd ..
# install binaries
@@ -303,8 +285,4 @@
mkdir -p $startdir/pkg/usr/lib/mozilla/plugins/
cd $startdir/pkg/usr/lib/mozilla/plugins/
ln -v -s /opt/openoffice/program/libnpsoplugin.so .
-
- # fix soffice not starting without set environment
- cd $startdir/pkg/opt/openoffice/program/
- patch -Np0 -i $startdir/src/soffice.diff
}
Modified: jvmfwk-gij-paths.diff
===================================================================
--- jvmfwk-gij-paths.diff 2008-06-12 06:56:31 UTC (rev 2690)
+++ jvmfwk-gij-paths.diff 2008-06-12 09:41:04 UTC (rev 2691)
@@ -1,6 +1,6 @@
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2007-12-06 17:44:40.000000000 +0000
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.new 2008-03-12 18:16:37.000000000 +0000
-@@ -75,6 +75,21 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2008-04-12 08:54:21.000000000 +0000
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.new 2008-06-11 10:25:37.000000000 +0000
+@@ -70,6 +70,22 @@
"/libjvm.so",
"/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
"/gcj-4.1.1/libjvm.so",
@@ -12,6 +12,7 @@
+ "/gcj-4.2.2-81/libjvm.so",
+ "/gcj-4.2.3-81/libjvm.so",
+ "/gcj-4.3.0-9/libjvm.so",
++ "/gcj-4.3.1-9/libjvm.so",
+ "/gcj-4.1.2/libjvm.so",
+ "/libgcj.so.80",
+ "/libgcj.so.81",
Added: shell.patch
===================================================================
--- shell.patch (rev 0)
+++ shell.patch 2008-06-12 09:41:04 UTC (rev 2691)
@@ -0,0 +1,42 @@
+Index: source/unix/sysshell/systemshell.cxx
+===================================================================
+RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
+retrieving revision 1.8
+diff -u -r1.8 systemshell.cxx
+--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8
++++ shell/source/unix/sysshell/systemshell.cxx 13 Apr 2008 15:27:22 -0000
+@@ -62,6 +62,8 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #endif
+
++#include "uno/current_context.hxx"
++
+ #include "osl/module.hxx"
+
+ using namespace ::com::sun::star;
+@@ -116,6 +118,25 @@
+
+ bool init_recent_manager_api()
+ {
++ bool bInGnome = false;
++ try
++ {
++ uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
++
++ if (xCurrentContext.is())
++ {
++ uno::Any aValue = xCurrentContext->getValueByName(
++ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
++
++ rtl::OUString aDesktopEnvironment;
++ if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii("gnome")) )
++ bInGnome = true;
++ }
++ } catch ( ... ) {}
++
++ if (!bInGnome)
++ return false;
++
+ oslModule hDefault;
+ if( osl_getModuleHandle( NULL, &hDefault ) )
+ {
More information about the arch-commits
mailing list