[ooo-build] A Windows build question

Pavel Lastovicka pavel.lastovicka at blue-point.cz
Wed Jun 30 03:16:16 PDT 2010


Pavel Lastovicka napsal(a):
> 
> - novell-win32-odma.diff does not apply for some reason. I have tried to 
> comment it out but then another dependent patch was failing. I am 
> looking into this.

Here is my patch:

diff --git a/patches/dev300/novell-win32-odma.diff b/patches/dev300/novell-win32
index a383dc4..b3a5f3f 100644
--- a/patches/dev300/novell-win32-odma.diff
+++ b/patches/dev300/novell-win32-odma.diff
@@ -559,14 +559,12 @@
                               AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST,
  --- fpicker/prj/build.lst.old  2010-03-03 16:59:29.000000000 +0100
  +++ fpicker/prj/build.lst      2010-03-03 16:59:55.000000000 +0100
-@@ -2,6 +2,7 @@ fp     fpicker :    l10n rdbmaker svtools NU
- fp    fpicker\inc                                                     nmake
+@@ -2,4 +2,5 @@ fp     fpicker :    l10n rdbmaker svtools NU
   fp    fpicker\source\generic                          nmake   -       all
   fp    fpicker\source\office                           nmake   -       all
  +fp    fpicker\source\odma                             nmake   -       w
   fp    fpicker\source\unx\gnome                        nmake   -       u
   fp    fpicker\source\unx\kde4                 nmake   -       u       fp_kde4_
- fp    fpicker\source\unx\kde_unx                      nmake   -       u
  --- fpicker/source/generic/makefile.mk.old     2009-10-07 15:06:59.000000000 +0
  +++ fpicker/source/generic/makefile.mk 2010-03-03 16:59:55.000000000 +0100
  @@ -50,6 +50,7 @@ SHL1TARGET=  $(TARGET)

-- 
Pavel


More information about the ooo-build mailing list