Workaround wxGTK with odbc USE flag, bug#209467

Package-Manager: portage-2.1.4.1

4 files changed, 42 insertions, 14 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 22d4480c99eb..dac5c7a3d615 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.30 2008/02/09 20:42:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.31 2008/02/10 20:55:10 alonbl Exp $
+
+  10 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/truecrypt-5.0-bool.patch, truecrypt-5.0.ebuild:
+  Workaround wxGTK with odbc USE flag, bug#209467
 
   09 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
   +files/truecrypt-5.0-64bit.patch, truecrypt-5.0.ebuild:
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index a70cd42862f5..95af0d2ae03d 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,11 +1,12 @@
 AUX truecrypt-4.3a-2.6.23.patch 707 RMD160 fa1221f99cddc9cd4e2c3768f4387d6b17320849 SHA1 2344a65fd9b8ccddcb65cb4c188bccf59bff5360 SHA256 199ab45e983203cfe0602175073c0b6fab2a1009e7699ea154613a3398bf3476
 AUX truecrypt-4.3a-2.6.24.patch 1658 RMD160 c29522d767f96ae01e266fbfd8441ddd37049f71 SHA1 b138b60c5b036243c13d294cf61a2e905f1c4b83 SHA256 d12dd2252daf753f3d56dd504627de0f5f652a67781e930d717d1a86b46e4636
 AUX truecrypt-5.0-64bit.patch 4507 RMD160 ad3e45014ced1d6769f6b04426683e28ae94b9da SHA1 9dc34ff69dad98c8b84c5f8a99a232bfc6b01d06 SHA256 3783a8b9969f2c345f8492629aefc5900b309ab0b8aded391ac3aed4172acfe9
+AUX truecrypt-5.0-bool.patch 1039 RMD160 4d63abb9f18cd7ed4cb4c1727c3d35de3f5a5fe0 SHA1 81c43e3c9c13f8b4224fe3e19c0b227d822dc9d7 SHA256 0a65390e9e8446b9b9dc19fe6729074d3ba6030eae702c18fb5c0e2a36f60963
 AUX truecrypt-5.0-build.patch 1147 RMD160 d5baa75497b027b594c4a31f99bd5320bb9c0da3 SHA1 6467d4bfcae0f0cdd1ff86f21719d3f7d710fa8d SHA256 8eba4bbc03a27678e6bd073988129ec22934fafa84466b03c22b587c7d37deb8
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a
 DIST truecrypt-5.0.tar.gz 1554178 RMD160 7f5b9c4dfb19563ab8f8ccc087f632c3fa5a6811 SHA1 f6e71f757425cedc76f023a91b78a073e279cdac SHA256 2c63694431a8b14a1d9e753d6624a8d75b1184def5acc4ac18167aac0a630c94
 EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 SHA1 4995db75c00642921d84270604b1c9b0d68e2401 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820
-EBUILD truecrypt-5.0.ebuild 1836 RMD160 853d0e6779087934d972b0717d01ff1a327d4133 SHA1 30a9523cb074cf1a3b595398232cd651118d01e4 SHA256 d0d99a0c163d3d6c94103ada378058b2088e2ee3d0a7da56c71963431f8bbc93
-MISC ChangeLog 5181 RMD160 9024737ad7255f6bf807389503a53d54738e9abd SHA1 1efc541490c6e741dbc774759f998eb4006e736a SHA256 b686b0963daf2d046ca7ba776521f6f2daacd1cf59996a3c2f07de736668072b
+EBUILD truecrypt-5.0.ebuild 1531 RMD160 38aa38578f1d58ce4b5d8404cf4beee44a2d46c0 SHA1 e6626054d7bbee1434176088a5f00f637baa882b SHA256 58daadc8dc6b47af941126fdf1828c825dfe03b4fb84376ea0c5131d351d573f
+MISC ChangeLog 5337 RMD160 c66a36d1070a7a905ca00f4bc70f396f3a0e5a21 SHA1 98b70b3ef4a24d14c6be1517b2fd68ba2041ea9a SHA256 9866b7d807d9c1050c99df30941021fd1e1ef20ff0387af1a24ffb0a889464ce
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch b/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch
new file mode 100644
index 000000000000..2cfd8df11714
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-5.0-bool.patch
@@ -0,0 +1,32 @@
+
+xwGTK undef BOOL if ODBC is used.
+Next version of xwGTK does not have db support.
+
+---
+
+diff -urNp truecrypt-5.0-source/Common/Crypto.h truecrypt-5.0-source.new/Common/Crypto.h
+--- truecrypt-5.0-source/Common/Crypto.h	2008-02-04 19:15:38.000000000 +0200
++++ truecrypt-5.0-source.new/Common/Crypto.h	2008-02-10 22:40:55.000000000 +0200
+@@ -29,6 +29,10 @@
+ 
+ #include "Tcdefs.h"
+ 
++#ifndef BOOL
++#define BOOL BOOL1
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff -urNp truecrypt-5.0-source/Makefile truecrypt-5.0-source.new/Makefile
+--- truecrypt-5.0-source/Makefile	2008-02-04 20:19:02.000000000 +0200
++++ truecrypt-5.0-source.new/Makefile	2008-02-10 22:40:34.000000000 +0200
+@@ -42,7 +42,7 @@ export CFLAGS := -W
+ export CXXFLAGS := -Wall
+ 
+ C_CXX_FLAGS := -MMD -I$(BASE_DIR) -I$(BASE_DIR)/Crypto
+-C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1
++C_CXX_FLAGS += -DBOOL=int -DBOOL1=int -DFALSE=0 -DTRUE=1
+ C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long long'  # Tested in PlatformTest
+ 
+ export LFLAGS :=
diff --git a/app-crypt/truecrypt/truecrypt-5.0.ebuild b/app-crypt/truecrypt/truecrypt-5.0.ebuild
index 73eb0b80c3e0..c35cdf83684e 100644
--- a/app-crypt/truecrypt/truecrypt-5.0.ebuild
+++ b/app-crypt/truecrypt/truecrypt-5.0.ebuild
@@ -1,16 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-5.0.ebuild,v 1.2 2008/02/09 20:42:26 alonbl Exp $
-
-#
-# NOTES:
-# - Upstream overwrite CFLAGS, and does not wish us to mess with them.
-# - Upstream insist on hiding the Makefile commands... Don't wish to patch it
-#   again.
-# - Some issues with parallel make of user mode library.
-# - Upstream is not responsive, even new kernel versions are not supported
-#   by upstream, but by other users.
-#
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-5.0.ebuild,v 1.3 2008/02/10 20:55:10 alonbl Exp $
 
 inherit eutils toolchain-funcs multilib wxwidgets
 
@@ -41,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-build.patch"
 	epatch "${FILESDIR}/${P}-64bit.patch"
+	epatch "${FILESDIR}/${P}-bool.patch"
 }
 
 src_compile() {