[lmi-commits] [5222] Upgrade to wx-2.9.2

[Greg Chicares]

Revision: 5222
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5222
Author:   chicares
Date:     2011-07-07 21:38:18 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Upgrade to wx-2.9.2

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/install_wx.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-07-04 17:59:14 UTC (rev 5221)
+++ lmi/trunk/ChangeLog 2011-07-07 21:38:18 UTC (rev 5222)
@@ -28088,3 +28088,8 @@
   install_wx.make
 Use 2011-07-04 wx-2.9.2 snapshot.
 
+20110707T2138Z <address@hidden> [649]
+
+  install_wx.make
+Upgrade to wx-2.9.2 .
+

Modified: lmi/trunk/install_wx.make
===================================================================
--- lmi/trunk/install_wx.make   2011-07-04 17:59:14 UTC (rev 5221)
+++ lmi/trunk/install_wx.make   2011-07-07 21:38:18 UTC (rev 5222)
@@ -25,7 +25,7 @@
 
 # Configurable settings 
########################################################
 
-wx_version    := 2.9.0
+wx_version    := 2.9.2
 
 mingw_dir     := /MinGW_
 
@@ -42,15 +42,16 @@
 wx-2.8.9-md5  := b0b2d0f6915a21ca6f33896ee8f50387
 wx-2.8.10-md5 := 0461c2085ac1ad7e648aa84c4ba51dd1
 wx-2.9.0-md5  := 09058928eeb72853142c062bdec056ce
+wx-2.9.2-md5  := d6cec5bd331ba90b74c1e2fcb0563620
 
+wx_md5            := $(wx-$(wx_version)-md5)
+
 wx_archive        := wxWidgets-$(wx_version).tar.bz2
 
+$(wx_archive)-md5 := $(wx_md5)
+
 $(wx_archive)-url := ftp://ftp.wxwidgets.org/pub/$(wx_version)/$(wx_archive)
 
-$(wx_archive)-md5 := $(wx-$(wx_version)-md5)
-
-wx_md5            := $(wx-$(wx_version)-md5)
-
 # Variables that normally should be left alone 
#################################
 
 mingw_bin_dir := $(mingw_dir)/bin
@@ -60,17 +61,6 @@
 
 build_dir     := $(wx_dir)/wxWidgets-$(wx_version)/$(vendor)
 
-# Begin ad-hockery. See:
-#   http://lists.nongnu.org/archive/html/lmi/2011-03/msg00008.html
-wx_version    := 2.9.2
-wx_archive        := wxWidgets-2011-07-04.tar.gz
-$(wx_archive)-url := ftp://ftp.wxwidgets.org/pub/Daily_HEAD/files/$(wx_archive)
-$(wx_archive)-md5 := 89c33b326afe557eb47345e8e335886c
-wx_md5            := 89c33b326afe557eb47345e8e335886c
-vendor        := $(subst .,,$(compiler))-$(wx_md5)
-build_dir     := $(wx_dir)/wxWidgets/$(vendor)
-# End ad-hockery.
-
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
 # SOMEDAY !! But see the last paragraph of