[lmi-commits] [5753] Upgrade to wx-2.9.5, enabling vararg macros

[Greg Chicares]

Revision: 5753
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5753
Author:   chicares
Date:     2013-07-20 01:18:17 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
Upgrade to wx-2.9.5, enabling vararg macros

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-19 19:51:30 UTC (rev 5752)
+++ lmi/trunk/ChangeLog 2013-07-20 01:18:17 UTC (rev 5753)
@@ -32475,3 +32475,10 @@
   version.hpp
 Designate release candidate 5752.
 
+20130720T0118Z <address@hidden> [542]
+
+  install_wx.make
+  wx-2.9.5.patch
+Upgrade to wx-2.9.5, enabling vararg macros. See:
+  http://lists.nongnu.org/archive/html/lmi/2013-07/msg00045.html
+

Modified: lmi/trunk/install_wx.make
===================================================================
--- lmi/trunk/install_wx.make   2013-07-19 19:51:30 UTC (rev 5752)
+++ lmi/trunk/install_wx.make   2013-07-20 01:18:17 UTC (rev 5753)
@@ -25,7 +25,7 @@
 
 # Configurable settings 
########################################################
 
-wx_version    := 2.9.3
+wx_version    := 2.9.5
 
 mingw_dir     := /MinGW_
 
@@ -44,6 +44,7 @@
 wx-2.9.0-md5  := 09058928eeb72853142c062bdec056ce
 wx-2.9.2-md5  := d6cec5bd331ba90b74c1e2fcb0563620
 wx-2.9.3-md5  := 6b6003713289ea4d3cd9b49c5db5b721
+wx-2.9.5-md5  := e98c5f92805493f150656403ffef3bb0
 
 wx_md5            := $(wx-$(wx_version)-md5)
 
@@ -84,7 +85,6 @@
   --disable-gif \
   --disable-stc \
   --disable-threads \
-  --disable-vararg_macros \
   --enable-monolithic \
   --enable-shared \
   --enable-std_iostreams \

Modified: lmi/trunk/wx-2.9.5.patch
===================================================================
--- lmi/trunk/wx-2.9.5.patch    2013-07-19 19:51:30 UTC (rev 5752)
+++ lmi/trunk/wx-2.9.5.patch    2013-07-20 01:18:17 UTC (rev 5753)
@@ -1,9 +1,9 @@
-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
+diff -x 'xml*' --recursive '--unified=3' 
original/wxWidgets-2.9.5/include/wx/cpp.h 
modified/wxWidgets-2.9.5/include/wx/cpp.h
+--- original/wxWidgets-2.9.5/include/wx/cpp.h  2013-07-16 15:47:14.000000000 
+0000
++++ modified/wxWidgets-2.9.5/include/wx/cpp.h  2013-07-20 00:40:10.000000000 
+0000
+@@ -144,6 +144,13 @@
  
+ 
  #ifdef HAVE_VARIADIC_MACROS
 +/* There is no other way to suppress the
 + *  "anonymous variadic macros were introduced in C99"