Build fix for unixODBC-2.2.14 (bug #310923 by Martin von Gagern).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index c6b3dcbc9e359a7bbba660871a02a2e994e6c57a..db6f13218a17d2e8c00e2e37cae5a0f54d85043a 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.249 2010/03/21 14:16:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.250 2010/04/02 21:18:49 dirtyepic Exp $
+
+  02 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild, +files/wxGTK-2.8.10.1-odbc-defines.patch:
+  Build fix for unixODBC-2.2.14 (bug #310923 by Martin von Gagern).
 
   21 Mar 2010; Brent Baude <ranger@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
   wxGTK-2.8.10.1-r5.ebuild:

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index c3c7a25f2485b32a6aa21f273d0cd488b3c062d9..0610bf63f518c35ed46456b4f32644a93090703a 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
 AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
@@ -6,14 +9,22 @@ AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1085 RMD160 2af7918740d4826822af82a50b63ea
 AUX wxGTK-2.8.10-collision.patch 6224 RMD160 ff2145bbb5863d782800b8c909210787cc283c47 SHA1 cd911714567ac41f6ab8e3505f84bb91e17bebcc SHA256 7ddcf556ca4d5491f732a8495199607e228ba10ffd4faa023b912bd11df26b48
 AUX wxGTK-2.8.10.1-CVE-2009-2369.patch 2348 RMD160 0b0c37a21bd68a99d837592c7745bb9d4f783ebb SHA1 36e74d5384e912f6bf1890c582d872b805e5bbfb SHA256 6a7427a621bc33b65928aee09261be28bfb4b85568554ae5c9c1fc147aea2e9e
 AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc8471d1 SHA1 885442567f2f80f78f9ed4f0ac2483c6fc932efe SHA256 a2955800a8ece8d3e328d0a287bd73d021cf7e14898432b1771e708a1f960fac
+AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
 AUX wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch 1620 RMD160 5263552010efd258e94251f215d26ed0b2cedd38 SHA1 a18887d73b8c04a865f10521f5197ed217ec6c6d SHA256 28574bdcdddf6223038727d2bb0637611d3e39bb6613ed8353634e7d2621658f
 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r5.ebuild 4765 RMD160 f7f7e49e22003fe00a280ec12def28349ed3ea55 SHA1 aa63f810cd8e8029da28c3fa629b226107342f55 SHA256 fcb538bd0b2065bdf21596e453996d2a3949dcc8b14c128f1ea6ff523093ff30
-EBUILD wxGTK-2.6.4.0-r6.ebuild 4936 RMD160 e5edcbdf977aa2e382d704c3c468cd12a641e9a1 SHA1 c4d0d6dccf37a44a00e2d4f005817936234433ca SHA256 7ec4afde872db82b82112b9053b38f79d848a5df17e21872173b66c073e8e144
+EBUILD wxGTK-2.6.4.0-r6.ebuild 5010 RMD160 ae04ee505c32f8fd05f4f5595d9da65175a34f5e SHA1 8303942f476fa268759809b50728428b41eff56b SHA256 ff5e602c14914038590cac85dd180fdbd11f4f0025b06df614bbefd6606c6233
 EBUILD wxGTK-2.8.10.1-r1.ebuild 3588 RMD160 08c246b8c2651bf26a3250b9e8c4b8fbb6e94818 SHA1 697540aea5ab9815ebab8abd1e9291a478e58e32 SHA256 39d95da1522cc0926c5ba1f129e1f1f4803a98bce41780bcb68ada92afd216fc
-EBUILD wxGTK-2.8.10.1-r5.ebuild 3834 RMD160 724be560fabeb14436c0f2484e15c4877d4200bd SHA1 09a4f6acd610835cc2e0ecb223205fcdc6e12dbb SHA256 59bc853f3640729ce544070cd8500f37a465d468362f7bbe28817dc8963b1f5c
-MISC ChangeLog 39152 RMD160 5cbfb327ae5882aa6c9a1852dd2aa8e098afd5b7 SHA1 c5e86a87b00eb57dd67f39184278095cf91cb2ac SHA256 4f9f7656c7d827a25502054c7685454b12e1b1999ac028d9e8bd749b795363a8
+EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 dc316962ff75ec61f8b523e7262b212f94b5290f SHA1 f9a2804848aadb83ed1735b52b3dc5be2e78924f SHA256 d982403b9ea0c8e4263825401e1850b9a7496c900d38a9195996cf92bfb2d266
+MISC ChangeLog 39367 RMD160 b641d471baa78ba028e02a294b6edb90b3b388d1 SHA1 183ff427d88a5bbaa4ca10fb596c0bda2c8f6f5e SHA256 c529a01efe58fb1cb772a291e42ddee9fee67d58710cc25af4b911f8e00f6c86
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAku2X+0ACgkQiqiDRvmkBmJRGACfTwMVXW41W19ZAQ6VY5SPWx7F
+/z4AnjCW3f0acRcpdAH60rdys8xuZYna
+=AO6v
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
new file mode 100644 (file)
index 0000000..3636b64
--- /dev/null
+++ b/x11-libs/wxGTK/files/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/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
index 8af6b2442f2ab0b56c7c5c6804fc6fd0208dd089..f64f760fd79c9ece161e71c146f4f3e2cef2ee65 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.6 2010/03/21 14:16:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.7 2010/04/02 21:18:49 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -62,6 +62,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
        epatch "${FILESDIR}"/${BASE_P}-collision.patch
        epatch "${FILESDIR}"/${BASE_P}-mmedia.patch                             # Bug #174874
+       epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch  # Bug #310923
 
        # Patches Specific to this version
 

diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
index 3ba9cac71777cc9c0005fe72cbb86950803e5c2a..03a326fcb5f541a9b3e94624e573e05eb1b06232 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.6 2010/03/21 14:16:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.7 2010/04/02 21:18:49 dirtyepic Exp $
 
 EAPI="2"
 
@@ -60,6 +60,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
        epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch
        epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+       epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
        # this version only:
        epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch              # Bug #277722
        epatch "${FILESDIR}"/${P}-gsocket.patch                    # Bug #278778