From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 4 Jun 2011 15:27:36 +0000 (+0000)
Subject: - up to 2.8.12
X-Git-Tag: auto/th/wxWidgets-2_8_12-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2FwxWidgets.git;a=commitdiff_plain;h=a485b266bb4e7271d0bf77a66ef45c8321290a8d

- up to 2.8.12

Changed files:
    wxGTK-2.8.10.1-odbc-defines.patch -> 1.1
    wxWidgets.spec -> 1.92
---

diff --git a/wxGTK-2.8.10.1-odbc-defines.patch b/wxGTK-2.8.10.1-odbc-defines.patch
new file mode 100644
index 0000000..3636b64
--- /dev/null
+++ b/wxGTK-2.8.10.1-odbc-defines.patch
@@ -0,0 +1,39 @@
+unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef
+declaration instead of preprocessor #define macro definition.  This breaks
+the preprocessor checks in this include file.cpp, causing the source to fall
+back to older types instead, leading to compile time errors like this:
+
+db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to
+‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
+...
+dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to
+‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’
+...
+
+This change hard-wires the new names, breaking compatibility with ancient
+(pre 2001) unixODBC versions.  This change may break other ODBC implementations
+but in Gentoo only unixODBC is supported.
+
+References:
+http://bugs.gentoo.org/310923
+
+2010-03-23 Martin von Gagern
+
+--- wxPython-src-2.6.4.0.orig/include/wx/db.h
++++ wxPython-src-2.6.4.0/include/wx/db.h
+@@ -134,15 +134,6 @@ enum enumDummy {enumDum1};
+     #endif
+ #endif
+ 
+-#ifndef _WIN64
+-#ifndef SQLLEN
+-#define SQLLEN SQLINTEGER
+-#endif
+-#ifndef SQLULEN
+-#define SQLULEN SQLUINTEGER
+-#endif
+-#endif
+-
+ const int wxDB_PATH_MAX                 = 254;
+ 
+ extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME;
diff --git a/wxWidgets.spec b/wxWidgets.spec
index ca9cace..54c61a6 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,23 +10,25 @@
 Summary:	wxWidgets library
 Summary(pl.UTF-8):	Biblioteka wxWidgets
 Name:		wxWidgets
-Version:	2.8.11
-Release:	3
+Version:	2.8.12
+Release:	1
 License:	wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:		X11/Libraries
 Source0:	http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	303a2d5aeb6c79460c8088193d799147
+# Source0-md5:	4103e37e277abeb8aee607b990c215c4
 Patch0:		%{name}-samples.patch
 Patch1:		%{name}-ogl.patch
 Patch2:		%{name}-ac.patch
 Patch3:		%{name}-x11unicode.patch
 Patch4:		%{name}-gcc4.patch
+Patch5:		wxGTK-2.8.10.1-odbc-defines.patch
 URL:		http://www.wxWidgets.org/
 BuildRequires:	OpenGL-GLU-devel
 #BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-#BuildRequires:	bakefile >= 0.2.1
+# for m4 files
+BuildRequires:	bakefile >= 0.2.9
 BuildRequires:	cppunit-devel
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
@@ -470,6 +472,9 @@ obsługą UNICODE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+rm -f build/aclocal/bakefile*.m4
 
 %build
 # if bakefiles rebuild is needed: