Fix building with GLIBC 2.10+ wrt #274214.

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

4 files changed, 36 insertions, 8 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/Manifest b/dev-db/sqlitebrowser/Manifest
index 200440fffb65..548ebb34656a 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,6 +1,7 @@
 AUX sqlitebrowser-1.3-externalsqlite.patch 1452 RMD160 6899b48e6a94d65971adc003406586a5f76a52cd SHA1 41ae256f437388398c80ad5190f98918c2e653fc SHA256 0f469eef5570659f4bd92ccedd9d111b0e1b4c24a2ffc876a6a09a6475ecffdc
+AUX sqlitebrowser-1.3-glibc-2.10.patch 656 RMD160 e899a369845c11e86533d69d117a3f41556371f3 SHA1 192b7e6b4c05fa810b25eee8077f1fd8cd8d230f SHA256 4cc5dab4561d19c251f3deade14ac93b9f807471d3205e68d0a82c705ac9801d
 AUX sqlitebrowser-1.3-sqlite-deprecated.patch 2745 RMD160 f574ae76103ad0c4b39214f34b53e827dc8cc912 SHA1 c735dc1c9df78f0a49e452d0388cb69527a8b836 SHA256 f7ba82aaedd98645622b8bdab6c6ff04dda36111b5571ae1a9d435b7c1c3902b
 DIST sqlitebrowser-1.3-src.tar.gz 563588 RMD160 884330dd595ec091f1aab885cb845dd19adeb189 SHA1 5defc7965e352bcaf8c763b76b2cfe11360b68f9 SHA256 10298d6ec7a615b856b11d89715c32ee7cd9076cfde81a3bef5e7cb0bf9d12d0
-EBUILD sqlitebrowser-1.3.ebuild 909 RMD160 baa9c8aa8e7e78ef6be1bc4899185e6e6f82a225 SHA1 c459397d708e6a207e1e32ebe0053b9235f6f249 SHA256 496a652b567683305f84446ca7b81c941d02145f4447f255503394aa595230ca
-MISC ChangeLog 1180 RMD160 5cdf96bcdd9dab6d74fbc12116b92161b6fb5721 SHA1 b0ac9cb94f7bf38e02eef3ded4cc1466a31140b8 SHA256 b129c69c15ee561b090b3df5c7f835250ae14afa0943569fe15046a26bb47279
+EBUILD sqlitebrowser-1.3.ebuild 993 RMD160 81c88476c29573158b699046fe8adb848c820b42 SHA1 14b23296c0821adb2185574e1d98bc9b45d3a281 SHA256 abed5259027cbd421fddb81f4f6c5009b647e3e6ada4b6b74909d17048a85894
+MISC ChangeLog 1354 RMD160 1dc4f90aba32f0a092b63e683d4e5bc0b85b03fe SHA1 3bf908ace1752f0e2bbfe179e70e8a4b5c37455a SHA256 e97fae530ca14fead949b7f53175a85ba2475c820a67aa486e7dc76c473aed98
 MISC metadata.xml 614 RMD160 594074d057fe056dae2ae5fbf97cd926d5e2323d SHA1 19ce6ed83bc4ae5e358077f01af7caa309597c1d SHA256 d74930fd6877278736c1692a0cfd70bf9ff1918fe0a9762505d52f7026a85283
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"
 }