[arch-commits] Commit in libreoffice/trunk (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Jun 15 18:45:40 UTC 2011
Date: Wednesday, June 15, 2011 @ 14:45:39
Author: andyrtr
Revision: 127521
upgpkg: libreoffice 3.4.1rc1-1
upstream update 3.4.1rc1 - drop two buildfixes; fix broken SDK - FS#24581
Modified:
libreoffice/trunk/PKGBUILD
Deleted:
libreoffice/trunk/buildfix_bison25.diff
libreoffice/trunk/buildfix_i116795.diff
-----------------------+
PKGBUILD | 73 ++++++++++++++++++++++++++----------------------
buildfix_bison25.diff | 23 ---------------
buildfix_i116795.diff | 22 --------------
3 files changed, 40 insertions(+), 78 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-06-15 16:17:57 UTC (rev 127520)
+++ PKGBUILD 2011-06-15 18:45:39 UTC (rev 127521)
@@ -24,9 +24,9 @@
'libreoffice-extension-validator'
'libreoffice-extension-watch-window'
'libreoffice-extension-wiki-publisher')
-_LOver=3.4.0.2
-pkgver=3.4.0
-pkgrel=2
+_LOver=3.4.1.1
+pkgver=3.4.1rc1
+pkgrel=1
arch=('i686' 'x86_64')
#_LO_tree="3.4"
_OFFICEUPD="340"
@@ -90,11 +90,9 @@
http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
- buildfix_i116795.diff
buildfix_boost.diff
buildfix_ct2n.diff
- vbahelper.visibility.patch
- buildfix_bison25.diff)
+ vbahelper.visibility.patch)
noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -133,25 +131,25 @@
b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa'
- 'a78a8e08731213da02c65060cedc5589'
- '596da255e2728faccc8f2361171270ec'
- '8ed9803a34d13da1764e7523d550d6b0'
- '9be46d7c4bf3a60ee8dd0a5ef3638f82'
- 'b60db802866ab71c485de42e6382d1bb'
- '09e374cf3bd8f07a043883393012d69b'
- 'af9f25aa04dc4ef7b797f7bcc743877c'
- 'ad29de786d76d67759f9d2dd574b29be'
- 'ff13a8ac0ea324122b75773fd80a9245'
- '6eb8f53e01da7a945ee4cd42b7297732'
- '90df27d4cbf490668ce4f03ff7dba521'
- 'c0ea197183564c49306a1c79ca571e51'
- '91e69ed3c0be542fa7f69ca3da2d7808'
- 'a81c787b2e5469c2acc9f335b2c9e52f'
- 'ee1c78af6553657614b1a43adf4750ac'
- 'c970d6212618fc9b34526907eb030ce6'
- '6d25488c81af09d87015bf487243042f'
- '9a39234a49516b7035309e28dd4f0784'
+md5sums=('a21bbbc0cf9b482a78357b7b6132e799'
+ 'd9ccdb2b53de8e16d7bb3215b9e97d7a'
+ 'd3aa4a8e05f8b5c3ccf4f945b82b32a2'
+ 'eb03b6627f2a2240eca089c925692259'
+ '190c9b25a7193b7ca98d6f6d09cd20d2'
+ '45b632fb71b123b699c9e89f9db6632a'
+ '19b3e65676e8e8839a4dd884a74e83e4'
+ '79a955fd38d0eedca7db146c5a985041'
+ '9b9b80ff14a3c6f430cc1fee4551c53e'
+ 'c592798d08cccfb14f6cda95eb542d7b'
+ '1f98cbec964a9563b72962c943af3545'
+ '01aa850fa07e4440706dcea0def5c27a'
+ '9765abf75b58c5dbdf82a953af8c6de4'
+ '1f07e271d64606116c84c7adbc90a324'
+ '877cf0733c202936f8b918b9ad423f0d'
+ '231f5a392ab78167a5a7ab7bc922a421'
+ '9452301d1eee5fc3bb4758e003829075'
+ '1bc390b972bbe27f513956af37e60538'
+ '974b73ed0add1d6e325b9da4e3ca5c5d'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -191,11 +189,9 @@
'9d60b6cfa3ef1926848710bbcd11115b'
'dbaafd21de055e582d92d7d32fe9da13'
'b7b2d0e04e142f26dd96119c80757d1f'
- '0520d63c946e272ed3bdfc863fbdc42e'
'bc228237108cab7745897a9f466b6d39'
'eee273f501ff45dc5f1365e78c6d57c0'
- '43b145db28e6c0d73578ae6fd35e510d'
- '4fa96e04b41a6e86774e74a972024b3e')
+ '43b145db28e6c0d73578ae6fd35e510d')
build() {
@@ -219,11 +215,9 @@
cd ${srcdir}/build
# buildfixes & bugfixes
- patch -Np1 -i ${srcdir}/buildfix_i116795.diff
patch -Np1 -i ${srcdir}/buildfix_boost.diff
patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
- patch -Np0 -i ${srcdir}/buildfix_bison25.diff
# unset C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -461,14 +455,27 @@
package_libreoffice-sdk() {
pkgdesc="Software development kit for LibreOffice"
- depends=('libreoffice' 'gcc-libs' 'sh')
+ depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
cd ${srcdir}/sdk-install
cp -r * ${pkgdir}
cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
- mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh
- rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
+ cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh}
+
+ # fix ArchLinux LIbreOffice installation paths
+ sed -i -e "s, at OO_SDK_NAME@,libreoffice-sdk," \
+ -e "s, at OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
+ -e "s, at OFFICE_HOME@,/usr/lib/libreoffice," \
+ -e "s, at OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
+ -e "s, at OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
+ -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
+ -e "s, at OO_SDK_CC_55_OR_HIGHER@,," \
+ -e "s, at OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
+ -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
+ -e "s, at SDK_AUTO_DEPLOYMENT@,NO," setsdkenv_unix.{csh,sh}.in
#fix permissions
find examples -type f -exec chmod -x {} \;
}
Deleted: buildfix_bison25.diff
===================================================================
--- buildfix_bison25.diff 2011-06-15 16:17:57 UTC (rev 127520)
+++ buildfix_bison25.diff 2011-06-15 18:45:39 UTC (rev 127521)
@@ -1,23 +0,0 @@
---- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600
-+++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600
-@@ -4338,7 +4338,7 @@
- }
-
- // -------------------------------------------------------------------------
--void OSQLParser::error(sal_Char *fmt)
-+void OSQLParser::error(const sal_Char *fmt)
- {
- if(!m_sErrorMessage.getLength())
- {
---- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600
-+++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600
-@@ -233,7 +233,7 @@
- // returns the type for a parameter in a given function name
- static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
-
-- void error(sal_Char *fmt);
-+ void error(const sal_Char *fmt);
- int SQLlex();
- #ifdef YYBISON
- void setParseTree(OSQLParseNode * pNewParseTree);
-
Deleted: buildfix_i116795.diff
===================================================================
--- buildfix_i116795.diff 2011-06-15 16:17:57 UTC (rev 127520)
+++ buildfix_i116795.diff 2011-06-15 18:45:39 UTC (rev 127521)
@@ -1,22 +0,0 @@
-diff -r 4ab9e11cb892 connectivity/qa/makefile.mk
---- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100
-+++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100
-@@ -35,9 +35,16 @@
-
- #----- compile .java files -----------------------------------------
-
--JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
- JAVAFILES := $(shell @$(FIND) complex -name "*.java")
-
-+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-+
-+.IF "$(SYSTEM_HSQLDB)" == "YES"
-+EXTRAJARFILES = $(HSQLDB_JAR)
-+.ELSE
-+JARFILES += hsqldb.jar
-+.ENDIF
-+
- #----- make a jar from compiled files ------------------------------
-
- JARCLASSDIRS = $(PACKAGE)
-
More information about the arch-commits
mailing list