pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/sqlitebrowser Fix build on NetBSD 5.99.55.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/82ec1a1d32b4
branches:  trunk
changeset: 590683:82ec1a1d32b4
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Jul 19 00:34:16 2011 +0000

description:
Fix build on NetBSD 5.99.55.
* Resolve conflict of getline.

diffstat:

 databases/sqlitebrowser/distinfo                                       |   3 +-
 databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlbrowser__util.c |  22 ++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r a221929ebee2 -r 82ec1a1d32b4 databases/sqlitebrowser/distinfo
--- a/databases/sqlitebrowser/distinfo  Mon Jul 18 21:15:32 2011 +0000
+++ b/databases/sqlitebrowser/distinfo  Tue Jul 19 00:34:16 2011 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/05/25 08:04:44 adam Exp $
+$NetBSD: distinfo,v 1.2 2011/07/19 00:34:16 ryoon Exp $
 
 SHA1 (sqlitebrowser-1.3-src.tar.gz) = 5defc7965e352bcaf8c763b76b2cfe11360b68f9
 RMD160 (sqlitebrowser-1.3-src.tar.gz) = 884330dd595ec091f1aab885cb845dd19adeb189
 Size (sqlitebrowser-1.3-src.tar.gz) = 563588 bytes
+SHA1 (patch-sqlitebrowser_sqlbrowser__util.c) = 5f864ab81ce70d9ed34b27b7d6234612fc6c07d4
diff -r a221929ebee2 -r 82ec1a1d32b4 databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlbrowser__util.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlitebrowser/patches/patch-sqlitebrowser_sqlbrowser__util.c    Tue Jul 19 00:34:16 2011 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-sqlitebrowser_sqlbrowser__util.c,v 1.1 2011/07/19 00:34:17 ryoon Exp $
+
+--- sqlitebrowser/sqlbrowser_util.c.orig       2005-03-23 14:56:39.000000000 +0000
++++ sqlitebrowser/sqlbrowser_util.c
+@@ -358,7 +358,7 @@ static int _is_command_terminator(const 
+ }
+ 
+ 
+-char *getline(FILE *in){
++char *sbgetline(FILE *in){
+   char *zLine;
+   int nLine;
+   int n;
+@@ -402,7 +402,7 @@ void process_input(sqlite3 * db, FILE *i
+   char * zErrMsg = 0;
+   int nSql = 0;
+   int rc;
+-  while((zLine = getline(in))!=0 ){
++  while((zLine = sbgetline(in))!=0 ){
+     if( (zSql==0 || zSql[0]==0) && _all_whitespace(zLine) ) continue;
+       (*lineErr)++;
+     if( zSql==0 ){



Home | Main Index | Thread Index | Old Index