Added patch to fix compilation problems with sqlite >=3.3.10 (thanks to Nicolas Vigie...

svn path=/sunrise/; revision=5276

diff --git a/dev-db/soci/ChangeLog b/dev-db/soci/ChangeLog
index 1408e65fdcdd81c17e14336f7ea1b50986306fda..14a1818928b5341807c3889f07f0d0de7efb7892 100644 (file)
--- a/dev-db/soci/ChangeLog
+++ b/dev-db/soci/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Dec 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/soci-2.2.0-sqlite_fix.patch, soci-2.2.0.ebuild:
+  Added patch to fix compilation problems with sqlite >=3.3.10 (thanks to
+  Nicolas Vigier, upstream-bug #1712232)
+
   07 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -soci-2.1.0.ebuild,
   +soci-2.2.0.ebuild:
   Version bump. Adjusted to new build system.

diff --git a/dev-db/soci/Manifest b/dev-db/soci/Manifest
index 0413a8b3298421e6ff15b5399c0005f8b81f7080..c0cc1894b022e4be7d3a00ce043881515695750d 100644 (file)
--- a/dev-db/soci/Manifest
+++ b/dev-db/soci/Manifest
@@ -1,4 +1,5 @@
+AUX soci-2.2.0-sqlite_fix.patch 598 RMD160 9fbe42001405c6a787e73f7026cdf056316f9eb1 SHA1 0f624f9e6d0d2d443726f8a7e491084323fcb143 SHA256 27dde3b59b25786d5509ba1c57c86a236525c8f8b8f91444401ec62c660c31d4
 DIST soci-2.2.0.tar.gz 570405 RMD160 0e4098f8ddf1f1ce161116c8bb3a3df689ac7ff5 SHA1 4e726d0a9a59173042cb8a6aba7148640a156dd7 SHA256 01fc160500e9db024a56f0a7553e13885b37fc7b3b23882b07a3d6e8313780fa
-EBUILD soci-2.2.0.ebuild 1072 RMD160 57357ae2d6129a5e5e8e1967deda308782947ef1 SHA1 e2cb2fc4eb046a8f88c22067d8d305d6bb8f64b1 SHA256 86762bc259138f95e274989b89bc14744682330aee44542112bf333d48c0377e
-MISC ChangeLog 450 RMD160 138a32d5cf7b1ff90ba685671dda90285c1916e6 SHA1 0c226d2b65d9fcff94f09d6b72ea25c262382397 SHA256 c32916e5be2982fa4b57b6498f62d6fd37ed7d0a0c9e26688c7388aa3af12813
+EBUILD soci-2.2.0.ebuild 1174 RMD160 c7b8c36fade4a1a35a035f0f7a121c50387bbb33 SHA1 2936d3495abfa478ca0f92a34e7bd11119a3ace4 SHA256 5afc9df4f01e93a95644ffec71a85b98c04b235c973a8578a45e00c134d338ad
+MISC ChangeLog 676 RMD160 e1e8aa22396400762e7e9223ad27277f15bd5cae SHA1 ac56c79203c09750508a38b6d2df8c22a54cdfa6 SHA256 3c0322f75457446f06e5914e890952363dc242cf33d37a7728d37a2f4a464dd9
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch b/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch
new file mode 100644 (file)
index 0000000..654efe5
--- /dev/null
+++ b/dev-db/soci/files/soci-2.2.0-sqlite_fix.patch
@@ -0,0 +1,13 @@
+diff -ru soci-2.2.0/src/backends/sqlite3/statement.cpp soci-2.2.0.new/src/backends/sqlite3/statement.cpp
+--- soci-2.2.0/src/backends/sqlite3/statement.cpp      2006-11-08 15:01:51.000000000 +0100
++++ soci-2.2.0.new/src/backends/sqlite3/statement.cpp  2007-05-03 19:55:25.000000000 +0200
+@@ -183,6 +183,9 @@
+ StatementBackEnd::execFetchResult 
+ Sqlite3StatementBackEnd::bindAndExecute(int number)
+ {
++#if (SQLITE_VERSION_NUMBER > 3003009)
++    using sqlite_api::sqlite3_destructor_type;
++#endif
+     StatementBackEnd::execFetchResult retVal = eNoData;
+ 
+     int rows = static_cast<int>(useData_.size());

diff --git a/dev-db/soci/soci-2.2.0.ebuild b/dev-db/soci/soci-2.2.0.ebuild
index c9dec7e672ab271f697ab5cbc69c3cfd1fa3f141..e8cfc8cb093b6986e8c8b7d90cce1234ea8c8c6d 100644 (file)
--- a/dev-db/soci/soci-2.2.0.ebuild
+++ b/dev-db/soci/soci-2.2.0.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils
+
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="A database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code."
@@ -18,6 +20,12 @@ RDEPEND="firebird? ( dev-db/firebird )
 DEPEND="${RDEPEND}
                sys-devel/libtool"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-sqlite_fix.patch"
+}
+
 src_compile() {
        local myconf
        use debug && myconf="--enable-debug=yes" || myconf="--enable-debug=no"