[arch-commits] Commit in openoffice-base-devel/repos (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Aug 26 18:01:28 UTC 2008
Date: Tuesday, August 26, 2008 @ 14:01:27
Author: andyrtr
Revision: 10335
Merged revisions 8168-10334 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/openoffice-base-devel/trunk
........
r10330 | andyrtr | 2008-08-26 12:05:38 +0000 (Di, 26 Aug 2008) | 1 line
upgpkg: openoffice-base-devel 3.0_dev300_m30-1
........
r10334 | andyrtr | 2008-08-26 14:13:20 +0000 (Di, 26 Aug 2008) | 1 line
use system redland
........
Modified:
openoffice-base-devel/repos/extra-x86_64/ (properties)
openoffice-base-devel/repos/extra-x86_64/ChangeLog
openoffice-base-devel/repos/extra-x86_64/PKGBUILD
openoffice-base-devel/repos/extra-x86_64/buildfix-gcc43.diff
openoffice-base-devel/repos/extra-x86_64/openoffice.install
---------------------+
ChangeLog | 4 +
PKGBUILD | 172 +++++++++++++++++++++++++-------------------------
buildfix-gcc43.diff | 10 --
openoffice.install | 2
4 files changed, 93 insertions(+), 95 deletions(-)
Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /openoffice-base-devel/trunk:1-8167
+ /openoffice-base-devel/trunk:1-10334
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2008-08-26 14:13:20 UTC (rev 10334)
+++ extra-x86_64/ChangeLog 2008-08-26 18:01:27 UTC (rev 10335)
@@ -1,3 +1,7 @@
+openoffice-base-devel - 3.0_dev300_m30-1
+- build with system hsqldb is broken
+- move some deps to optdepends
+
openoffice-base-devel - 3.0_dev300_m29-2
- rebuild for icu4.0
- remove unneeded xmlsec makedep
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-08-26 14:13:20 UTC (rev 10334)
+++ extra-x86_64/PKGBUILD 2008-08-26 18:01:27 UTC (rev 10335)
@@ -2,29 +2,34 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-devel
-pkgver=3.0_dev300_m29
-pkgrel=2
+pkgver=3.0_dev300_m30
+pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=('i686' 'x86_64')
-#_OO_milestone=dev300-m29
-_OO_milestone=DEV300_m29
+#_OO_milestone=dev300-m30
+_OO_milestone=DEV300_m30
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
depends=('curl>=7.18.0' 'hunspell>=1.2.2-2' 'python>=2.5.1' 'libwpd'
- 'libxaw' 'libcups' 'neon>=0.28.2' 'dbus-glib' 'pstoedit' 'icu>=4.0' 'redland')
-optdepends=('java-runtime: adds java support')
+ 'libxaw' 'neon>=0.28.2' 'dbus-glib' 'icu>=4.0' 'redland')
+optdepends=('java-runtime: adds java support'
+ 'libcups: adds printing support'
+ 'gconf: adds additional gnome support'
+ 'nss: adds support for signed files/macros'
+ 'pstoedit: translates PostScript and PDF graphics into other vector formats')
makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.1'
- 'boost' 'apache-ant' 'cairo' 'gperf' 'gconf' 'openjdk6')
+ 'boost' 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6')
provides=('openoffice-base')
-MIRROR=ftp://ftp5.gwdg.de/pub/openoffice/extended/developer/
+#MIRROR=ftp://ftp5.gwdg.de/pub/openoffice/extended/developer/
#MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources
#MIRROR=http://download.go-oo.org/DEV300
-source=($MIRROR/${_OO_milestone}/OOo-Dev_${_OO_milestone}_src_{core,system}.tar.bz2
+source=(#$MIRROR/${_OO_milestone}/OOo-Dev_${_OO_milestone}_src_{core,system}.tar.bz2
#$MIRROR/OOo_${_OO_milestone}_source.tar.gz
+ ${pkgname}-${_OO_milestone}.tar.gz
template.desktop
default-no-startup-wizard.diff
default-system-fpicker.diff
@@ -36,23 +41,36 @@
# from http://www.openoffice.org/issues/show_bug.cgi?id=81102
FontOOo_1.7.1.sxw)
options=('!distcc' '!ccache' '!makeflags')
+md5sums=('a2ffad8555cc1846254805960d4dce81'
+ '50f1b6923deb05756de0efa02c5a63e0'
+ '71f136a31e296a04ab68932a31dd533e'
+ '6c596129fb48316226ce3adfd3a4c86d'
+ 'a8b96e9d0ce92a8f6690f277b1cfacc9'
+ '1dc7480a04f572ad136d35923a2af66d'
+ 'bf7119084a2d1e0566b5e34b57dce8eb'
+ 'a51200f770c635355c430cc5052db8cf'
+ '1fc1ca5205730655eab2d2e119aa06fe')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
+ cd ${srcdir}
+ export _MILESTONE=${_OO_milestone}
+ export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
+ # checkout snapshot
+# cvs -q -z9 co -r $_MILESTONE OpenOffice3
+# tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz *
+# return 1
+
+ # fetch missing modules
+ cvs -q -z9 co -r $_MILESTONE cppunit hyphen swext apache-commons tomcat
+
# just to make sure that it will detect the desired JDK/JVM - we want openjdk6
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
JAVAHOME=${JAVA_HOME}
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
- cd $startdir/src/${_OO_milestone}/
- #cd $startdir/src/ooo_${_OO_milestone}_src/
-
-# export _MILESTONE=DEV300_m12
-# export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
-# cvs -z9 co -r $_MILESTONE hyphen || return 1
-
# some speedups
export SMP="6"
MAXMODULESFLAG="-P${SMP}"
@@ -61,33 +79,31 @@
export NO_HIDS=true
# build fixes
- patch -Np0 -i ../buildfix-gcc43.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
# allows xmlsec to be able to read the format of the digital certificates.
- patch -Np0 -i ../libxmlsec-findcerts.diff || return 1
+ patch -Np0 -i ${srcdir}/libxmlsec-findcerts.diff || return 1
# allows soffice to find the user's firefox profile so that it can read
# his digital certificates. Nss stores digital certificates in your mozilla firefox profile.
- patch -Np0 -i ../soffice-detect-mozilla-certificates.diff || return 1
+ patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
# important bugfixes
# try to fix non-gtk integration
- patch -Np0 -i ../shell.patch || return 1
+ patch -Np0 -i ${srcdir}/shell.patch || return 1
# remove the startup wizard
- patch -Np0 -i ../default-no-startup-wizard.diff || return 1
+ patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
# enables the default system-file-picker in case we have that built
- patch -Np0 -i ../default-system-fpicker.diff || return 1
+ patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
if [ "$CARCH" = "x86_64" ]; then
# 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" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
-# sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/ooo_${_OO_milestone}_src/solenv/inc/libs.mk
+ sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/solenv/inc/libs.mk
fi
- cd $startdir/src/${_OO_milestone}/config_office
- #cd $startdir/src/ooo_${_OO_milestone}_src/config_office
+ cd ${srcdir}/config_office
# Set OOO_VENDOR in build environment
export OOO_VENDOR="ArchLinux"
@@ -133,6 +149,7 @@
--with-system-mozilla=libxul\
--with-system-neon\
--with-system-python\
+ --with-system-redland\
--with-system-sane-header\
--with-system-sndfile\
--with-system-stdlibs\
@@ -147,8 +164,6 @@
--without-nas\
--without-stlport\
--with-jdk-home=${JAVA_HOME} \
- --with-system-hsqldb \
- --with-hsqldb-jar=/usr/share/java/hsqldb.jar \
--with-system-xerces \
--with-xerces-jar=/usr/share/java/xercesImpl.jar \
--with-system-xalan \
@@ -162,6 +177,8 @@
# --enable-kde\
# --disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
+# --with-system-hsqldb \
+# --with-hsqldb-jar=/usr/share/java/hsqldb.jar \
cd ..
@@ -174,46 +191,45 @@
# 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 -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all || return 1
cd ..
# install binaries
if [ "$CARCH" = "x86_64" ]; then
- cp -R instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/* $startdir/pkg/
- else cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/* $startdir/pkg/
+ cp -R instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/* ${pkgdir}/
+ else cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/* ${pkgdir}/
fi
- cd $startdir/pkg/opt/
+ cd ${pkgdir}/opt/
## Step 1
- cd $startdir/pkg/opt/openoffice.org || return 1
+ cd ${pkgdir}/opt/openoffice.org || return 1
mv ure/ basis3.0/ || return 1
cd basis3.0 || return 1
rm ure-link && mv ure ure-link || return 1
## Step 2
- cd $startdir/pkg/opt/ || return 1
+ cd ${pkgdir}/opt/ || return 1
mv openoffice.org/basis3.0/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
rm basis-link && mv basis3.0 basis-link || return 1
## Step 3
- cd $startdir/pkg/opt/ || return 1
- rmdir $startdir/pkg/opt/openoffice.org || return 1
+ cd ${pkgdir}/opt/ || return 1
+ rmdir ${pkgdir}/opt/openoffice.org || return 1
mv openoffice.org3 openoffice || return 1
# prepare filesystem entries
- mkdir -p $startdir/pkg/usr/{bin,share/applications}
- mkdir -p $startdir/pkg/usr/share/icons/{HighContrast,hicolor,locolor}
+ mkdir -p ${pkgdir}/usr/{bin,share/applications}
+ mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
# make symlinks
- cd $startdir/pkg/usr/bin
+ cd ${pkgdir}/usr/bin
ln -s ../../opt/openoffice/program/soffice soffice
ln -s ../../opt/openoffice/program/spadmin spadmin
# install shortcuts
- mv $startdir/pkg/opt/openoffice/share/xdg/*.desktop $startdir/pkg/usr/share/applications
- cd $startdir/pkg/usr/share/applications
+ mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
+ cd ${pkgdir}/usr/share/applications
sed -i -e 's|Exec=openoffice.org3.0|Exec=/opt/openoffice/program/soffice|g' *.desktop
sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/spadmin|g' printeradmin.desktop
# fix exec commands in shortcuts for Xfce menu
@@ -224,84 +240,72 @@
sed -i -e 's|math %U|math|g' math.desktop
sed -i -e 's|writer %U|writer|g' writer.desktop
# remove quickstarter, we disabled it above
- rm -rf $startdir/pkg/usr/share/applications/qstart.desktop
+ rm -rf ${pkgdir}/usr/share/applications/qstart.desktop
# fix icons in shortcuts
sed -i -e 's|Icon=openofficeorg30-|Icon=|g' *.desktop
# add template desktop file
- install -D -m644 $startdir/src/template.desktop $startdir/pkg/usr/share/applications/template.desktop
+ install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop
# install icons
- cd $startdir/src/${_OO_milestone}/sysui/desktop/icons
-# cd $startdir/src/ooo_${_OO_milestone}_src/sysui/desktop/icons
- #cp -a -v HighContrast/*x* $startdir/pkg/usr/share/icons/HighContrast
- cp -a -v hicolor/*x* $startdir/pkg/usr/share/icons/hicolor
- cp -a -v locolor/*x* $startdir/pkg/usr/share/icons/locolor
+ cd ${srcdir}/sysui/desktop/icons
+ cp -a -v hicolor/*x* ${pkgdir}/usr/share/icons/hicolor
+ cp -a -v locolor/*x* ${pkgdir}/usr/share/icons/locolor
# just in case icon calc is used by calculator :)
- find $startdir/pkg/usr/share/icons -type d -name apps -exec mv {}/calc.png {}/ooocalc.png \;
- sed -i -e 's|Icon=calc|Icon=ooocalc|g' $startdir/pkg/usr/share/applications/calc.desktop # already done above
+ find ${pkgdir}/usr/share/icons -type d -name apps -exec mv {}/calc.png {}/ooocalc.png \;
+ sed -i -e 's|Icon=calc|Icon=ooocalc|g' ${pkgdir}/usr/share/applications/calc.desktop # already done above
# fix ownership and permissions
- chown root.root -R $startdir/pkg/
- chmod +rX -R $startdir/pkg/usr
+ chown root.root -R ${pkgdir}/
+ chmod +rX -R ${pkgdir}/usr
# some cleanup
- find $startdir/pkg/usr/share/icons -depth -name "CVS" -type d -exec rm -r {} \; > /dev/null 2>&1
- rm -f $startdir/pkg/opt/openoffice/program/oo_product.bmp
+ find ${pkgdir}/usr/share/icons -depth -name "CVS" -type d -exec rm -r {} \; > /dev/null 2>&1
+ rm -f ${pkgdir}/opt/openoffice/program/oo_product.bmp
mkdir -p ${pkgdir}/opt/openoffice/basis-link/share/dict/ooo
- touch $startdir/pkg/opt/openoffice/basis-link/share/dict/ooo/.directory
- touch $startdir/pkg/opt/openoffice/basis-link/presets/template/.directory
- touch $startdir/pkg/opt/openoffice/share/extension/install/.directory
+ touch ${pkgdir}/opt/openoffice/basis-link/share/dict/ooo/.directory
+ touch ${pkgdir}/opt/openoffice/basis-link/presets/template/.directory
+ touch ${pkgdir}/opt/openoffice/share/extension/install/.directory
# remove unecessary temp files if they exist
- rm -f $startdir/pkg/opt/openoffice/program/root*.dat
- rm -f $startdir/pkg/opt/openoffice/program/root*.dat.*
+ rm -f ${pkgdir}/opt/openoffice/program/root*.dat
+ rm -f ${pkgdir}/opt/openoffice/program/root*.dat.*
# fix font wizard not installed by default (from http://qa.openoffice.org/issues/show_bug.cgi?id=81102)
- install -D -m644 $startdir/src/FontOOo_1.7.1.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/FontOOo.sxw
+ install -D -m644 ${srcdir}/FontOOo_1.7.1.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/FontOOo.sxw
# add missing spell wizard
- install -D -m644 $startdir/src/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
-# install -D -m644 $startdir/src/ooo_${_OO_milestone}_src/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
+ install -D -m644 ${srcdir}/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
# link the mozilla-plugin
- mkdir -p $startdir/pkg/usr/lib/mozilla/plugins/
- cd $startdir/pkg/usr/lib/mozilla/plugins/
+ mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
+ cd ${pkgdir}/usr/lib/mozilla/plugins/
ln -v -s /opt/openoffice/program/libnpsoplugin.so .
## Develize it!
- cd $startdir/pkg/opt/
+ cd ${pkgdir}/opt/
mv openoffice openoffice-dev
- sed -i -e 's|Exec=/opt/openoffice/program|Exec=/opt/openoffice-dev/program|g' $startdir/pkg/usr/share/applications/*.desktop
+ sed -i -e 's|Exec=/opt/openoffice/program|Exec=/opt/openoffice-dev/program|g' ${pkgdir}/usr/share/applications/*.desktop
- cd $startdir/pkg/usr/bin
+ cd ${pkgdir}/usr/bin
rm -f soffice spadmin
ln -sf ../../opt/openoffice-dev/program/soffice soffice-dev
ln -sf ../../opt/openoffice-dev/program/spadmin spadmin-dev
- cd $startdir/pkg/usr/share/applications/
+ cd ${pkgdir}/usr/share/applications/
for desktopz in *.desktop
do mv $desktopz Dev-$desktopz
done
- for i in `find $startdir/pkg/usr/share/icons -name '*.png'` ; do mv $i `dirname $i`/dev-`basename $i` ; done ;
+ for i in `find ${pkgdir}/usr/share/icons -name '*.png'` ; do mv $i `dirname $i`/dev-`basename $i` ; done ;
- cd $startdir/pkg/usr/share/applications/
+ cd ${pkgdir}/usr/share/applications/
sed -i -e 's|Icon=|Icon=dev-|g' $startdir/pkg/usr/share/applications/*.desktop
- sed -i -e 's|OpenOffice\.org\ 3\.0|OpenOffice\.org\ devel|g' $startdir/pkg/usr/share/applications/*.desktop
- sed -i -e 's|\/opt\/openoffice\-dev\/program\/soffice|\/usr\/bin\/soffice\-dev|g' $startdir/pkg/usr/share/applications/*.desktop
+ sed -i -e 's|OpenOffice\.org\ 3\.0|OpenOffice\.org\ devel|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|\/opt\/openoffice\-dev\/program\/soffice|\/usr\/bin\/soffice\-dev|g' ${pkgdir}/usr/share/applications/*.desktop
-# mv $startdir/pkg/opt/openoffice-dev/program/soffice.bin $startdir/pkg/opt/openoffice-dev/program/soffice-dev.bin
- mv $startdir/pkg/usr/lib/mozilla/plugins/libnpsoplugin.so $startdir/pkg/usr/lib/mozilla/plugins/libnpsoplugin-dev.so
+ mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-dev.so
+
cd ${pkgdir}/opt/openoffice-dev/program/
ln -sf /opt/openoffice-dev/program/soffice.bin soffice-dev.bin
}
-md5sums=('6ab9066cf4154eb8d9cd44d60814443f'
- 'b6f168d5a5a902502f793f23afc4e5d1'
- '50f1b6923deb05756de0efa02c5a63e0'
- '71f136a31e296a04ab68932a31dd533e'
- '6c596129fb48316226ce3adfd3a4c86d'
- 'a8b96e9d0ce92a8f6690f277b1cfacc9'
- '1dc7480a04f572ad136d35923a2af66d'
- '094f7b2a86086fc76382bd98e3291d6b'
- 'a51200f770c635355c430cc5052db8cf'
- '1fc1ca5205730655eab2d2e119aa06fe')
+
Modified: extra-x86_64/buildfix-gcc43.diff
===================================================================
--- extra-x86_64/buildfix-gcc43.diff 2008-08-26 14:13:20 UTC (rev 10334)
+++ extra-x86_64/buildfix-gcc43.diff 2008-08-26 18:01:27 UTC (rev 10335)
@@ -8,13 +8,3 @@
#include "share.hxx"
---- filter/source/pdfimport/wrapper/wrapper.cxx
-+++ filter/source/pdfimport/wrapper/wrapper.cxx
-@@ -72,6 +72,7 @@
- #include <hash_map>
-
- #include "rtl/bootstrap.h"
-+#include "string.h"
-
- #ifndef PDFI_IMPL_IDENTIFIER
- # error define implementation name for pdfi extension, please!
Modified: extra-x86_64/openoffice.install
===================================================================
--- extra-x86_64/openoffice.install 2008-08-26 14:13:20 UTC (rev 10334)
+++ extra-x86_64/openoffice.install 2008-08-26 18:01:27 UTC (rev 10335)
@@ -11,7 +11,7 @@
echo " you will need it for \"help\" section and some java based wizards"
echo " for further reading: http://wiki.services.openoffice.org/wiki/Java_and_OpenOffice.org"
echo " "
-echo " >>KDE integration is no more supported!<<"
+echo " >>KDE integration is no longer supported!<<"
echo " "
echo " Please preset Gnome appearance always with"
echo " \"export OOO_FORCE_DESKTOP=gnome\" even when"
More information about the arch-commits
mailing list