Date: Sunday, April 25, 2010 @ 17:40:23 Author: andyrtr Revision: 78548
prepare next build Added: openoffice-base-devel/trunk/iFIXME-checkdeliver.diff Modified: openoffice-base-devel/trunk/ChangeLog openoffice-base-devel/trunk/PKGBUILD openoffice-base-devel/trunk/openoffice.profile --------------------------+ ChangeLog | 11 +++++++++++ PKGBUILD | 34 +++++++++++++++++++++++++--------- iFIXME-checkdeliver.diff | 12 ++++++++++++ openoffice.profile | 4 +++- 4 files changed, 51 insertions(+), 10 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-04-25 16:58:02 UTC (rev 78547) +++ ChangeLog 2010-04-25 21:40:23 UTC (rev 78548) @@ -1,3 +1,14 @@ +2010-04-24 Andreas Radke <andyrtr at archlinux.org> + + * 3.3_dev300_m77-1: + - new snapshot + - fall back to internal saxon - see + http://qa.openoffice.org/issues/show_bug.cgi?id=110136 + - add gcc4.5 fixes + - add a buildfix + - use system graphite for i686 again + - use internal cppunit for both architectures + 2010-04-12 Andreas Radke <andyrtr at archlinux.org> * 3.3_dev300_m76-1: Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-04-25 16:58:02 UTC (rev 78547) +++ PKGBUILD 2010-04-25 21:40:23 UTC (rev 78548) @@ -4,7 +4,7 @@ pkgbase="openoffice-base-devel" pkgname=('openoffice-base-devel' 'openoffice-sdk-devel') -_OO_milestone=DEV300_m76 +_OO_milestone=DEV300_m77 pkgver=3.3_${_OO_milestone/DEV/dev} pkgrel=1 arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ # from main OOo the deps "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'libxaw' "neon>=0.28.6" 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' - 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'boost>=1.41.0' 'lucene') #'redland>=1.0.10-2' 'libmythes' + 'beanshell' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'boost>=1.41.0' 'lucene' 'junit') #'redland>=1.0.10-2' 'libmythes' 'saxon' 'cppunit' source=(${pkgname}-${_OO_milestone}.tar.xz http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll startcenter.desktop @@ -27,11 +27,14 @@ buildfix-gcc44.diff buildfix_FormulaMissingHeader.diff shellfix-buildbreaker-for-enable-lockdown.patch + http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff + http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff + iFIXME-checkdeliver.diff openoffice.profile) options=('!distcc' '!ccache' '!makeflags') - -# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions +# see http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build + # source PKGBUILD && mksource mksource() { mkdir /tmp/$pkgname-source @@ -62,11 +65,16 @@ patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1 patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1 patch -Np1 -i ${srcdir}/shellfix-buildbreaker-for-enable-lockdown.patch || return 1 + # gcc4.5 fix + patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff || return 1 + patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff || return 1 + # http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Patches/DEV300/iFIXME-checkdeliver.diff + patch -Np1 -i ${srcdir}/iFIXME-checkdeliver.diff || return 1 # 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 ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1 - + # remove the startup wizard patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1 # enables the default system-file-picker in case we have that built @@ -77,7 +85,9 @@ # fix to build with SUN jdk/jre and OpenJDK # http://qa.openoffice.org/issues/show_bug.cgi?id=74749 sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk - else EXTRAOPTS="--with-stlport --without-system-graphite" + # http://qa.openoffice.org/issues/show_bug.cgi?id=109791 + # --without-system-graphite" + else EXTRAOPTS="--with-stlport" fi cd ${srcdir}/${_OO_milestone} @@ -132,6 +142,8 @@ --without-nas\ --without-ppds\ --without-system-agg\ + --without-system-cppunit\ + --without-system-saxon\ --with-openldap\ --with-system-stdlibs\ --with-system-libs\ @@ -141,10 +153,10 @@ --with-system-headers\ --with-alloc=system\ --with-jdk-home=${JAVA_HOME}\ - --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ --with-use-shell=bash\ + --with-external-tar=${SRCDEST}\ $EXTRAOPTS || return 1 # causes various issues, see http://qa.openoffice.org/issues/show_bug.cgi?id=90956 @@ -154,14 +166,18 @@ #http://bugs.archlinux.org/task/18777 # --with-system-redland\ +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ -# --without-system-lucene\ # --enable-layout\ /bin/bash: tralay: command not found ??? # --with-system-jfreereport # --with-system-mythes\ # we will need myspell dicts for --with-system-dicts --without-myspell-dicts -# --without-system-boost\ + # get external source tarballs if needed +# export TARFILE_LOCATION=${SRCDEST} +# ./fetch_tarballs.sh ooo.lst + # Setup environment for build if [ "$CARCH" = "x86_64" ]; then source LinuxX86-64Env.Set.sh Added: iFIXME-checkdeliver.diff =================================================================== --- iFIXME-checkdeliver.diff (rev 0) +++ iFIXME-checkdeliver.diff 2010-04-25 21:40:23 UTC (rev 78548) @@ -0,0 +1,12 @@ +diff -urN ooo_DEV300_m77_src.orig/postprocess/checkdeliver/checkdeliver.pl ooo_DEV300_m77_src/postprocess/checkdeliver/checkdeliver.pl +--- ooo_DEV300_m77_src.orig/postprocess/checkdeliver/checkdeliver.pl 2010-04-22 18:05:56.000000000 +0200 ++++ ooo_DEV300_m77_src/postprocess/checkdeliver/checkdeliver.pl 2010-04-22 18:06:13.000000000 +0200 +@@ -48,7 +48,7 @@ + my $platform = ''; + my $milestoneext = ''; + my $local_env = 0; +-my $source_config = SourceConfig -> new(); ++my $source_config = SourceConfig -> new( $ENV{SOLARSRC} ); + my @exceptionmodlist = ( + "postprocess", + "instset.*native", Modified: openoffice.profile =================================================================== --- openoffice.profile 2010-04-25 16:58:02 UTC (rev 78547) +++ openoffice.profile 2010-04-25 21:40:23 UTC (rev 78548) @@ -1,2 +1,4 @@ export OOO_FORCE_DESKTOP=gnome -#export OOO_FORCE_DESKTOP=KDE4 \ No newline at end of file +#export OOO_FORCE_DESKTOP=KDE4 + +export PYTHONPATH=/usr/lib/openoffice/basis-link/program/:$PYTHONPATH
