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

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Sep 28 13:05:52 UTC 2009


    Date: Monday, September 28, 2009 @ 09:05:52
  Author: andyrtr
Revision: 53311

upgpkg: openoffice-base-devel 3.2_dev300_m60-1
    new snapshot DEV300_m60; build for db48; use internal lucene and drop unneded patches

Added:
  openoffice-base-devel/trunk/buildfix-gcc44.diff
  openoffice-base-devel/trunk/buildfix_system_db48.diff
Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD
Deleted:
  openoffice-base-devel/trunk/buildfix-gcc43.diff
  openoffice-base-devel/trunk/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch

------------------------------------------------------+
 ChangeLog                                            |   11 ++++++
 PKGBUILD                                             |   30 +++++++++--------
 buildfix-gcc43.diff                                  |   10 -----
 buildfix-gcc44.diff                                  |   10 +++++
 buildfix_system_db48.diff                            |   11 ++++++
 openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch |   16 ---------
 6 files changed, 49 insertions(+), 39 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-28 06:15:27 UTC (rev 53310)
+++ ChangeLog	2009-09-28 13:05:52 UTC (rev 53311)
@@ -1,3 +1,14 @@
+2009-09-28 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m60-1:
+	- new snapshot
+	- built against new db48
+	- drop gcc43 buildfix
+	- drop npapi buildfix for new xulrunner
+	- enable report builder extension	
+	- add gcc44 buildfix
+	- use internal lucene again, system lucene is broken
+
 2009-09-25 Andreas Radke <andyrtr at archlinux.org>
 
 	- i686 pkg needs to be build with internal

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-28 06:15:27 UTC (rev 53310)
+++ PKGBUILD	2009-09-28 13:05:52 UTC (rev 53311)
@@ -5,7 +5,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m59
+_OO_milestone=DEV300_m60
 pkgver=3.2_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -18,7 +18,8 @@
 	     # 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'
-	     'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
+	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
+	     # 'lucene'
 	     # boost
 	     # libmythes
 source=(${pkgname}-${_OO_milestone}.tar.gz
@@ -27,24 +28,24 @@
 	default-no-startup-wizard.diff
 	default-system-fpicker.diff
 	soffice-detect-mozilla-certificates.diff
-	buildfix-gcc43.diff
+	buildfix-gcc44.diff
 	shell.patch
 	buildfix_FormulaMissingHeader.diff
-	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 	http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
+	buildfix_system_db48.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('d7382448f57c8ee78f7a4999d5d61e9c'
+md5sums=('5213793d0639bb11396a88f302982bb8'
          'e3a0b76dcd876f3d721ee7183729153d'
          '63209bbc64c901ef105455bda0282f45'
          '71f136a31e296a04ab68932a31dd533e'
          '6c596129fb48316226ce3adfd3a4c86d'
          '1dc7480a04f572ad136d35923a2af66d'
-         'bf7119084a2d1e0566b5e34b57dce8eb'
+         'c8e82b4d2324fe62ad8c6e29213e80b5'
          'a51200f770c635355c430cc5052db8cf'
          '863a3ab2c17a3d11b8fa3ec321986366'
-         '75c7e5dd7cf4c266f48565fb6425f8c4'
          'a130ad960f76b692e34f8566e5ca3f2b'
+         '0cd6f3525939d3ef6e5a30ad30c25d27'
          '8d68d44c941a687813ddd968383cdf27')
                                                                        
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -74,10 +75,10 @@
 	export NO_HIDS=true
 
 	# build fixes
-	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
+	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
 	patch -Np0 -i ${srcdir}/openldap.patch || return 1
+	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || 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. 
@@ -141,6 +142,7 @@
 	--enable-opengl\
 	--enable-pdfimport\
 	--enable-presenter-console\
+	--enable-report-builder\
 	--enable-vba\
 	--enable-verbose\
 	--enable-wiki-publisher\
@@ -152,6 +154,7 @@
 	--without-ppds\
 	--without-system-agg\
 	--without-system-boost\
+	--without-system-lucene\
 	--with-openldap\
 	--with-system-stdlibs\
 	--with-system-libs\
@@ -162,16 +165,17 @@
 	--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
-#	--enable-report-builder\
 
 #	--with-system-mythes\
 
@@ -197,7 +201,7 @@
  install=openoffice.install
  depends=("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' 
-	  'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libmythes' 'libldap')
+	  'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap') # 'lucene' 'libmythes'
  optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'

Deleted: buildfix-gcc43.diff
===================================================================
--- buildfix-gcc43.diff	2009-09-28 06:15:27 UTC (rev 53310)
+++ buildfix-gcc43.diff	2009-09-28 13:05:52 UTC (rev 53311)
@@ -1,10 +0,0 @@
---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
-+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
-@@ -46,6 +46,7 @@
- #include <typelib/typedescription.hxx>
- #include <uno/any2.h>
- 
-+#include <string.h>
- #include "share.hxx"
- 
- 

Added: buildfix-gcc44.diff
===================================================================
--- buildfix-gcc44.diff	                        (rev 0)
+++ buildfix-gcc44.diff	2009-09-28 13:05:52 UTC (rev 53311)
@@ -0,0 +1,10 @@
+--- oox/source/token/tokenmap.cxx	2009-09-28 06:35:40.000000000 +0000
++++ oox/source/token/tokenmap.cxx.new	2009-09-28 10:12:00.996437647 +0000
+@@ -33,6 +33,7 @@
+ #include <rtl/string.hxx>
+ #include "tokens.hxx"
+ #include "oox/helper/containerhelper.hxx"
++#include <string.h>
+ 
+ using ::rtl::OString;
+ using ::rtl::OUString;

Added: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	                        (rev 0)
+++ buildfix_system_db48.diff	2009-09-28 13:05:52 UTC (rev 53311)
@@ -0,0 +1,11 @@
+--- configure.in	2009-08-25 15:10:12.000000000 +0000
++++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
+@@ -3626,7 +3626,7 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for v in `seq 1 8`; do
+        AC_TRY_RUN([
+ #include <db.h>
+ 

Deleted: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
===================================================================
--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	2009-09-28 06:15:27 UTC (rev 53310)
+++ openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	2009-09-28 13:05:52 UTC (rev 53311)
@@ -1,16 +0,0 @@
-Index: source/plugin/inc/plugin/unx/plugcon.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
-retrieving revision 1.13.64.2
-diff -u -r1.13.64.2 plugcon.hxx
---- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
-+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
-@@ -102,7 +102,7 @@
- extern "C" {
- #include <npsdk/npupp.h>
- }
--#include <npapi.h>
-+#include <npsdk/npapi.h>
- 
- #if NP_VERSION_MINOR < 17
- // compatibility hack: compile with older NPN api header, but define




More information about the arch-commits mailing list