Upgrade dependancies and tweak build process.

* Upgrade to use miniupnpc 1.6
* Upgrade to wxWidgets 2.9.2
* Upgrade to Bost 1.47 for Win32 Builds

3 files changed, 0 insertions, 99 deletions

diff --git a/contrib/wx-patches/README b/contrib/wx-patches/README
deleted file mode 100644
index 2afb4a9e91..0000000000
--- a/contrib/wx-patches/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This folder contains two patches which are applied to wxWidgets
-2.9.1 before building the wxWidgets which is used for release
-versions of bitcoin.  They make the GUI show up on newer OSs
-with new libgtks, such as Ubuntu 11.04.
diff --git a/contrib/wx-patches/toplevel.cpp.diff b/contrib/wx-patches/toplevel.cpp.diff
deleted file mode 100644
index 359abf28d4..0000000000
--- a/contrib/wx-patches/toplevel.cpp.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67326)

-+++ /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67496)

-@@ -72,4 +72,8 @@

- // send any activate events at all

- static int g_sendActivateEvent = -1;

-+

-+// Whether _NET_REQUEST_FRAME_EXTENTS support is working

-+//   0 == not tested yet, 1 == working, 2 == broken

-+static int gs_requestFrameExtentsStatus;

- 

- //-----------------------------------------------------------------------------

-@@ -432,4 +436,12 @@

-     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)

-     {

-+        if (win->m_netFrameExtentsTimerId)

-+        {

-+            // WM support for _NET_REQUEST_FRAME_EXTENTS is working

-+            gs_requestFrameExtentsStatus = 1;

-+            g_source_remove(win->m_netFrameExtentsTimerId);

-+            win->m_netFrameExtentsTimerId = 0;

-+        }

-+

-         wxSize decorSize = win->m_decorSize;

-         int left, right, top, bottom;

-@@ -439,4 +451,22 @@

-         win->GTKUpdateDecorSize(decorSize);

-     }

-+    return false;

-+}

-+}

-+

-+extern "C" {

-+static gboolean request_frame_extents_timeout(void* data)

-+{

-+    // WM support for _NET_REQUEST_FRAME_EXTENTS is broken

-+    gs_requestFrameExtentsStatus = 2;

-+    gdk_threads_enter();

-+    wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data);

-+    win->m_netFrameExtentsTimerId = 0;

-+    wxSize decorSize = win->m_decorSize;

-+    int left, right, top, bottom;

-+    if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom))

-+        decorSize.Set(left + right, top + bottom);

-+    win->GTKUpdateDecorSize(decorSize);

-+    gdk_threads_leave();

-     return false;

- }

-@@ -459,4 +489,5 @@

-     m_deferShowAllowed = true;

-     m_updateDecorSize = true;

-+    m_netFrameExtentsTimerId = 0;

- 

-     m_urgency_hint = -2;

-@@ -811,5 +842,6 @@

-     if (deferShow)

-     {

--        deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);

-+        deferShow = gs_requestFrameExtentsStatus != 2 &&

-+            m_deferShowAllowed && !gtk_widget_get_realized(m_widget);

-         if (deferShow)

-         {

-@@ -829,11 +861,4 @@

-             // GetSize()/SetSize() because it makes window bigger between each

-             // restore and save.

--            m_updateDecorSize = deferShow;

--        }

--        if (deferShow)

--        {

--            // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken

--            const char* name = gdk_x11_screen_get_window_manager_name(screen);

--            deferShow = strcmp(name, "Fluxbox") != 0;

-             m_updateDecorSize = deferShow;

-         }

-@@ -875,4 +900,12 @@

-             (XEvent*)&xevent);

- 

-+        if (gs_requestFrameExtentsStatus == 0)

-+        {

-+            // if WM does not respond to request within 1 second,

-+            // we assume support for _NET_REQUEST_FRAME_EXTENTS is not working

-+            m_netFrameExtentsTimerId =

-+                g_timeout_add(1000, request_frame_extents_timeout, this);

-+        }

-+

-         // defer calling gtk_widget_show()

-         m_isShown = true;

diff --git a/contrib/wx-patches/toplevel.h.diff b/contrib/wx-patches/toplevel.h.diff
deleted file mode 100644
index c2718d4637..0000000000
--- a/contrib/wx-patches/toplevel.h.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- /wxWidgets/trunk/include/wx/gtk/toplevel.h (revision 65373)

-+++ /wxWidgets/trunk/include/wx/gtk/toplevel.h (revision 67496)

-@@ -114,4 +114,6 @@

-     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.

-     int m_urgency_hint;

-+    // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling

-+    unsigned m_netFrameExtentsTimerId;

- 

-     // return the size of the window without WM decorations