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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Feb 17 01:02:21 2009
New Revision: 15343
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15343&view=rev

Log:
2009-02-16  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/win32-prebuilt-writingaids-zip-scp2-m0.diff:
	* patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff:	
	* patches/dev300/apply: adjusted for ooo310-m1.  Note that this patch is
	for win32 build only.
	
	* patches/dev300/config_office-testing.diff: adjusted for the new 
	configure location.



Added:
   trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m0.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-testing.diff
   trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Feb 17 01:02:21 2009
@@ -1145,8 +1145,14 @@
 novell-win32-registry-branding.diff, n#191913
 
 win32-prebuilt-writingaids-zip.diff
+
+[ NovellOnlyWin32 < dev300-m42 < ooo310-m1 ]
+win32-prebuilt-writingaids-zip-scp2-m0.diff
+
+[ NovellOnlyWin32 >= dev300-m42 >= ooo310-m1 ]
 win32-prebuilt-writingaids-zip-scp2.diff
 
+[ NovellOnlyWin32 ]
 # drop stuff that is needed only on Win9x
 novell-win32-drop-win9x.diff
 

Modified: trunk/patches/dev300/config_office-testing.diff
==============================================================================
--- trunk/patches/dev300/config_office-testing.diff	(original)
+++ trunk/patches/dev300/config_office-testing.diff	Tue Feb 17 01:02:21 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	2008-06-23 14:46:06.000000000 +0200
-+++ config_office/configure.in	2008-06-23 14:47:00.000000000 +0200
+--- configure.in	2008-06-23 14:46:06.000000000 +0200
++++ configure.in	2008-06-23 14:47:00.000000000 +0200
 @@ -3534,7 +3534,7 @@
          test "$with_system_libwpd" != "no"; then
      AC_MSG_RESULT([external])

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m0.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m0.diff	Tue Feb 17 01:02:21 2009
@@ -0,0 +1,234 @@
+--- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
++++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
+@@ -2968,220 +2968,14 @@
+     Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+ End
+ 
+-// Dictionary extensions
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Af
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-af.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Cs
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-cs.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Da
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-da.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_De
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-de.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_En
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-en.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Es
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-es.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Et
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-et.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Fr
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-fr.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Gl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-gl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Hu
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-hu.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_It
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-it.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Lt
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-lt.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Ne
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-ne.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Nl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-nl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Pl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-pl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Pt
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-pt.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Ru
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-ru.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sk
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sk.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sv
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sv.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sw
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sw.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Th
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-th.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Vi
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-vi.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Zu
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-zu.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
++
++#ifndef WITHOUT_MYSPELL_DICTS
++#ifdef WNT
++File gid_File_Extension_Dictionary_Bundle
++	Dir = gid_Brand_Dir_Share_Extension_Install;
++	Name = "dict-bundle.oxt";
++	Styles = (PACKED);
++	UnixRights = 444;
++End
++#endif
++#endif

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	Tue Feb 17 01:02:21 2009
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
-@@ -2968,220 +2968,14 @@
+@@ -2968,223 +2968,17 @@
      Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
  End
  
@@ -232,3 +232,7 @@
 +End
 +#endif
 +#endif
+ 
+ // #ifdef BUILD_SPECIAL
+ // File gid_File_Extension_Oxt_Oooimprovement
+ //    Name = "OOoImprovement.oxt";
\ No newline at end of file