Add patch to fix crash with >=sqlite-3.5. Bug #203878 by Tim Weber <scy-bugs-gentoo at scytale name>.

(Portage version: 2.1.4_rc9)

5 files changed, 73 insertions, 4 deletions

diff --git a/net-news/newsbeuter/ChangeLog b/net-news/newsbeuter/ChangeLog
index 68dd37923371..8e2edef21764 100644
--- a/net-news/newsbeuter/ChangeLog
+++ b/net-news/newsbeuter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-news/newsbeuter
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.10 2007/12/27 12:55:38 ticho Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.11 2008/01/27 14:13:11 ticho Exp $
+
+*newsbeuter-0.7-r1 (27 Jan 2008)
+
+  27 Jan 2008; Andrej Kacian <ticho@gentoo.org> +files/0.7-sqlite-3.5.patch,
+  newsbeuter-0.7.ebuild, +newsbeuter-0.7-r1.ebuild:
+  Add patch to fix crash with >=sqlite-3.5. Bug #203878 by Tim Weber
+  <scy-bugs-gentoo at scytale name>.
 
   27 Dec 2007; Andrej Kacian <ticho@gentoo.org> -newsbeuter-0.6.ebuild,
   newsbeuter-0.7.ebuild:
diff --git a/net-news/newsbeuter/files/0.7-sqlite-3.5.patch b/net-news/newsbeuter/files/0.7-sqlite-3.5.patch
new file mode 100644
index 000000000000..735adad2964b
--- /dev/null
+++ b/net-news/newsbeuter/files/0.7-sqlite-3.5.patch
@@ -0,0 +1,13 @@
+Index: src/cache.cpp
+===================================================================
+--- src/cache.cpp	(revision 1094)
++++ src/cache.cpp	(revision 1095)
+@@ -656,7 +656,7 @@
+ 	char * query = sqlite3_vmprintf(format, ap);
+ 	if (query) {
+ 		result = query;
+-		free(query);
++		sqlite3_free(query);
+ 	}
+ 	return result;
+ }
diff --git a/net-news/newsbeuter/files/digest-newsbeuter-0.7-r1 b/net-news/newsbeuter/files/digest-newsbeuter-0.7-r1
new file mode 100644
index 000000000000..f8689861a667
--- /dev/null
+++ b/net-news/newsbeuter/files/digest-newsbeuter-0.7-r1
@@ -0,0 +1,3 @@
+MD5 641c8dd6c64cc725b1e0b92c1b6b1e3d newsbeuter-0.7.tar.gz 162791
+RMD160 c71a56a7c6bdb9469e56279cae22ce855b243211 newsbeuter-0.7.tar.gz 162791
+SHA256 23f5de5ceb743e529a0bf787ed0e04fe8925c17277f5908bed5374d9e99e5a59 newsbeuter-0.7.tar.gz 162791
diff --git a/net-news/newsbeuter/newsbeuter-0.7-r1.ebuild b/net-news/newsbeuter/newsbeuter-0.7-r1.ebuild
new file mode 100644
index 000000000000..a610aa41a9c2
--- /dev/null
+++ b/net-news/newsbeuter/newsbeuter-0.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-0.7-r1.ebuild,v 1.1 2008/01/27 14:13:11 ticho Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A RSS/Atom feed reader for the text console."
+HOMEPAGE="http://synflood.at/newsbeuter.html"
+SRC_URI="http://synflood.at/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=net-libs/libnxml-0.18
+		>=net-libs/libmrss-0.18
+		=dev-db/sqlite-3*
+		>=dev-libs/stfl-0.14
+		net-misc/curl"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	if has_version ">=dev-db/sqlite-3.5" ; then
+		epatch "${FILESDIR}"/${PV}-sqlite-3.5.patch || die
+	fi
+
+	sed -i \
+		-e "s:-ggdb:${CXXFLAGS}:" \
+		-e "s:^CXX=.*:CXX=$(tc-getCXX):" \
+		Makefile
+}
+
+src_compile() {
+	emake prefix="/usr" || die
+}
+
+src_install() {
+	make prefix="${D}/usr" install || die
+	dodoc AUTHORS README
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/
+	rm -rf "${D}"/usr/share/doc/${PN}
+}
diff --git a/net-news/newsbeuter/newsbeuter-0.7.ebuild b/net-news/newsbeuter/newsbeuter-0.7.ebuild
index 5ea3af636726..39484ecc560a 100644
--- a/net-news/newsbeuter/newsbeuter-0.7.ebuild
+++ b/net-news/newsbeuter/newsbeuter-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-0.7.ebuild,v 1.2 2007/12/27 12:55:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-0.7.ebuild,v 1.3 2008/01/27 14:13:11 ticho Exp $
 
 inherit toolchain-funcs
 
@@ -16,6 +16,7 @@ IUSE=""
 DEPEND=">=net-libs/libnxml-0.18
 		>=net-libs/libmrss-0.18
 		=dev-db/sqlite-3*
+		<dev-db/sqlite-3.5
 		>=dev-libs/stfl-0.14
 		net-misc/curl"