commit b584f04c6e5802e82028120bfffc333983a85bc1
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Oct 3 19:11:16 2012 +0200
- added prec patch: disable use of wxprec.h in mmedia/vid*.h headers - it
doesn't work this way
wxWidgets-prec.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
wxWidgets.spec | 2 ++
2 files changed, 47 insertions(+)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index 4adb73a..0a83dc4 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -24,6 +24,7 @@ Patch4: %{name}-gcc4.patch
Patch5: wxGTK-2.8.10.1-odbc-defines.patch
Patch6: %{name}-cairo.patch
Patch7: %{name}-format.patch
+Patch8: %{name}-prec.patch
URL: http://www.wxWidgets.org/
BuildRequires: OpenGL-GLU-devel
#BuildRequires: SDL-devel
@@ -479,6 +480,7 @@ obsługą UNICODE.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%{__rm} build/aclocal/bakefile*.m4
diff --git a/wxWidgets-prec.patch b/wxWidgets-prec.patch
new file mode 100644
index 0000000..fec495c
--- /dev/null
+++ b/wxWidgets-prec.patch
@@ -0,0 +1,45 @@
+--- wxWidgets-2.8.12/contrib/include/wx/mmedia/vidbase.h.orig 2011-03-22
13:01:05.000000000 +0100
++++ wxWidgets-2.8.12/contrib/include/wx/mmedia/vidbase.h 2012-10-03
19:04:15.935793663 +0200
+@@ -16,7 +16,6 @@
+ // headers
+ //
----------------------------------------------------------------------------
+ // For compilers that support precompilation, includes "wx/wx.h".
+-#include "wx/wxprec.h"
+
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+@@ -24,13 +23,11 @@
+
+ // for all others, include the necessary headers (this file is usually all you
+ // need because it includes almost all "standard" wxWidgets headers
+-#ifndef WX_PRECOMP
+ #include "wx/defs.h"
+ #include "wx/stream.h"
+ #include "wx/string.h"
+ #include "wx/window.h"
+ #include "wx/frame.h"
+-#endif
+
+ #include "wx/mmedia/defs.h"
+
+--- wxWidgets-2.8.12/contrib/include/wx/mmedia/vidxanm.h.orig 2011-03-22
13:01:05.000000000 +0100
++++ wxWidgets-2.8.12/contrib/include/wx/mmedia/vidxanm.h 2012-10-03
19:05:04.928013219 +0200
+@@ -15,7 +15,6 @@
+ // headers
+ //
----------------------------------------------------------------------------
+ // For compilers that support precompilation, includes "wx/wx.h".
+-#include "wx/wxprec.h"
+
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+@@ -25,10 +24,8 @@
+
+ // for all others, include the necessary headers (this file is usually all you
+ // need because it includes almost all "standard" wxWidgets headers
+-#ifndef WX_PRECOMP
+ #include "wx/defs.h"
+ #include "wx/string.h"
+-#endif
+
+ //
----------------------------------------------------------------------------
+ // System dependent headers
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/b584f04c6e5802e82028120bfffc333983a85bc1
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
