Fix building with GLIBC 2.10+ wrt #274214.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 33 insertions, 6 deletions

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index 8c10454270fa..71bc21b57720 100644
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlitebrowser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.6 2009/02/03 15:11:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.7 2009/08/06 11:25:40 ssuominen Exp $
+
+  06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  sqlitebrowser-1.3.ebuild, +files/sqlitebrowser-1.3-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #274214.
 
   03 Feb 2009; <drizzt@gentoo.org>
   +files/sqlitebrowser-1.3-sqlite-deprecated.patch,
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-glibc-2.10.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-glibc-2.10.patch
new file mode 100644
index 000000000000..1aae75ec913e
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -ur sqlitebrowser.orig/sqlitebrowser/sqlbrowser_util.c sqlitebrowser/sqlitebrowser/sqlbrowser_util.c
+--- sqlitebrowser.orig/sqlitebrowser/sqlbrowser_util.c	2005-03-23 16:56:39.000000000 +0200
++++ sqlitebrowser/sqlitebrowser/sqlbrowser_util.c	2009-08-06 14:25:02.000000000 +0300
+@@ -358,7 +358,7 @@
+ }
+ 
+ 
+-char *getline(FILE *in){
++char *get_line(FILE *in){
+   char *zLine;
+   int nLine;
+   int n;
+@@ -402,7 +402,7 @@
+   char * zErrMsg = 0;
+   int nSql = 0;
+   int rc;
+-  while((zLine = getline(in))!=0 ){
++  while((zLine = get_line(in))!=0 ){
+     if( (zSql==0 || zSql[0]==0) && _all_whitespace(zLine) ) continue;
+ 	(*lineErr)++;
+     if( zSql==0 ){
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
index 891a8b027b66..924f7a898fa6 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild,v 1.6 2009/02/03 15:11:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild,v 1.7 2009/08/06 11:25:40 ssuominen Exp $
 
 EAPI=1
 
@@ -15,18 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-db/sqlite-3*
+RDEPEND="=dev-db/sqlite-3*
 	x11-libs/qt:3"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}/${PN}"
+S=${WORKDIR}/${PN}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -r sqlite_source
 
-	sed -i 's/\r/\n/g' *.{cpp,h}
+	sed -i -e 's/\r/\n/g' *.{cpp,h} || die "sed failed"
 
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	epatch "${FILESDIR}"/${P}-externalsqlite.patch
 	# Don't use internal sqlite3 function wrt #227215
 	epatch "${FILESDIR}"/${P}-sqlite-deprecated.patch
@@ -38,5 +40,5 @@ src_compile() {
 }
 
 src_install() {
-	dobin sqlitebrowser || die "installing failed"
+	dobin sqlitebrowser || die "dobin failed"
 }