[arch-commits] Commit in openoffice-base/trunk (ChangeLog PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Jul 8 04:14:12 UTC 2008
Date: Tuesday, July 8, 2008 @ 00:14:12
Author: andyrtr
Revision: 4598
upgpkg: openoffice-base 2.4.1-2
Modified:
openoffice-base/trunk/ChangeLog
openoffice-base/trunk/PKGBUILD
-----------+
ChangeLog | 8 +++++
PKGBUILD | 88 ++++++++++++++++++++++++++++++++----------------------------
2 files changed, 56 insertions(+), 40 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2008-07-08 04:05:25 UTC (rev 4597)
+++ ChangeLog 2008-07-08 04:14:12 UTC (rev 4598)
@@ -1,3 +1,11 @@
+openoffice-base 2.4.1-2
+- rebuild for new db4.7 - fix detection
+- fix xulrunner 1.9 detection
+- add libsndfile dep again, fixes #10680
+- disable the gtkunixprintdialog.diff
+ as it _may_ be the reason for trouble on
+ *box desktops
+
openoffice-base 2.4.1-1
- try shell.patch to non-gtk solve integration
- disable crashdump that would break with gcc-4.3
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-08 04:05:25 UTC (rev 4597)
+++ PKGBUILD 2008-07-08 04:14:12 UTC (rev 4598)
@@ -3,7 +3,7 @@
pkgname=openoffice-base
pkgver=2.4.1
-pkgrel=1 # =RC2(identical)
+pkgrel=2 # =RC2(identical)
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=('i686' 'x86_64')
#_OO_milestone=ooh680-m17
@@ -11,15 +11,15 @@
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('curl' 'gtk2>=2.12.9' 'hunspell>=1.2.2-2' 'python>=2.5.2' 'libwpd'
- 'libxaw' 'neon>=0.28.2' 'dbus-glib' 'nss')
+depends=('curl' 'gtk2>=2.12.11-2' 'hunspell>=1.2.4' 'python>=2.5.2-4' 'libwpd'
+ 'libxaw' 'neon>=0.28.2-2' 'dbus-glib' 'nss' 'libsndfile')
# 'xmlsec' - broken
# "icu>=3.8" broken
# 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')
+makedepends=('bison' 'cvs>=1.11.23-2' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libcups>=1.3.7-2' 'kdelibs>=3.5.9-5'
+ 'libart-lgpl' 'pam>=1.0.1-2' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
+ 'xulrunner>=1.9-1' 'apache-ant' 'hsqldb-java' 'cairo' 'autoconf' 'java-gcj-compat>=1.0.77-4')
MIRROR=ftp://ftp.gwdg.de/pub/openoffice # has all late but is fast
#MIRROR=ftp://ftp-1.gwdg.de/pub/openoffice/developer
@@ -40,6 +40,8 @@
shell.patch
gcc43.diff
openoffice.org-2.4.0.oooXXXXX.ucb.newneon.patch
+ detect-system-db4.7.patch
+ xulrunner-1.9.diff
#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
@@ -60,6 +62,8 @@
'a51200f770c635355c430cc5052db8cf'
'3191a75ecd60a56526868f40d32df98b'
'f1588a6b1ab30220c7995c48a00b2eac'
+ 'cbb4d46a5273215ef7fd86c24e3529c8'
+ 'caa26beb33489bfa4f277e584d4e0823'
'1fc1ca5205730655eab2d2e119aa06fe'
'83bb5e235c4e4062eed404829d760c14')
@@ -75,7 +79,7 @@
[ -z "${KDEDIR}" ] && . /etc/profile.d/kde.sh
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
- cd $startdir/src/${_OO_milestone}/
+ cd ${srcdir}/${_OO_milestone}/
# some speedups
export SMP="6"
@@ -91,6 +95,10 @@
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
+ # fix db4.7 detection
+ patch -Np0 -i ../detect-system-db4.7.patch || return 1
+ # fix build with new xulrunner
+ patch -Np0 -i ../xulrunner-1.9.diff || return 1
# gcc4.3 fixes
patch -Np0 -i ../gcc43.diff || return 1
@@ -117,7 +125,7 @@
patch -Np0 -i ../default-system-fpicker.diff || return 1
# add gtkprint dialog for gtk environment
- patch -Np0 -i ../gtkunixprintdialog.diff || return 1
+# patch -Np0 -i ../gtkunixprintdialog.diff || return 1
# arch related fixes & configure options
# if [ "$CARCH" = "i686" ]; then
@@ -127,12 +135,12 @@
if [ "$CARCH" = "x86_64" ]; then
# 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" ${srcdir}/${_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
- cd $startdir/src/${_OO_milestone}/config_office
+ cd ${srcdir}/${_OO_milestone}/config_office
# Set OOO_VENDOR in build environment
export OOO_VENDOR="ArchLinux"
@@ -168,7 +176,7 @@
--with-system-libwpd\
--with-system-libxml\
--with-system-libxslt\
- --with-system-mozilla\
+ --with-system-mozilla=libxul\
--with-system-neon\
--with-system-python\
--with-system-sndfile\
@@ -215,25 +223,25 @@
# 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
mv openoffice.org2.4 openoffice
# 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/{HighContrast,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
- cp $startdir/pkg/opt/openoffice/share/xdg/*.desktop $startdir/pkg/usr/share/applications
- cd $startdir/pkg/usr/share/applications
+ cp ${pkgdir}/opt/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
+ cd ${pkgdir}/usr/share/applications
sed -i -e 's|Exec=openoffice.org2.4|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
@@ -244,45 +252,45 @@
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=openofficeorg24-|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
- 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}/${_OO_milestone}/sysui/desktop/icons
+ cp -a -v HighContrast/*x* ${pkgdir}/usr/share/icons/HighContrast
+ 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
+ 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
# 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
- touch $startdir/pkg/opt/openoffice/share/dict/ooo/.directory
- touch $startdir/pkg/opt/openoffice/presets/template/.directory
- touch $startdir/pkg/opt/openoffice/share/extension/install/.directory
+ 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
+ touch ${pkgdir}/opt/openoffice/share/dict/ooo/.directory
+ touch ${pkgdir}/opt/openoffice/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 ${srcdir}/${_OO_milestone}/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 .
}
More information about the arch-commits
mailing list