[lmi-commits] [5746] Use wxWidgets-2.9.5-rc1

[Greg Chicares]

Revision: 5746
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5746
Author:   chicares
Date:     2013-07-15 16:22:22 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Use wxWidgets-2.9.5-rc1

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/install_wx.make
    lmi/trunk/wx-2.9.5.patch

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-07-15 11:43:34 UTC (rev 5745)
+++ lmi/trunk/ChangeLog 2013-07-15 16:22:22 UTC (rev 5746)
@@ -32424,3 +32424,8 @@
 Use 2013-07-15 wx-2.9.5 snapshot, updating $(vendor). But see:
   http://lists.nongnu.org/archive/html/lmi/2013-07/msg00030.html
 
+20130715T1622Z <address@hidden> [541]
+
+  install_wx.make
+Use wxWidgets-2.9.5-rc1.
+

Modified: lmi/trunk/install_wx.make
===================================================================
--- lmi/trunk/install_wx.make   2013-07-15 11:43:34 UTC (rev 5745)
+++ lmi/trunk/install_wx.make   2013-07-15 16:22:22 UTC (rev 5746)
@@ -65,12 +65,12 @@
 # Begin ad-hockery. See:
 #   http://lists.nongnu.org/archive/html/lmi/2011-03/msg00008.html
 wx_version    := 2.9.5
-wx_md5            := f1648c73412756abfde139413e7d140b
-wx_archive        := wxWidgets-2013-07-15.tar.gz
+wx_md5            := 5d0375cfde36d9bae7fd747760e05b5d
+wx_archive        := wxWidgets-2.9.5-rc1.tar.bz2
 $(wx_archive)-md5 := $(wx_md5)
-$(wx_archive)-url := ftp://ftp.wxwidgets.org/pub/Daily_HEAD/files/$(wx_archive)
+$(wx_archive)-url := http://downloads.sourceforge.net/wxwindows/$(wx_archive)
 vendor        := $(subst .,,$(compiler))-$(wx_md5)
-build_dir     := $(wx_dir)/wxWidgets/$(vendor)
+build_dir     := $(wx_dir)/wxWidgets-2.9.5-rc1/$(vendor)
 # End ad-hockery.
 
 # Configuration reference:

Modified: lmi/trunk/wx-2.9.5.patch
===================================================================
--- lmi/trunk/wx-2.9.5.patch    2013-07-15 11:43:34 UTC (rev 5745)
+++ lmi/trunk/wx-2.9.5.patch    2013-07-15 16:22:22 UTC (rev 5746)
@@ -1,10 +1,10 @@
-diff --recursive '--unified=3' original/wxWidgets/include/wx/cpp.h 
modified/wxWidgets/include/wx/cpp.h
---- original/wxWidgets/include/wx/cpp.h        2012-12-03 01:30:15.000000000 
+0000
-+++ modified/wxWidgets/include/wx/cpp.h        2013-07-11 23:24:28.000000000 
+0000
+diff --recursive '--unified=3' original/wxWidgets-2.9.5-rc1/include/wx/cpp.h 
modified/wxWidgets-2.9.5-rc1/include/wx/cpp.h
+--- original/wxWidgets-2.9.5-rc1/include/wx/cpp.h      2012-12-03 
01:30:15.000000000 +0000
++++ modified/wxWidgets-2.9.5-rc1/include/wx/cpp.h      2013-07-11 
23:24:28.000000000 +0000
 @@ -134,6 +134,13 @@
  #endif
  
- #ifdef wxHAS_VARIADIC_MACROS
+ #ifdef HAVE_VARIADIC_MACROS
 +/* There is no other way to suppress the
 + *  "anonymous variadic macros were introduced in C99"
 + * diagnostic with gcc-3.x .