packages: wxWidgets/wxWidgets.spec, wxWidgets/wxGTK-2.8.10.1-odbc-defines.p...

[arekm]

Author: arekm                        Date: Sat Jun  4 15:27:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.8.12

---- Files affected:
packages/wxWidgets:
   wxWidgets.spec (1.91 -> 1.92) , wxGTK-2.8.10.1-odbc-defines.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wxWidgets/wxWidgets.spec
diff -u packages/wxWidgets/wxWidgets.spec:1.91 packages/wxWidgets/wxWidgets.spec:1.92
--- packages/wxWidgets/wxWidgets.spec:1.91	Sun Oct 17 08:31:28 2010
+++ packages/wxWidgets/wxWidgets.spec	Sat Jun  4 17:27:36 2011
@@ -11,23 +11,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
@@ -471,6 +473,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+rm -f build/aclocal/bakefile*.m4
 
 %build
 # if bakefiles rebuild is needed:
@@ -823,6 +828,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2011/06/04 15:27:36  arekm
+- up to 2.8.12
+
 Revision 1.91  2010/10/17 06:31:28  qboosh
 - force stable ODBC builds: use unixODBC (in -lodbc)
 

================================================================
Index: packages/wxWidgets/wxGTK-2.8.10.1-odbc-defines.patch
diff -u /dev/null packages/wxWidgets/wxGTK-2.8.10.1-odbc-defines.patch:1.1
--- /dev/null	Sat Jun  4 17:27:41 2011
+++ packages/wxWidgets/wxGTK-2.8.10.1-odbc-defines.patch	Sat Jun  4 17:27:36 2011
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wxWidgets/wxWidgets.spec?r1=1.91&r2=1.92&f=u