[arch-commits] Commit in openoffice-base-beta/repos (7 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Feb 13 11:53:10 UTC 2009
Date: Friday, February 13, 2009 @ 06:53:09
Author: andyrtr
Revision: 26843
Merged revisions 26842 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk
........
r26842 | andyrtr | 2009-02-13 11:52:35 +0000 (Fr, 13 Feb 2009) | 2 lines
upgpkg: openoffice-base-beta 3.1.0_ooo310_m1-1
new version ooo310_m1
........
Modified:
openoffice-base-beta/repos/extra-x86_64/ (properties)
openoffice-base-beta/repos/extra-x86_64/ChangeLog
openoffice-base-beta/repos/extra-x86_64/PKGBUILD
Deleted:
openoffice-base-beta/repos/extra-x86_64/buildfix-openjdk-6-no-rhino.diff
openoffice-base-beta/repos/extra-x86_64/buildfix_dict_parallel.diff
openoffice-base-beta/repos/extra-x86_64/libxmlsec-findcerts.diff
openoffice-base-beta/repos/extra-x86_64/system_hsqldb.diff
----------------------------------+
ChangeLog | 4 +
PKGBUILD | 104 +++++++++++++++----------------------
buildfix-openjdk-6-no-rhino.diff | 42 --------------
buildfix_dict_parallel.diff | 20 -------
libxmlsec-findcerts.diff | 28 ---------
system_hsqldb.diff | 10 ---
6 files changed, 47 insertions(+), 161 deletions(-)
Property changes on: openoffice-base-beta/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /openoffice-base-beta/trunk:1-24088
+ /openoffice-base-beta/trunk:1-26842
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/ChangeLog 2009-02-13 11:53:09 UTC (rev 26843)
@@ -1,3 +1,7 @@
+openoffice-base-beta 3.1.0-ooo310_m1-1
+- first snapshot on the way to 3.1
+ branched from DEV300_m40
+
openoffice-base-beta 3.0.1-ooo300_m15-1
- next snapshot = 3.0.1rc2
- modify install msg
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/PKGBUILD 2009-02-13 11:53:09 UTC (rev 26843)
@@ -2,12 +2,11 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-beta
-pkgver=3.0.1_ooo300_m15 # m15=RC2
+pkgver=3.1.0_ooo310_m1 # m1=
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-#_OO_milestone=ooo300-m15
-_OO_milestone=OOO300_m15
+_OO_milestone=OOO310_m1
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
@@ -18,51 +17,39 @@
'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'
+makedepends=('bison' 'svn' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.4'
- 'boost' 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.3.1-2')
+ 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.4') #'boost'
provides=('openoffice-base')
source=(${pkgname}-${_OO_milestone}.tar.gz
template.desktop
default-no-startup-wizard.diff
default-system-fpicker.diff
- libxmlsec-findcerts.diff
soffice-detect-mozilla-certificates.diff
buildfix-gcc43.diff
shell.patch
- system_hsqldb.diff
- buildfix-openjdk-6-no-rhino.diff
- openoffice-beta.profile
- http://www.openoffice.org/nonav/issues/showattachment.cgi/58937/workspace.fpicker8.patch
- http://www.openoffice.org/nonav/issues/showattachment.cgi/56152/run_fpicker_in_main.patch)
+ openoffice-beta.profile)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('b2d77f8cbdbb5d0c5b79770c2ea7f844'
+md5sums=('e8f5578a5f744e75bdcfaa7c431cbdc4'
'a247ba577007d8169201bd8f41cf41b5'
'71f136a31e296a04ab68932a31dd533e'
'6c596129fb48316226ce3adfd3a4c86d'
- 'a8b96e9d0ce92a8f6690f277b1cfacc9'
'1dc7480a04f572ad136d35923a2af66d'
'bf7119084a2d1e0566b5e34b57dce8eb'
'a51200f770c635355c430cc5052db8cf'
- '4addae44d20bb2b247e429d88b66a4c1'
- '4fe2810b40358b0e7dc2df3d056bde7a'
- '8d68d44c941a687813ddd968383cdf27'
- '4d91aaa94f9e702e184ab1ce99287a73'
- 'c835885b68a5f3ff18b74c53d9b0bea3')
+ '8d68d44c941a687813ddd968383cdf27')
# 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
- # fetch missing modules
-# cvs -q -z9 co -r $_MILESTONE cppunit hyphen swext apache-commons tomcat reportbuilder
-# tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz *
+ # now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
+# svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+# find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+# tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
# return 1
+ cd ${srcdir}/${_OO_milestone}
# just to make sure that it will detect the desired JDK/JVM - we want openjdk6
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -79,21 +66,14 @@
# 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
# 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.
+ # its 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
- # fix high cpu load in fpicker, FS#11710
- patch -Np1 -i ${srcdir}/workspace.fpicker8.patch || return 1
- patch -Np1 -i ${srcdir}/run_fpicker_in_main.patch || return 1
# remove the startup wizard
patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
@@ -104,11 +84,11 @@
EXTRAOPTS="--without-stlport"
# 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 || return 1
+ sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk || return 1
else EXTRAOPTS="--with-stlport"
fi
- cd ${srcdir}/config_office
+ cd ${srcdir}/${_OO_milestone}
# export C(XX)FLAGS
export ARCH_FLAGS="$CFLAGS"
@@ -124,21 +104,25 @@
--with-dict=ALL\
--disable-gnome-vfs\
--disable-binfilter\
+ --disable-evolution2\
--disable-kde\
+ --disable-lockdown\
+ --disable-mediawiki\
+ --disable-minimizer\
--disable-odk\
+ --disable-pdfimport\
+ --disable-qadevooo\
+ --disable-reportdesign\
--disable-systray\
--disable-mathmldtd\
- --disable-reportdesign\
--enable-gio\
--enable-gtk\
--enable-cups\
--enable-dbus\
--enable-cairo\
- --enable-evolution2\
--enable-crashdump=no\
--enable-vba\
--with-package-format=native\
- --with-system-boost\
--with-system-db\
--with-system-cairo\
--with-system-curl\
@@ -153,6 +137,7 @@
--with-system-mozilla=libxul\
--with-system-neon\
--with-system-python\
+ --with-system-redland\
--with-system-sane-header\
--with-system-sndfile\
--with-system-stdlibs\
@@ -176,10 +161,8 @@
--with-use-shell=bash\
$EXTRAOPTS || return 1
-# --disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
+# --with-system-boost\
- cd ..
-
# Setup environment for build
if [ "$CARCH" = "x86_64" ]; then
source LinuxX86-64Env.Set.sh
@@ -200,17 +183,16 @@
fi
cd ${pkgdir}/opt/
-
## Step 1
cd ${pkgdir}/opt/openoffice.org || return 1
- mv ure/ basis3.0/ || return 1
- cd basis3.0 || return 1
+ mv ure/ basis3.1/ || return 1
+ cd basis3.1 || return 1
rm ure-link && mv ure ure-link || return 1
## Step 2
cd ${pkgdir}/opt/ || return 1
- mv openoffice.org/basis3.0/ openoffice.org3/ || return 1
+ mv openoffice.org/basis3.1/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
- rm basis-link && mv basis3.0 basis-link || return 1
+ rm basis-link && mv basis3.1 basis-link || return 1
## Step 3
cd ${pkgdir}/opt/ || return 1
rmdir ${pkgdir}/opt/openoffice.org || return 1
@@ -227,8 +209,8 @@
# install all built dictionaries from source tree
if [ "$CARCH" = "x86_64" ]; then
- pushd ${srcdir}/dictionaries/unxlngx6.pro/bin
- else pushd ${srcdir}/dictionaries/unxlngi6.pro/bin
+ pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngx6.pro/bin
+ else pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngi6.pro/bin
fi
for i in `ls -1 dict-??.oxt`; do
install -D -m644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
@@ -255,7 +237,7 @@
install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop || return 1
# install icons
- cd ${srcdir}/sysui/desktop/icons
+ cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
cp -a -v hicolor/*x* ${pkgdir}/usr/share/icons/hicolor
cp -a -v locolor/*x* ${pkgdir}/usr/share/icons/locolor
@@ -268,17 +250,8 @@
chmod +rX -R ${pkgdir}/usr
# some cleanup
- find ${pkgdir}/usr/share/icons -depth -name "CVS" -type d -exec rm -r {} \; > /dev/null 2>&1
+# find ${pkgdir}/usr/share/icons -depth -name "CVS" -type d -exec rm -r {} \; > /dev/null 2>&1 # still needed?
- # link the mozilla-plugin
- mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
- cd ${pkgdir}/usr/lib/mozilla/plugins/
- ln -v -s /opt/openoffice/program/libnpsoplugin.so .
-
- # set desktop variable to force gtk/gnome vcl usage
- install -m755 -d ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/openoffice-beta.profile ${pkgdir}/etc/profile.d/openoffice-beta.sh || return 1
-
## Develize it for BETA!
cd ${pkgdir}/opt/
mv openoffice openoffice-beta
@@ -298,10 +271,19 @@
cd ${pkgdir}/usr/share/applications/
sed -i -e 's|Icon=|Icon=beta-|g' ${pkgdir}/usr/share/applications/*.desktop
- sed -i -e 's|OpenOffice\.org\ 3\.0|OpenOffice\.org\ beta|g' ${pkgdir}/usr/share/applications/*.desktop
+ sed -i -e 's|OpenOffice\.org\ 3\.1|OpenOffice\.org\ beta|g' ${pkgdir}/usr/share/applications/*.desktop
sed -i -e 's|\/opt\/openoffice\-beta\/program\/soffice|\/usr\/bin\/soffice\-beta|g' ${pkgdir}/usr/share/applications/*.desktop
- mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
cd ${pkgdir}/opt/openoffice-beta/program/
ln -sf /opt/openoffice-beta/program/soffice.bin soffice-beta.bin
+
+ # set desktop variable to force gtk/gnome vcl usage
+ install -m755 -d ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/openoffice-beta.profile ${pkgdir}/etc/profile.d/openoffice-beta.sh || return 1
+
+ # link the mozilla-plugin
+ mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
+ cd ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -v -s /opt/openoffice-beta/program/libnpsoplugin.so .
+ mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
}
Deleted: extra-x86_64/buildfix-openjdk-6-no-rhino.diff
===================================================================
--- extra-x86_64/buildfix-openjdk-6-no-rhino.diff 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/buildfix-openjdk-6-no-rhino.diff 2009-02-13 11:53:09 UTC (rev 26843)
@@ -1,42 +0,0 @@
-? 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">
Deleted: extra-x86_64/buildfix_dict_parallel.diff
===================================================================
--- extra-x86_64/buildfix_dict_parallel.diff 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/buildfix_dict_parallel.diff 2009-02-13 11:53:09 UTC (rev 26843)
@@ -1,20 +0,0 @@
---- dictionaries/prj/build.lst 2008-08-15 10:41:08.000000000 +0000
-+++ dictionaries/prj/build.lst.new 2008-09-17 16:11:22.000000000 +0000
-@@ -4,10 +4,10 @@
- di dictionaries\cs_CZ nmake - all di_cs_CZ NULL
- di dictionaries\da_DK nmake - all di_da_DK NULL
- di dictionaries\de_AT nmake - all di_de_AT NULL
--di dictionaries\de_CH nmake - all di_de_CH NULL
-+di dictionaries\de_CH nmake - all di_de_CH di_de_AT NULL
- di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH NULL
- di dictionaries\en_US nmake - all di_en_US NULL
--di dictionaries\en_ZA nmake - all di_en_ZA NULL
-+di dictionaries\en_ZA nmake - all di_en_ZA di_en_US NULL
- di dictionaries\en_GB nmake - all di_en_GB di_en_US di_en_ZA NULL
- di dictionaries\es_ES nmake - all di_es_ES NULL
- di dictionaries\et_EE nmake - all di_et_EE NULL
-@@ -28,3 +28,4 @@
- di dictionaries\sw_TZ nmake - all di_sw_TZ NULL
- di dictionaries\vi nmake - all di_vi NULL
- di dictionaries\zu_ZA nmake - all di_zu_ZA NULL
-+
Deleted: extra-x86_64/libxmlsec-findcerts.diff
===================================================================
--- extra-x86_64/libxmlsec-findcerts.diff 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/libxmlsec-findcerts.diff 2009-02-13 11:53:09 UTC (rev 26843)
@@ -1,28 +0,0 @@
---- libxmlsec/xmlsec1-1.2.6.patch
-+++ libxmlsec/xmlsec1-1.2.6.patch
-@@ -17395,3 +17395,25 @@
- XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
-
- XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
-+*** misc/xmlsec1-1.2.6/src/nss/x509.c 2007-03-16 12:51:38.000000000 -0400
-+--- misc/build/xmlsec1-1.2.6/src/nss/x509.c 2007-03-19 11:23:22.000000000 -0400
-+*************** xmlSecNssKeyDataX509VerifyAndExtractKey(
-+*** 1365,1373 ****
-+ /*-
-+ * I'll search key according to KeyReq.
-+ */
-+- slot = cert->slot ;
-+ if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+! if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) {
-+ xmlSecError( XMLSEC_ERRORS_HERE ,
-+ xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+ "PK11_FindPrivateKeyFromCert" ,
-+--- 1365,1372 ----
-+ /*-
-+ * I'll search key according to KeyReq.
-+ */
-+ if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+! if( ( priKey = PK11_FindKeyByAnyCert( cert , NULL ) ) == NULL ) {
-+ xmlSecError( XMLSEC_ERRORS_HERE ,
-+ xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+ "PK11_FindPrivateKeyFromCert" ,
Deleted: extra-x86_64/system_hsqldb.diff
===================================================================
--- extra-x86_64/system_hsqldb.diff 2009-02-13 11:52:35 UTC (rev 26842)
+++ extra-x86_64/system_hsqldb.diff 2009-02-13 11:53:09 UTC (rev 26843)
@@ -1,10 +0,0 @@
---- 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