ooo-build r13032 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jul  3 01:44:54 2008
New Revision: 13032
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13032&view=rev

Log:
2008-07-03  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: ant-regexp-check.diff is in
          beb300-m3/dev300-m24
        * patches/dev300/apply,
          patches/dev300/scp2-without-myspell-dicts.diff: fix installation
          with --without-myspell-dicts


Added:
   trunk/patches/dev300/scp2-without-myspell-dicts.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul  3 01:44:54 2008
@@ -511,9 +511,14 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+[ Fixes < dev300-m24 < beb300-m3 ]
 # ensure that ant can do regexp matches.
 ant-regexp-test.diff, i#89383, michael
 
+[ Fixes >= dev300-m23 >= beb300-m2 ]
+# fix installation with --without-myspell-dicts
+scp2-without-myspell-dicts.diff, i#91319, rengelha
+
 [ Fixes < dev300-m22 >= beb300-m1 ]
 # explicitely convert cwsid to integer
 # otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0

Added: trunk/patches/dev300/scp2-without-myspell-dicts.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/scp2-without-myspell-dicts.diff	Thu Jul  3 01:44:54 2008
@@ -0,0 +1,40 @@
+Index: ooo/file_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
+retrieving revision 1.248.8.1
+diff -u -u -r1.248.8.1 file_ooo.scp
+--- scp2/source/ooo/file_ooo.scp	30 Jun 2008 17:07:17 -0000	1.248.8.1
++++ scp2/source/ooo/file_ooo.scp	2 Jul 2008 23:14:23 -0000
+@@ -2923,6 +2923,8 @@
+     Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+ End
+ 
++#ifndef WITHOUT_MYSPELL_DICTS
++
+ // Dictionary extensions
+ 
+ File gid_File_Extension_Dictionary_Af
+@@ -3078,3 +3080,5 @@
+ 	Styles = (PACKED);
+ 	UnixRights = 444;
+ End
++
++#endif
+Index: ooo/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
+retrieving revision 1.69
+diff -u -u -r1.69 makefile.mk
+--- scp2/source/ooo/makefile.mk	9 Jun 2008 12:51:56 -0000	1.69
++++ scp2/source/ooo/makefile.mk	2 Jul 2008 23:14:23 -0000
+@@ -119,6 +119,10 @@
+ SCPDEFS+=-DWITHOUT_MOZILLA
+ .ENDIF
+ 
++.IF "$(WITH_MYSPELL_DICTS)" == "NO"
++SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
++.ENDIF
++
+ .IF "$(SYSTEM_MOZILLA)" == "YES"
+ SCPDEFS+=-DSYSTEM_MOZILLA
+ .ENDIF