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

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Jan 2 14:19:19 EST 2010


    Date: Saturday, January 2, 2010 @ 14:19:18
  Author: andyrtr
Revision: 62113

upgpkg: openoffice-base-devel 3.2_dev300_m68-1
    new snapshot DEV300_m68

Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD
  openoffice-base-devel/trunk/buildfix-gcc44.diff
Deleted:
  openoffice-base-devel/trunk/buildfix_system_db48.diff

---------------------------+
 ChangeLog                 |    6 +
 PKGBUILD                  |   13 +--
 buildfix-gcc44.diff       |  159 ++++++++++++++++++++++++++++++++++++++++++++
 buildfix_system_db48.diff |   11 ---
 4 files changed, 171 insertions(+), 18 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-02 16:43:00 UTC (rev 62112)
+++ ChangeLog	2010-01-02 19:19:18 UTC (rev 62113)
@@ -1,3 +1,9 @@
+2010-01-01 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m68-1:
+        - new snapshot
+	- build with internal lucene
+
 2009-12-18 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m67-1:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-02 16:43:00 UTC (rev 62112)
+++ PKGBUILD	2010-01-02 19:19:18 UTC (rev 62113)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m67
+_OO_milestone=DEV300_m68
 pkgver=3.2_${_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' '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' 'lucene' 'boost>=1.41.0')
+	     '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,7 +27,6 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
-	buildfix_system_db48.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
                                                                        
@@ -38,7 +37,7 @@
 #	mkdir -p ${srcdir}/${_OO_milestone}
 #	cd ${srcdir}
 #	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
-#	tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
+#	tar -cvzf ${SRCDEST}/${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
 #	return 1
 
 	cd ${srcdir}/${_OO_milestone}
@@ -60,7 +59,6 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || 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. 
@@ -142,12 +140,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
 #	--with-system-mythes\

Modified: buildfix-gcc44.diff
===================================================================
--- buildfix-gcc44.diff	2010-01-02 16:43:00 UTC (rev 62112)
+++ buildfix-gcc44.diff	2010-01-02 19:19:18 UTC (rev 62113)
@@ -8,3 +8,162 @@
  
  using ::rtl::OString;
  using ::rtl::OUString;
+--- lingucomponent/source/lingutil/lingutil.cxx	2010-01-01 14:51:14.000000000 +0000
++++ lingucomponent/source/lingutil/lingutil.cxx.new	2010-01-01 17:23:40.812325940 +0000
+@@ -44,6 +44,7 @@
+ #endif
+ 
+ 
++#include <string.h>
+ #include <osl/thread.h>
+ #include <osl/file.hxx>
+ #include <tools/debug.hxx>
+--- lingucomponent/source/thesaurus/libnth/nthesimp.cxx	2010-01-01 14:51:14.000000000 +0000
++++ lingucomponent/source/thesaurus/libnth/nthesimp.cxx.new	2010-01-02 09:45:13.229770814 +0000
+@@ -32,6 +32,7 @@
+ #include "precompiled_lingucomponent.hxx"
+ 
+ // include <stdio.h>
++#include <string.h>
+ #include <com/sun/star/uno/Reference.h>
+ 
+ #include <cppuhelper/factory.hxx>	// helper for factories
+--- lingucomponent/source/spellcheck/spell/sspellimp.cxx	2010-01-01 14:51:14.000000000 +0000
++++ lingucomponent/source/spellcheck/spell/sspellimp.cxx.new	2010-01-02 11:53:11.039003768 +0000
+@@ -29,6 +29,7 @@
+  ************************************************************************/
+ 
+ // MARKER(update_precomp.py): autogen include statement, do not remove
++#include <string.h>
+ #include "precompiled_lingucomponent.hxx"
+ #include <com/sun/star/uno/Reference.h>
+ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
+--- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx	2010-01-01 14:51:14.000000000 +0000
++++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx.new	2010-01-02 14:09:02.014854702 +0000
+@@ -31,7 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_lingucomponent.hxx"
+ 
+-
++#include <string.h>
+ #include <com/sun/star/uno/Reference.h>
+ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
+ 
+@@ -544,10 +544,10 @@
+   char *lcword;
+   int k;
+ 
+-  PropertyHelper_Hyphen & rHelper = GetPropHelper();
+-  rHelper.SetTmpPropVals(aProperties);
+-  sal_Int16 minTrail = rHelper.GetMinTrailing();
+-  sal_Int16 minLead = rHelper.GetMinLeading();
++  PropertyHelper_Hyphen & rHelper = GetPropHelper();
++  rHelper.SetTmpPropVals(aProperties);
++  sal_Int16 minTrail = rHelper.GetMinTrailing();
++  sal_Int16 minLead = rHelper.GetMinLeading();
+ 
+   HyphenDict *dict = NULL;
+   rtl_TextEncoding aEnc = 0;
+@@ -621,9 +621,9 @@
+       wordlen = encWord.getLength();
+       lcword = new char[wordlen+1];
+       hyphens = new char[wordlen+5];
+-      char ** rep = NULL; // replacements of discretionary hyphenation
+-      int * pos = NULL; // array of [hyphenation point] minus [deletion position] 
+-      int * cut = NULL; // length of deletions in original word
++      char ** rep = NULL; // replacements of discretionary hyphenation
++      int * pos = NULL; // array of [hyphenation point] minus [deletion position] 
++      int * cut = NULL; // length of deletions in original word
+ 
+       // copy converted word into simple char buffer
+       strcpy(lcword,encWord.getStr());
+@@ -634,21 +634,21 @@
+       n++;
+       // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr);
+       if (n > 0) {
+-         if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,
+-            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
+-            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))
++         if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,
++            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
++            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))
+          {
+              delete[] hyphens;
+              delete[] lcword;
+-
+-             if (rep) {
+-                 for(int j = 0; j < n; j++) {
+-                     if (rep[j]) free(rep[j]);
+-                 }
+-                 free(rep);
+-             }
+-             if (pos) free(pos);
+-             if (cut) free(cut);
++
++             if (rep) {
++                 for(int j = 0; j < n; j++) {
++                     if (rep[j]) free(rep[j]);
++                 }
++                 free(rep);
++             }
++             if (pos) free(pos);
++             if (cut) free(cut);
+ 
+              return NULL;
+          }
+@@ -662,7 +662,7 @@
+       INT16 i;
+ 
+       for ( i = 0; i < encWord.getLength(); i++)
+-        if (hyphens[i]&1 && (!rep || !rep[i]))
++        if (hyphens[i]&1 && (!rep || !rep[i]))
+           nHyphCount++;
+ 
+       Sequence< INT16 > aHyphPos(nHyphCount);
+@@ -671,14 +671,14 @@
+       OUString hyphenatedWord;
+       nHyphCount = 0;
+ 
+-      for (i = 0; i < nWord.getLength(); i++) {
++      for (i = 0; i < nWord.getLength(); i++) {
+           hyphenatedWordBuffer.append(aWord[i]);
+-          // hyphenation position (not alternative)
+-          if (hyphens[i]&1 && (!rep || !rep[i])) {
+-              pPos[nHyphCount] = i;
+-              hyphenatedWordBuffer.append(sal_Unicode('='));
+-              nHyphCount++;
+-          }
++          // hyphenation position (not alternative)
++          if (hyphens[i]&1 && (!rep || !rep[i])) {
++              pPos[nHyphCount] = i;
++              hyphenatedWordBuffer.append(sal_Unicode('='));
++              nHyphCount++;
++          }
+       }
+ 
+       hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
+@@ -690,15 +690,15 @@
+ 
+       delete[] hyphens;
+       delete[] lcword;
+-
+-      if (rep) {
+-          for(int j = 0; j < n; j++) {
+-              if (rep[j]) free(rep[j]);
+-          }
+-          free(rep);
+-      }
+-      if (pos) free(pos);
+-      if (cut) free(cut);
++
++      if (rep) {
++          for(int j = 0; j < n; j++) {
++              if (rep[j]) free(rep[j]);
++          }
++          free(rep);
++      }
++      if (pos) free(pos);
++      if (cut) free(cut);
+ 
+       return xRes;
+   }

Deleted: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	2010-01-02 16:43:00 UTC (rev 62112)
+++ buildfix_system_db48.diff	2010-01-02 19:19:18 UTC (rev 62113)
@@ -1,11 +0,0 @@
---- 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>
- 



More information about the arch-commits mailing list