[arch-commits] Commit in openoffice-base-devel/trunk (ChangeLog PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, March 22, 2010 @ 00:32:21
  Author: andyrtr
Revision: 73049

switch to use internal redland/rasqal/raptor to solve some bugs

Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-03-22 00:43:49 UTC (rev 73048)
+++ ChangeLog	2010-03-22 04:32:21 UTC (rev 73049)
@@ -1,3 +1,8 @@
+2010-03-21 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.3_dev300_m75-2:
+	use internal redland/rasqal/raptor
+
 2010-03-16 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3_dev300_m75-1:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-22 00:43:49 UTC (rev 73048)
+++ PKGBUILD	2010-03-22 04:32:21 UTC (rev 73049)
@@ -6,7 +6,7 @@
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
 _OO_milestone=DEV300_m75
 pkgver=3.3_${_OO_milestone/DEV/dev}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.openoffice.org"
@@ -15,9 +15,9 @@
              'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.2-2" 
              'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'kdelibs' 'pstoedit' 'gconf' "openjdk6>=1.6.2"
 	     # from main OOo the deps
-	     "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland>=1.0.10-2' 'libxaw' "neon>=0.28.6"
+	     "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'libxaw' "neon>=0.28.6"
              'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
-	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'boost>=1.41.0' 'lucene')
+	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'boost>=1.41.0' 'lucene') #'redland>=1.0.10-2'
 	     # libmythes
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
@@ -140,7 +140,6 @@
 	--with-system-mozilla=libxul\
 	--with-system-xrender-headers\
 	--with-system-headers\
-	--with-system-redland\
 	--with-alloc=system\
 	--with-jdk-home=${JAVA_HOME}\
 	--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
@@ -149,6 +148,14 @@
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
+# causes various issues, see http://qa.openoffice.org/issues/show_bug.cgi?id=90956
+#http://bugs.archlinux.org/task/18357
+#http://bugs.archlinux.org/task/18133
+#http://bugs.archlinux.org/task/18461
+#http://bugs.archlinux.org/task/18777
+#	--with-system-redland\  
+
+
 #	--without-system-lucene\
 #	--enable-layout\ /bin/bash: tralay: command not found ???
 #	--with-system-jfreereport