From: Michal Chruszcz <mchruszcz@gmail.com>
Date: Tue, 1 Mar 2005 14:04:32 +0000 (+0000)
Subject: - adjusted to 2.5.4
X-Git-Tag: auto/ac/wxWidgets-2_6_0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-wxWidgets.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fac%2FwxWidgets-2_6_0-1

- adjusted to 2.5.4

Changed files:
    wxWidgets-samples.patch -> 1.2
    wxWidgets-utils.patch -> 1.2
---

diff --git a/wxWidgets-samples.patch b/wxWidgets-samples.patch
index da2c346..a3900d4 100644
--- a/wxWidgets-samples.patch
+++ b/wxWidgets-samples.patch
@@ -1,11 +1,11 @@
---- wxWidgets-2.5.2/configure.in.wiget	2004-07-22 14:39:40.241126212 +0200
-+++ wxWidgets-2.5.2/configure.in	2004-07-22 14:42:07.779872983 +0200
-@@ -5485,7 +5485,7 @@
+--- wxWidgets-2.5.4/configure.in~	2005-02-28 15:03:24.811627176 +0100
++++ wxWidgets-2.5.4/configure.in	2005-02-28 15:08:28.636438784 +0100
+@@ -5069,7 +5069,7 @@
+         fi
+     fi
  
- if test "$wxUSE_TABDIALOG" = "yes"; then
-     AC_DEFINE(wxUSE_TAB_DIALOG)
--    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
-+    #SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
+-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
++    #SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
- if test "$wxUSE_TEXTCTRL" = "yes"; then
+ dnl ------------------------------------------------------------------------
diff --git a/wxWidgets-utils.patch b/wxWidgets-utils.patch
index da48c9c..ff98d6b 100644
--- a/wxWidgets-utils.patch
+++ b/wxWidgets-utils.patch
@@ -1,77 +1,33 @@
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/appsettings.cpp wxWidgets-2.5.3/utils/configtool/src/appsettings.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/appsettings.cpp	2005-01-10 12:59:51.950473496 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/appsettings.cpp	2005-01-10 12:39:34.960484096 +0100
-@@ -29,6 +29,7 @@
- #include "wx/effects.h"
+diff -U 3 -H -d -r -N wxWidgets-2.5.4.orig/utils/configtool/src/appsettings.cpp wxWidgets-2.5.4/utils/configtool/src/appsettings.cpp
+--- wxWidgets-2.5.4.orig/utils/configtool/src/appsettings.cpp	2005-02-28 15:13:40.113087000 +0100
++++ wxWidgets-2.5.4/utils/configtool/src/appsettings.cpp	2005-02-28 15:50:00.161669376 +0100
+@@ -30,6 +30,7 @@
  #include "wx/spinctrl.h"
  #include "wx/tooltip.h"
+ #include "wx/settings.h"
 +#include "wx/wx.h"
  
  #endif
  
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/configitemselector.cpp wxWidgets-2.5.3/utils/configtool/src/configitemselector.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/configitemselector.cpp	2005-01-10 12:59:51.738505720 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/configitemselector.cpp	2005-01-10 12:41:12.717622752 +0100
-@@ -27,6 +27,7 @@
- #include "wx/scrolwin.h"
- #include "wx/spinctrl.h"
- #include "wx/spinbutt.h"
+diff -U 3 -H -d -r -N wxWidgets-2.5.4.orig/utils/configtool/src/settingsdialog.cpp wxWidgets-2.5.4/utils/configtool/src/settingsdialog.cpp
+--- wxWidgets-2.5.4.orig/utils/configtool/src/settingsdialog.cpp	2005-02-28 15:13:40.115086000 +0100
++++ wxWidgets-2.5.4/utils/configtool/src/settingsdialog.cpp	2005-02-28 15:52:36.612885176 +0100
+@@ -30,6 +30,7 @@
+ #include "wx/sizer.h"
+ #include "wx/statbox.h"
+ #include "wx/dirdlg.h"
 +#include "wx/wx.h"
  
  #endif
  
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/mainframe.cpp wxWidgets-2.5.3/utils/configtool/src/mainframe.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/mainframe.cpp	2005-01-10 12:59:51.682514232 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/mainframe.cpp	2005-01-10 12:43:38.687431968 +0100
-@@ -23,6 +23,7 @@
- #ifndef WX_PRECOMP
- 
- #include "wx/splitter.h"
+diff -U 3 -H -d -r -N wxWidgets-2.5.4.orig/utils/configtool/src/utils.cpp wxWidgets-2.5.4/utils/configtool/src/utils.cpp
+--- wxWidgets-2.5.4.orig/utils/configtool/src/utils.cpp	2005-02-28 15:13:40.116086000 +0100
++++ wxWidgets-2.5.4/utils/configtool/src/utils.cpp	2005-02-28 15:53:02.121007352 +0100
+@@ -35,6 +35,7 @@
+ #include "wx/log.h"
+ #include "wx/sizer.h"
+ #include "wx/icon.h"
 +#include "wx/wx.h"
  
  #endif
  
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/settingsdialog.cpp wxWidgets-2.5.3/utils/configtool/src/settingsdialog.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/settingsdialog.cpp	2005-01-10 12:59:51.901480944 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/settingsdialog.cpp	2005-01-10 12:44:48.856764608 +0100
-@@ -27,6 +27,7 @@
- #include "wx/scrolwin.h"
- #include "wx/spinctrl.h"
- #include "wx/spinbutt.h"
-+#include "wx/wx.h"
- 
- #endif
- 
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/utils.cpp wxWidgets-2.5.3/utils/configtool/src/utils.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/utils.cpp	2005-01-10 12:59:52.015463616 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/utils.cpp	2005-01-10 12:45:35.351696304 +0100
-@@ -31,6 +31,7 @@
- #include "wx/process.h"
- #include "wx/variant.h"
- #include "wx/cmdline.h"
-+#include "wx/wx.h"
- 
- #endif
- 
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/configtool/src/wxconfigtool.cpp wxWidgets-2.5.3/utils/configtool/src/wxconfigtool.cpp
---- wxWidgets-2.5.3-orig/utils/configtool/src/wxconfigtool.cpp	2005-01-10 12:59:51.936475624 +0100
-+++ wxWidgets-2.5.3/utils/configtool/src/wxconfigtool.cpp	2005-01-10 11:58:33.919619176 +0100
-@@ -26,6 +26,7 @@
- #include "wx/menuitem.h"
- #include "wx/tooltip.h"
- #include "wx/variant.h"
-+#include "wx/wx.h"
- 
- #endif
- 
-diff -U 3 -H -d -r -N -- wxWidgets-2.5.3-orig/utils/HelpGen/src/HelpGen.cpp wxWidgets-2.5.3/utils/HelpGen/src/HelpGen.cpp
---- wxWidgets-2.5.3-orig/utils/HelpGen/src/HelpGen.cpp	2005-01-10 12:59:53.420250056 +0100
-+++ wxWidgets-2.5.3/utils/HelpGen/src/HelpGen.cpp	2005-01-10 12:49:08.512290968 +0100
-@@ -60,6 +60,7 @@
-     #include "wx/log.h"
-     #include "wx/dynarray.h"
-     #include "wx/app.h"
-+    #include "wx/wx.h"
- #endif // WX_PRECOMP
- 
- #include "wx/file.h"