Fix wxWidgets patch.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3223 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/build-dependencies b/bacula/src/win32/build-dependencies
index 35a8a34d405d764c7d8dbff27b3eccc9065dfd01..9ebd2beb7fe2c085f005ef50fe48715ea22f8608 100755 (executable)
--- a/bacula/src/win32/build-dependencies
+++ b/bacula/src/win32/build-dependencies
@@ -138,7 +138,7 @@ do_patch()
 {
        PATCH_FILE=${SCRIPT_DIR}/patches/$1; shift
        
-       if patch -f -p0 "$@" >patch.log < ${PATCH_FILE}
+       if patch -f -p0 "$@" >>patch.log < ${PATCH_FILE}
        then
                :
        else
@@ -163,6 +163,7 @@ process_zlib()
        if get_source "${URL_ZLIB}" "${DIR_ZLIB}"
        then
                echo Patching zlib
+               >patch.log
                do_patch zlib.patch
        fi
        echo Building zlib
@@ -177,6 +178,7 @@ process_pcre()
        if get_source "${URL_PCRE}" "${DIR_PCRE}"
        then
                echo Patching PCRE
+               >patch.log
                do_patch pcre.patch
        fi
        echo Configuring PCRE
@@ -192,6 +194,7 @@ process_pthreads()
        if get_source "${URL_PTHREADS}" "${DIR_PTHREADS}"
        then
                echo Patching pthreads
+               >patch.log
                do_patch pthreads.patch
        fi
        echo Building pthreads
@@ -210,6 +213,7 @@ process_openssl()
        if get_source "${URL_OPENSSL}" "${DIR_OPENSSL}"
        then
                echo Patching openssl
+               >patch.log
                do_patch openssl.patch
        fi
        echo Configuring openssl
@@ -245,6 +249,7 @@ process_postgreSQL()
        if get_source "${URL_POSTGRESQL}" "${DIR_POSTGRESQL}"
        then
                echo Patching postgreSQL
+               >patch.log
                do_patch postgresql.patch
        fi
        echo Configuring postgreSQL
@@ -266,6 +271,7 @@ process_sqlite()
        if get_source "${URL_SQLITE}" "${DIR_SQLITE}"
        then
                echo Patching SQLite
+               >patch.log
                do_patch sqlite.patch
        fi
        echo Configuring SQLite
@@ -285,7 +291,9 @@ process_wxWidgets()
        if get_source "${URL_WX}" "${DIR_WX}"
        then
                echo Patching wxWidgets
-               do_patch wx.patch -o build/msw/config.mingw32
+               >patch.log
+               do_patch wx1.patch -o build/msw/config.mingw32
+               do_patch wx2.patch
                find . -name makefile.gcc -exec sh -c "sed -f ${SCRIPT_DIR}/patches/wx.sed {} > \`echo {} | sed s/\.gcc$/\.mingw32/\`" \;
        fi
        echo Building wxWidgets
@@ -335,6 +343,7 @@ process_nsis()
        if get_source "${URL_NSIS_SRC}" "${DIR_NSIS_SRC}"
        then
                echo Patching nsis
+               >patch.log
                do_patch nsis.patch
        fi
        echo Building nsis
@@ -362,6 +371,7 @@ process_mtx()
                cp -f config.h.in config.h
                cp -f Makefile.in Makefile
                rm -f configure
+               >patch.log
                do_patch mtx.patch
        fi
        echo Building mtx
@@ -375,6 +385,7 @@ process_mt()
        if get_source "${URL_MT}" "${DIR_MT}"
        then
                echo Patching mt
+               >patch.log
                do_patch mt.patch
        fi
        echo Building mt

diff --git a/bacula/src/win32/patches/wx.patch b/bacula/src/win32/patches/wx.patch
deleted file mode 100644 (file)
index 04af98c..0000000
--- a/bacula/src/win32/patches/wx.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- build/msw/config.gcc       Sun Feb  5 13:37:26 2006
-+++ build/msw/config.mingw32   Mon Jun 26 16:54:42 2006
-@@ -11,10 +11,10 @@
- # -------------------------------------------------------------------------
- 
- # C compiler 
--CC = gcc
-+CC = mingw32-gcc
- 
- # C++ compiler 
--CXX = g++
-+CXX = mingw32-g++
- 
- # Standard flags for CC 
- CFLAGS = 
-@@ -23,10 +23,10 @@
- CXXFLAGS = 
- 
- # Standard preprocessor flags (common for CC and CXX) 
--CPPFLAGS = 
-+CPPFLAGS = -I../../../zlib
- 
- # Standard linker flags 
--LDFLAGS = 
-+LDFLAGS = -L../../../zlib
- 
- # The C preprocessor 
- CPP = $(CC) -E
-@@ -44,7 +44,7 @@
- MSLU = 0
- 
- # Type of compiled binaries [debug,release]
--BUILD = debug
-+BUILD = release
- 
- # Should debugging info be included in the executables? The default value
- # "default" means that debug info will be included if BUILD=debug
---- ../release/wxWidgets-2.6.3/include/wx/string.h     2005-12-15 11:26:27.000000000 -0800
-+++ ./include/wx/string.h      2006-07-31 20:50:32.000000000 -0700
-@@ -229,7 +229,7 @@
- #endif
-   // VC++ free must take place in same DLL as allocation when using non dll
-   // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
--#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
-+#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
-   void  Unlock() { if ( !IsEmpty() && --nRefs == 0) Free();  }
-   // we must not inline deallocation since allocation is not inlined
-   void  Free();
---- ../release/wxWidgets-2.6.3/src/common/string.cpp   2005-11-30 05:30:08.000000000 -0800
-+++ ./src/common/string.cpp    2006-07-31 20:48:53.000000000 -0700
-@@ -172,7 +172,7 @@
- // wxStringData class deallocation
- // ===========================================================================
- 
--#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
-+#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
- #  pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!")
- void wxStringData::Free()
- {

diff --git a/bacula/src/win32/patches/wx1.patch b/bacula/src/win32/patches/wx1.patch
new file mode 100644 (file)
index 0000000..268497f
--- /dev/null
+++ b/bacula/src/win32/patches/wx1.patch
@@ -0,0 +1,37 @@
+--- build/msw/config.gcc       Sun Feb  5 13:37:26 2006
++++ build/msw/config.mingw32   Mon Jun 26 16:54:42 2006
+@@ -11,10 +11,10 @@
+ # -------------------------------------------------------------------------
+ 
+ # C compiler 
+-CC = gcc
++CC = mingw32-gcc
+ 
+ # C++ compiler 
+-CXX = g++
++CXX = mingw32-g++
+ 
+ # Standard flags for CC 
+ CFLAGS = 
+@@ -23,10 +23,10 @@
+ CXXFLAGS = 
+ 
+ # Standard preprocessor flags (common for CC and CXX) 
+-CPPFLAGS = 
++CPPFLAGS = -I../../../zlib
+ 
+ # Standard linker flags 
+-LDFLAGS = 
++LDFLAGS = -L../../../zlib
+ 
+ # The C preprocessor 
+ CPP = $(CC) -E
+@@ -44,7 +44,7 @@
+ MSLU = 0
+ 
+ # Type of compiled binaries [debug,release]
+-BUILD = debug
++BUILD = release
+ 
+ # Should debugging info be included in the executables? The default value
+ # "default" means that debug info will be included if BUILD=debug

diff --git a/bacula/src/win32/patches/wx2.patch b/bacula/src/win32/patches/wx2.patch
new file mode 100644 (file)
index 0000000..f074d3d
--- /dev/null
+++ b/bacula/src/win32/patches/wx2.patch
@@ -0,0 +1,22 @@
+--- ../release/wxWidgets-2.6.3/include/wx/string.h     2005-12-15 11:26:27.000000000 -0800
++++ ./include/wx/string.h      2006-07-31 20:50:32.000000000 -0700
+@@ -229,7 +229,7 @@
+ #endif
+   // VC++ free must take place in same DLL as allocation when using non dll
+   // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
+-#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
++#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
+   void  Unlock() { if ( !IsEmpty() && --nRefs == 0) Free();  }
+   // we must not inline deallocation since allocation is not inlined
+   void  Free();
+--- ../release/wxWidgets-2.6.3/src/common/string.cpp   2005-11-30 05:30:08.000000000 -0800
++++ ./src/common/string.cpp    2006-07-31 20:48:53.000000000 -0700
+@@ -172,7 +172,7 @@
+ // wxStringData class deallocation
+ // ===========================================================================
+ 
+-#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
++#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
+ #  pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!")
+ void wxStringData::Free()
+ {