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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 13:39:52 2008
New Revision: 14637
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14637&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/config_office-liblayout-libfonts-m35:
	Differentiate for m35 vs. m36 and later.



Added:
   trunk/patches/dev300/config_office-liblayout-libfonts-m35.diff
      - copied unchanged from r14630, /trunk/patches/dev300/config_office-liblayout-libfonts.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-liblayout-libfonts.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 13:39:52 2008
@@ -1221,6 +1221,11 @@
 # bind all those function / named relocations locally
 speed-symbolic-functions.diff, i#85679, pmladek
 
+[ BuildBits < dev300-m36 ]
+# fix configure.in
+config_office-liblayout-libfonts-m35.diff
+
+[ BuildBits >= dev300-m36 ]
 # fix configure.in
 config_office-liblayout-libfonts.diff
 

Modified: trunk/patches/dev300/config_office-liblayout-libfonts.diff
==============================================================================
--- trunk/patches/dev300/config_office-liblayout-libfonts.diff	(original)
+++ trunk/patches/dev300/config_office-liblayout-libfonts.diff	Fri Nov 28 13:39:52 2008
@@ -1,16 +1,5 @@
 --- config_office/configure.in-old	2008-02-05 09:22:27.000000000 +0100
 +++ config_office/configure.in	2008-02-05 09:23:17.000000000 +0100
-@@ -383,6 +383,10 @@
- [  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
- [ LIBLAYOUT_JAR="$withval"
- ])
-+AC_ARG_WITH(libloader-jar,
-+[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
-+[ LIBLOADER_JAR="$withval"
-+])
- AC_ARG_WITH(libformula-jar,
- [  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
- [ LIBFORMULA_JAR="$withval"
 @@ -391,7 +395,7 @@
  [  --with-librepository-jar=JARFILE   Specify path to jarfile manually ],
  [ LIBREPOSITORY_JAR="$withval"