[arch-commits] Commit in openoffice-base-devel/trunk (4 files)

[andyrtr at archlinux.org]

    Date: Tuesday, March 16, 2010 @ 11:07:13
  Author: andyrtr
Revision: 72465

prepare next devel release

Added:
  openoffice-base-devel/trunk/shellfix-buildbreaker-for-enable-lockdown.patch
Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD
  openoffice-base-devel/trunk/default-system-fpicker.diff

-------------------------------------------------+
 ChangeLog                                       |    5 +++++
 PKGBUILD                                        |   13 +++++++------
 default-system-fpicker.diff                     |   18 ++++++++----------
 shellfix-buildbreaker-for-enable-lockdown.patch |   12 ++++++++++++
 4 files changed, 32 insertions(+), 16 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-03-16 14:49:59 UTC (rev 72464)
+++ ChangeLog	2010-03-16 15:07:13 UTC (rev 72465)
@@ -1,3 +1,8 @@
+2010-03-16 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.3_dev300_m75-1:
+	- new snapshot
+
 2010-02-03 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3_dev300_m71-1:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-16 14:49:59 UTC (rev 72464)
+++ PKGBUILD	2010-03-16 15:07:13 UTC (rev 72465)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m71
+_OO_milestone=DEV300_m75
 pkgver=3.3_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 	     # 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"
              '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')
 	     # libmythes
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
@@ -27,6 +27,7 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
+	shellfix-buildbreaker-for-enable-lockdown.patch
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
                                                                        
@@ -61,6 +62,7 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
+	patch -Np1 -i ${srcdir}/shellfix-buildbreaker-for-enable-lockdown.patch || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
 	# its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 
@@ -131,7 +133,6 @@
 	--without-nas\
 	--without-ppds\
 	--without-system-agg\
-	--without-system-lucene\
 	--with-openldap\
 	--with-system-stdlibs\
 	--with-system-libs\
@@ -143,12 +144,12 @@
 	--with-alloc=system\
 	--with-jdk-home=${JAVA_HOME}\
 	--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+	--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+	--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.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\
-
+#	--without-system-lucene\
 #	--enable-layout\ /bin/bash: tralay: command not found ???
 #	--with-system-jfreereport
 #	--with-system-mythes\

Modified: default-system-fpicker.diff
===================================================================
--- default-system-fpicker.diff	2010-03-16 14:49:59 UTC (rev 72464)
+++ default-system-fpicker.diff	2010-03-16 15:07:13 UTC (rev 72465)
@@ -1,13 +1,11 @@
---- officecfg/registry/data/org/openoffice/Office/Common.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
-@@ -576,8 +576,8 @@
-     </node>
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu	2010-03-16 11:45:04.000000000 +0000
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu.new	2010-03-16 12:45:06.711728908 +0000
+@@ -568,7 +568,7 @@
    </node>
    <node oor:name="Misc">
--    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
--      <value>false</value>
-+    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
-+      <value>true</value>
+     <prop oor:name="UseSystemFileDialog">
+-      <value install:module="UseOOoFileDialogs">false</value>
++      <value install:module="UseOOoFileDialogs">true</value>
+       <value install:module="gconflockdown" oor:external=
+          "com.sun.star.configuration.backend.GconfBackend UseSystemFileDialog"/>
      </prop>
-     <prop oor:name="UseSystemPrintDialog"  install:module="macosx">
-       <value>true</value>

Added: shellfix-buildbreaker-for-enable-lockdown.patch
===================================================================
--- shellfix-buildbreaker-for-enable-lockdown.patch	                        (rev 0)
+++ shellfix-buildbreaker-for-enable-lockdown.patch	2010-03-16 15:07:13 UTC (rev 72465)
@@ -0,0 +1,12 @@
+diff -r 743094d52f7e shell/source/backends/gconfbe/gconfaccess.cxx
+--- a/shell/source/backends/gconfbe/gconfaccess.cxx	Wed Mar 10 08:14:34 2010 +0100
++++ b/shell/source/backends/gconfbe/gconfaccess.cxx	Wed Mar 10 09:50:41 2010 +0100
+@@ -448,7 +448,6 @@
+ #ifdef ENABLE_LOCKDOWN
+         case SETTING_AUTO_SAVE:
+         {
+-            GConfClient* aClient = GconfBackend::getGconfClient();
+             GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_AUTO_SAVE_KEY, NULL );
+ 
+             if( ( aGconfValue != NULL ) )
+