mingwport30: merge with DEV300 m80

5 files changed, 31 insertions, 18 deletions

diff --git a/libxslt/libxslt-1.1.24.patch b/libxslt/libxslt-configure.patch
index f30773fe7cef..bfa0b512824e 100644
--- a/libxslt/libxslt-1.1.24.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/ltmain.sh	Wed Aug 29 14:28:46 2007
-+++ misc/build/libxslt-1.1.24/ltmain.sh	Wed Jun 25 13:06:05 2008
-@@ -3234,9 +3234,9 @@
+--- misc/libxslt-1.1.26/ltmain.sh	Wed Aug 29 14:28:46 2007
++++ misc/build/libxslt-1.1.26/ltmain.sh	Wed Jun 25 13:06:05 2008
+@@ -6195,9 +6195,9 @@
  	    revision="$number_revision"
  	    ;;
  	  freebsd-aout|freebsd-elf|sunos)
@@ -12,20 +12,20 @@
 +	    revision="$number_revision"
  	    ;;
  	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3311,8 +3311,8 @@
+ 	    func_arith $number_major + $number_minor
+@@ -6271,8 +6271,8 @@
  	  ;;
  
  	freebsd-elf)
 -	  major=".$current"
--	  versuffix=".$current";
+-	  versuffix=".$current"
 +	  major=.`expr $current - $age`
 +	  versuffix="$major.$age.$revision"
  	  ;;
  
  	irix | nonstopux)
---- misc/libxslt-1.1.24/xslt-config.in	Wed Jan 17 14:18:26 2007
-+++ misc/build/libxslt-1.1.24/xslt-config.in	Wed Jun 25 13:06:05 2008
+--- misc/libxslt-1.1.26/xslt-config.in	Wed Jan 17 14:18:26 2007
++++ misc/build/libxslt-1.1.26/xslt-config.in	Wed Jun 25 13:06:05 2008
 @@ -1,10 +1,16 @@
  #! /bin/sh
  
@@ -57,9 +57,9 @@
  if test "$includedir" != "/usr/include"; then
      the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
  else
---- misc/libxslt-1.1.24/configure	2008-05-14 00:40:54.000000000 +0900
-+++ misc/build/libxslt-1.1.24/configure	2008-07-17 22:12:38.097000000 +0900
-@@ -5730,7 +5730,7 @@
+--- misc/libxslt-1.1.26/configure	2008-05-14 00:40:54.000000000 +0900
++++ misc/build/libxslt-1.1.26/configure	2008-07-17 22:12:38.097000000 +0900
+@@ -7437,7 +7437,7 @@
  
  cygwin*)
    # func_win32_libid is a shell function defined in ltmain.sh
@@ -68,7 +68,7 @@
    lt_cv_file_magic_cmd='func_win32_libid'
    ;;
  
-@@ -5739,7 +5739,7 @@
+@@ -7446,7 +7446,7 @@
    # func_win32_libid shell function, so use a weaker test based on 'objdump',
    # unless we find 'file', for example because we are cross-compiling.
    if ( file / ) >/dev/null 2>&1; then
diff --git a/libxslt/libxslt-gnome602728.patch b/libxslt/libxslt-gnome602728.patch
new file mode 100644
index 000000000000..182855bf9486
--- /dev/null
+++ b/libxslt/libxslt-gnome602728.patch
@@ -0,0 +1,11 @@
+--- misc/libxslt-1.1.26.orig/configure	2009-12-21 10:07:14.000000000 +0000
++++ misc/build/libxslt-1.1.26/configure	2009-12-21 10:07:42.000000000 +0000
+@@ -13402,7 +13402,7 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+-    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++    VERSION_SCRIPT_FLAGS=""
+ 
+  if test -n "$VERSION_SCRIPT_FLAGS"; then
+   USE_VERSION_SCRIPT_TRUE=
diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-win_manifest.patch
index 40f07324ccff..43c14eb70b8b 100644
--- a/libxslt/libxslt-1.1.24_win_manifest.patch
+++ b/libxslt/libxslt-win_manifest.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/win32/configure.js	2007-08-03 15:41:02.000000000 +0200
-+++ misc/build/libxslt-1.1.24/win32/configure.js	2009-05-07 13:09:42.294993200 +0200
-@@ -51,7 +51,7 @@
+--- misc/libxslt-1.1.26/win32/configure.js	2007-08-03 15:41:02.000000000 +0200
++++ misc/build/libxslt-1.1.26/win32/configure.js	2009-05-07 13:09:42.294993200 +0200
+@@ -52,7 +52,7 @@
  var dirSep = "\\";
  var compiler = "msvc";
  var cruntime = "/MD";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
index 94c8220336fe..c80c0e9535b0 100644
--- a/libxslt/libxsltversion.mk
+++ b/libxslt/libxsltversion.mk
@@ -29,5 +29,5 @@ LIBXSLT_MAJOR=1
 # minor 
 LIBXSLT_MINOR=1
 # micro 
-LIBXSLT_MICRO=24
+LIBXSLT_MICRO=26
 
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 29f05b8c297a..7df2fc8cde2f 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -49,8 +49,10 @@ all:
 LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-TARFILE_MD5=e83ec5d27fc4c10c6f612879bea9a153
-PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
+TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+PATCH_FILES=libxslt-configure.patch \
+            libxslt-win_manifest.patch \
+            libxslt-gnome602728.patch
 
 # This is only for UNX environment now
 .IF "$(OS)"=="WNT"