[arch-commits] Commit in openoffice-base-beta/trunk (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Sep 17 11:58:05 UTC 2008
Date: Wednesday, September 17, 2008 @ 07:58:04
Author: andyrtr
Revision: 12639
prepare m6 build
Added:
openoffice-base-beta/trunk/buildfix-openjdk-6-no-rhino.diff
openoffice-base-beta/trunk/system_hsqldb.diff
Modified:
openoffice-base-beta/trunk/ChangeLog
openoffice-base-beta/trunk/PKGBUILD
openoffice-base-beta/trunk/openoffice.install
Deleted:
openoffice-base-beta/trunk/FontOOo_1.7.1.sxw
----------------------------------+
ChangeLog | 7 ++++
PKGBUILD | 61 +++++++++++++++++++------------------
buildfix-openjdk-6-no-rhino.diff | 42 +++++++++++++++++++++++++
openoffice.install | 6 +--
system_hsqldb.diff | 10 ++++++
5 files changed, 94 insertions(+), 32 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2008-09-17 11:51:28 UTC (rev 12638)
+++ ChangeLog 2008-09-17 11:58:04 UTC (rev 12639)
@@ -1,3 +1,10 @@
+openoffice-base-beta 3.0-ooo300_m6-1
+- build with system_hsqldb.diff
+- slightly modify dependencies
+- make dict deployement invisible
+- fix build with new openjdk6 with rhino
+- make sure /opt is clean after pkg removement
+
openoffice-base-beta 3.0-ooo300_m5-2
- fixes desktop menu entries+icons
- enable build of all dictionaries
Deleted: FontOOo_1.7.1.sxw
===================================================================
(Binary files differ)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-09-17 11:51:28 UTC (rev 12638)
+++ PKGBUILD 2008-09-17 11:58:04 UTC (rev 12639)
@@ -2,22 +2,26 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-beta
-pkgver=3.0_ooo300_m5 # =RC1
-pkgrel=2
+pkgver=3.0_ooo300_m6 # =RC1
+pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-#_OO_milestone=ooo300-m5
-_OO_milestone=OOO300_m5
+#_OO_milestone=ooo300-m6
+_OO_milestone=OOO300_m6
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')
+ 'libxaw' 'neon>=0.28.2' 'dbus-glib' 'icu>=4.0' 'hsqldb-java')
+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>=1.2-1')
+ 'boost' 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.2-5')
provides=('openoffice-base')
-optdepends=("java-runtime: adds java support")
source=(${pkgname}-${_OO_milestone}.tar.gz
template.desktop
default-no-startup-wizard.diff
@@ -26,11 +30,10 @@
soffice-detect-mozilla-certificates.diff
buildfix-gcc43.diff
shell.patch
- #http://oooconv.free.fr/fontooo/FontOOo.sxw
- # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
- FontOOo_1.7.1.sxw)
+ system_hsqldb.diff
+ buildfix-openjdk-6-no-rhino.diff)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('3dd848a318bd3ed444c8b8f84bace96d'
+md5sums=('e3684b9314e4aaafe2b5edf23701d874'
'a247ba577007d8169201bd8f41cf41b5'
'71f136a31e296a04ab68932a31dd533e'
'6c596129fb48316226ce3adfd3a4c86d'
@@ -38,7 +41,8 @@
'1dc7480a04f572ad136d35923a2af66d'
'bf7119084a2d1e0566b5e34b57dce8eb'
'a51200f770c635355c430cc5052db8cf'
- '1fc1ca5205730655eab2d2e119aa06fe')
+ '4addae44d20bb2b247e429d88b66a4c1'
+ '4fe2810b40358b0e7dc2df3d056bde7a')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -54,8 +58,6 @@
# fetch missing modules
cvs -q -z9 co -r $_MILESTONE cppunit hyphen swext apache-commons tomcat reportbuilder
-
-
# 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
@@ -71,6 +73,8 @@
# build fixes
patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
+ patch -Np0 -i ${srcdir}/system_hsqldb.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix-openjdk-6-no-rhino.diff || return 1
# allows xmlsec to be able to read the format of the digital certificates.
patch -Np0 -i ${srcdir}/libxmlsec-findcerts.diff || return 1
@@ -78,7 +82,6 @@
# his digital certificates. Nss stores digital certificates in your mozilla firefox profile.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
-
# important bugfixes
# try to fix non-gtk integration
patch -Np0 -i ${srcdir}/shell.patch || return 1
@@ -89,9 +92,9 @@
patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
if [ "$CARCH" = "x86_64" ]; then
- # fixes to build with SUN jdk/jre
+ # 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}/solenv/inc/libs.mk
+ sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/solenv/inc/libs.mk || return 1
fi
cd ${srcdir}/config_office
@@ -111,6 +114,7 @@
--with-dict=ALL\
--disable-gnome-vfs\
--disable-binfilter\
+ --disable-kde\
--disable-odk\
--disable-systray\
--disable-mathmldtd\
@@ -165,8 +169,7 @@
--with-use-shell=bash\
$EXTRAOPTS || return 1
-# --disable-qadevooo\
-# --without-myspell-dicts\
+# --disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
cd ..
@@ -217,27 +220,27 @@
# install more dictionaries from source tree
for i in `ls -1 ${srcdir}/src/dictionaries/unxlngx6.pro/bin/dict-??.oxt`; do
- install -Dm644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i
+ install -Dm644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
done
# install shortcuts
mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
cd ${pkgdir}/usr/share/applications
- sed -i -e 's|Exec=openoffice.org3|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
+ sed -i -e 's|Exec=openoffice.org3|Exec=/opt/openoffice/program/soffice|g' *.desktop || return 1
+ sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/spadmin|g' printeradmin.desktop || return 1
# fix exec commands in shortcuts for Xfce menu
- sed -i -e 's|base %U|base|g' base.desktop
- sed -i -e 's|calc %U|calc|g' calc.desktop
- sed -i -e 's|draw %U|draw|g' draw.desktop
- sed -i -e 's|impress %U|impress|g' impress.desktop
- sed -i -e 's|math %U|math|g' math.desktop
- sed -i -e 's|writer %U|writer|g' writer.desktop
+ sed -i -e 's|base %U|base|g' base.desktop || return 1
+ sed -i -e 's|calc %U|calc|g' calc.desktop || return 1
+ sed -i -e 's|draw %U|draw|g' draw.desktop || return 1
+ sed -i -e 's|impress %U|impress|g' impress.desktop || return 1
+ sed -i -e 's|math %U|math|g' math.desktop || return 1
+ sed -i -e 's|writer %U|writer|g' writer.desktop || return 1
# remove quickstarter, we disabled it above
rm -rf ${pkgdir}/usr/share/applications/qstart.desktop
# fix icons in shortcuts
sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
# add template desktop file
- install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop
+ install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop || return 1
# install icons
cd ${srcdir}/sysui/desktop/icons
Added: buildfix-openjdk-6-no-rhino.diff
===================================================================
--- buildfix-openjdk-6-no-rhino.diff (rev 0)
+++ buildfix-openjdk-6-no-rhino.diff 2008-09-17 11:58:04 UTC (rev 12639)
@@ -0,0 +1,42 @@
+? unxlngx6.pro
+Index: rhino1_5R5.patch
+===================================================================
+RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
+retrieving revision 1.3
+diff -u -r1.3 rhino1_5R5.patch
+--- rhino/rhino1_5R5.patch 11 Apr 2008 07:03:06 -0000 1.3
++++ rhino/rhino1_5R5.patch 12 Aug 2008 20:08:16 -0000
+@@ -1174,3 +1174,14 @@
+ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
+ return new ProtectionDomain(cs, pc);
+ }
++--- misc/rhino1_5R5/toolsrc/build.xml 2004-03-25 17:54:34.000000000 -0300
+++++ misc/build/rhino1_5R5/toolsrc/build.xml 2008-08-12 16:58:52.000000000 -0
++va Fri Mar 28 17:24:23 2008
++@@ -68,6 +32,7 @@
++ includes="org/**/*.java"
++ deprecation="on"
++ debug="${debug}">
+++ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++ </javac>
++ <copy todir="${nest}/${classes}">
++ <fileset dir="." includes="org/**/*.properties" />
+? unxlngx6.pro
+Index: java/build.xml
+===================================================================
+RCS file: /cvs/framework/scripting/java/build.xml,v
+retrieving revision 1.36
+diff -u -r1.36 build.xml
+--- scripting/java/build.xml 11 Apr 2008 09:46:13 -0000 1.36
++++ scripting/java/build.xml 12 Aug 2008 23:20:31 -0000
+@@ -85,7 +85,9 @@
+ <target name="compile" depends="prepare">
+ <javac srcdir="com" destdir="${jardir}"
+ includes="**/*.java" classpathref="idlclasspath"
+- debug="${debug}" optimize="${optimize}" deprecation="off"/>
++ debug="${debug}" optimize="${optimize}" deprecation="off">
++ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++ </javac>
+ <javac srcdir="Framework/" destdir="${jardir}"
+ includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
+ optimize="${optimize}" deprecation="off">
Modified: openoffice.install
===================================================================
--- openoffice.install 2008-09-17 11:51:28 UTC (rev 12638)
+++ openoffice.install 2008-09-17 11:58:04 UTC (rev 12639)
@@ -14,12 +14,9 @@
echo " how to use extensions now for spell checking"
echo " see extension manager what is shipped in the package"
echo " ----------------------------------------------------"
-echo -ne " deploying dictionaries now"
for i in `ls -1 /opt/openoffice-beta/share/extension/install/dict-??.oxt`; do
- echo -n "."
/opt/openoffice-beta/program/unopkg add --shared --force $i &> /dev/null
done
-echo " "
}
post_upgrade() {
@@ -29,6 +26,9 @@
post_remove() {
update-desktop-database -q
gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+
+# make sure everything is gone
+rm -rf /opt/openoffice-beta
}
op=$1
Added: system_hsqldb.diff
===================================================================
--- system_hsqldb.diff (rev 0)
+++ system_hsqldb.diff 2008-09-17 11:58:04 UTC (rev 12639)
@@ -0,0 +1,10 @@
+--- connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 2008-08-19
+05:08:34.000000000 -0400
++++ connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 2008-08-31
+01:29:31.000000000 -0400
+@@ -44,4 +44,5 @@
+ .IF "$(SYSTEM_HSQLDB)" == "YES"
+ XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
++JARFILES+= $(HSQLDB_JAR)
+ .ELSE
+ JARFILES+= hsqldb.jar
More information about the arch-commits
mailing list