[arch-commits] Commit in openoffice-base-devel/repos (3 files)

[andyrtr at archlinux.org]

    Date: Thursday, October 8, 2009 @ 04:49:42
  Author: andyrtr
Revision: 54310

Merged revisions 54309 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-devel/trunk

........
  r54309 | andyrtr | 2009-10-08 08:48:54 +0000 (Do, 08 Okt 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m61-1
      new snapshot DEV300_m61, use system lucene again
........

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

-----------+
 ChangeLog |    7 +++++++
 PKGBUILD  |   18 +++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-53311
   + /openoffice-base-devel/trunk:1-54309

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-08 08:48:54 UTC (rev 54309)
+++ extra-x86_64/ChangeLog	2009-10-08 08:49:42 UTC (rev 54310)
@@ -1,3 +1,10 @@
+2009-10-08 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m61-1:
+	- new snapshot
+	- use system lucene again
+	- drop shell.patch that went upstream
+
 2009-09-28 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m60-1:

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-08 08:48:54 UTC (rev 54309)
+++ extra-x86_64/PKGBUILD	2009-10-08 08:49:42 UTC (rev 54310)
@@ -5,7 +5,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m60
+_OO_milestone=DEV300_m61
 pkgver=3.2_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -18,8 +18,7 @@
 	     # from main OOo the deps
 	     "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
              'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
-	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
-	     # 'lucene'
+	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene')
 	     # boost
 	     # libmythes
 source=(${pkgname}-${_OO_milestone}.tar.gz
@@ -29,20 +28,18 @@
 	default-system-fpicker.diff
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
-	shell.patch
 	buildfix_FormulaMissingHeader.diff
 	http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
 	buildfix_system_db48.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('5213793d0639bb11396a88f302982bb8'
+md5sums=('6244c09b0b4c67519191bef0f9ec393d'
          'e3a0b76dcd876f3d721ee7183729153d'
          '63209bbc64c901ef105455bda0282f45'
          '71f136a31e296a04ab68932a31dd533e'
          '6c596129fb48316226ce3adfd3a4c86d'
          '1dc7480a04f572ad136d35923a2af66d'
          'c8e82b4d2324fe62ad8c6e29213e80b5'
-         'a51200f770c635355c430cc5052db8cf'
          '863a3ab2c17a3d11b8fa3ec321986366'
          'a130ad960f76b692e34f8566e5ca3f2b'
          '0cd6f3525939d3ef6e5a30ad30c25d27'
@@ -84,10 +81,6 @@
 	# 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
-
 	# remove the startup wizard
 	patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
 	# enables the default system-file-picker in case we have that built
@@ -165,14 +158,13 @@
 	--with-system-redland\
 	--with-alloc=system\
 	--with-jdk-home=${JAVA_HOME}\
+	--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+	--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 	--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
-#	--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-#	--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 
-
 #	--enable-layout\ /bin/bash: tralay: command not found ???
 
 #--with-system-jfreereport