[Libreoffice-commits] .: 2 commits - icu/icu4c-4_0_1-src.patch libxml2/libxml2-vc10.patch libxml2/makefile.mk libxslt/libxslt-vc10.patch libxslt/makefile.mk

[Fridrich Strba]

 icu/icu4c-4_0_1-src.patch  |   13 +++++++++++++
 libxml2/libxml2-vc10.patch |   15 +++++++++++++++
 libxml2/makefile.mk        |    3 ++-
 libxslt/libxslt-vc10.patch |   15 +++++++++++++++
 libxslt/makefile.mk        |    3 ++-
 5 files changed, 47 insertions(+), 2 deletions(-)

New commits:
commit 4f3b294360257bfed4a4abfbb147727130c3beb1
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Tue Oct 19 23:47:14 2010 +0200

    Fix compilation of icu for VC++ 10

diff --git a/icu/icu4c-4_0_1-src.patch b/icu/icu4c-4_0_1-src.patch
index 172d624..6d50ca6 100644
--- a/icu/icu4c-4_0_1-src.patch
+++ b/icu/icu4c-4_0_1-src.patch
@@ -245,3 +245,16 @@
      T_FileStream_writeLine(makefile, tmp);
  
      if(o->hadStdin == FALSE) { /* shortcut */
+--- misc/build/icu/source/test/intltest/dtifmtts.cpp.old	2010-09-20 20:49:33.953125000 +0200
++++ misc/build/icu/source/test/intltest/dtifmtts.cpp	2010-09-20 20:51:37.875000000 +0200
+@@ -13,8 +13,9 @@
+ //FIXME: define it in compiler flag
+ //#define DTIFMTTS_DEBUG 1
+ 
+-
++#if defined (_MSC_VER) && (_MSC_VER < 1600)
+ #include <iostream>
++#endif
+ #ifdef DTIFMTTS_DEBUG 
+ #endif
+
commit 298daab62dc5963c0d8fa76c0ede56efbf7c1490
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Wed Oct 20 01:10:02 2010 +0200

    Build fixes for VC++ 10

diff --git a/libxml2/libxml2-vc10.patch b/libxml2/libxml2-vc10.patch
new file mode 100755
index 0000000..54d12f1
--- /dev/null
+++ b/libxml2/libxml2-vc10.patch
@@ -0,0 +1,15 @@
+--- misc/build/libxml2-2.7.6/win32/Makefile.msvc.old	2010-09-20 20:22:41.500000000 +0200
++++ misc/build/libxml2-2.7.6/win32/Makefile.msvc	2010-09-20 20:23:00.250000000 +0200
+@@ -91,8 +91,12 @@
+ LDFLAGS = $(LDFLAGS) /DEBUG
+ !else
+ CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
++!if "$(_NMAKE_VER)" >= "10.00.30319.01"
++LDFLAGS = $(LDFLAGS)
++!else
+ LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+ !endif
++!endif
+ 
+ # Libxml object files.
+ XML_OBJS = $(XML_INTDIR)\c14n.obj\
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index c9677f0..0c69c36 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -52,7 +52,8 @@ PATCH_FILES=libxml2-configure.patch \
             libxml2-mingw.patch \
             libxml2-gnome599717.patch \
             libxml2-global-symbols.patch \
-            libxml2-aix.patch
+            libxml2-aix.patch \
+            libxml2-vc10.patch
 
 # This is only for UNX environment now
 
diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch
new file mode 100644
index 0000000..3d8b330
--- /dev/null
+++ b/libxslt/libxslt-vc10.patch
@@ -0,0 +1,15 @@
+--- misc/build/libxslt-1.1.26/win32/Makefile.msvc.old	2010-10-20 01:02:55.359375000 +0200
++++ misc/build/libxslt-1.1.26/win32/Makefile.msvc	2010-10-20 01:03:05.187500000 +0200
+@@ -71,8 +71,12 @@
+ LDFLAGS = $(LDFLAGS) /DEBUG
+ !else
+ CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
++!if "$(_NMAKE_VER)" >= "10.00.30319.01"
++LDFLAGS = $(LDFLAGS)
++!else
+ LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+ !endif
++!endif
+ 
+ # Libxslt object files.
+ XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 9a7be2e..2e6d178 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -56,7 +56,8 @@ PATCH_FILES=libxslt-configure.patch \
             libxslt-win_manifest.patch \
             libxslt-mingw.patch \
             libxslt-internal-symbols.patch \
-            libxslt-aix.patch
+            libxslt-aix.patch \
+            libxslt-vc10.patch
 
 # This is only for UNX environment now
 .IF "$(OS)"=="WNT"