summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-31 15:19:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-31 15:19:51 +0000
commit090bed0de9789c716597f3fd216cdf4e6fca4dd8 (patch)
treef2ec3f7a9e15c9d4accf9d4c3db0252d9c6aff31 /dev-db/sqlitebrowser/files
parentFixed as-needed issue, bug #298744. (diff)
downloadhistorical-090bed0de9789c716597f3fd216cdf4e6fca4dd8.tar.gz
historical-090bed0de9789c716597f3fd216cdf4e6fca4dd8.tar.bz2
historical-090bed0de9789c716597f3fd216cdf4e6fca4dd8.zip
Version bump, drop Qt3 version
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-db/sqlitebrowser/files')
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-1.3-externalsqlite.patch51
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-1.3-glibc-2.10.patch21
-rw-r--r--dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch76
3 files changed, 0 insertions, 148 deletions
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-externalsqlite.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-externalsqlite.patch
deleted file mode 100644
index 15f1de866b8f..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-externalsqlite.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur sqlbrowser_util.c sqlbrowser_util.c
---- sqlbrowser_util.c 2006-12-18 14:42:33.000000000 +0100
-+++ sqlbrowser_util.c 2006-12-18 14:44:28.000000000 +0100
-@@ -1,10 +1,9 @@
- #include "sqlbrowser_util.h"
--#include "sqlite_source/sqlite3.h"
-+#include <sqlite3.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-
--#include "sqlite_source/sqliteInt.h"
-
- /*following routines extracted from shell.c for dump support*/
-
-diff -ur sqlbrowser_util.h sqlbrowser_util.h
---- sqlbrowser_util.h 2006-12-18 14:46:34.000000000 +0100
-+++ sqlbrowser_util.h 2006-12-18 14:45:58.000000000 +0100
-@@ -6,7 +6,7 @@
- #endif
-
- #include <ctype.h>
--#include "sqlite_source/sqlite3.h"
-+#include <sqlite3.h>
- #include <stdio.h>
-
-
-diff -ur sqlitebrowser.pro sqlitebrowser.pro
---- sqlitebrowser.pro 2006-12-18 14:42:33.000000000 +0100
-+++ sqlitebrowser.pro 2006-12-18 14:43:57.000000000 +0100
-@@ -47,7 +47,7 @@
- UI_DIR = .ui
- MOC_DIR = .moc
- OBJECTS_DIR = .obj
-- LIBS += ./sqlite_source/libsqlite_source.a
-+ LIBS += -lsqlite3
- }
- win32 {
- RC_FILE = winapp.rc
-diff -ur sqlitedb.h sqlitedb.h
---- sqlitedb.h 2006-12-18 14:46:34.000000000 +0100
-+++ sqlitedb.h 2006-12-18 14:46:22.000000000 +0100
-@@ -7,7 +7,7 @@
- #include <qvaluelist.h>
- #include <qobject.h>
- #include "sqllogform.h"
--#include "sqlite_source/sqlite3.h"
-+#include <sqlite3.h>
- #include "sqlitebrowsertypes.h"
- /*#include "sqlite_source/sqlxtra_util.h"
- #include "sqlite_source/encode.h"
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
deleted file mode 100644
index 1aae75ec913e..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/sqlitebrowser-1.3-sqlite-deprecated.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch
deleted file mode 100644
index 567db7b77d8a..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Common subdirectories: sqlitebrowser.orig/.moc and sqlitebrowser/.moc
-Common subdirectories: sqlitebrowser.orig/.obj and sqlitebrowser/.obj
-Common subdirectories: sqlitebrowser.orig/.ui and sqlitebrowser/.ui
-Common subdirectories: sqlitebrowser.orig/CVS and sqlitebrowser/CVS
-Common subdirectories: sqlitebrowser.orig/images and sqlitebrowser/images
-diff -u sqlitebrowser.orig/sqlbrowser_util.c sqlitebrowser/sqlbrowser_util.c
---- sqlitebrowser.orig/sqlbrowser_util.c 2009-02-03 11:34:57.000000000 +0100
-+++ sqlitebrowser/sqlbrowser_util.c 2009-02-03 11:46:25.000000000 +0100
-@@ -3,7 +3,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--
-+#include <stdint.h>
-
- /*following routines extracted from shell.c for dump support*/
-
-@@ -23,6 +23,40 @@
- #define ArraySize(X) (sizeof(X)/sizeof(X[0]))
-
- /*
-+** Return TRUE if z is a pure numeric string. Return FALSE if the
-+** string contains any character which is not part of a number. If
-+** the string is numeric and contains the '.' character, set *realnum
-+** to TRUE (otherwise FALSE).
-+**
-+** An empty string is considered non-numeric.
-+*/
-+static int _isNumber(const char *z, int *realnum, uint8_t enc){
-+ int incr = (enc==SQLITE_UTF8?1:2);
-+ if( enc==SQLITE_UTF16BE ) z++;
-+ if( *z=='-' || *z=='+' ) z += incr;
-+ if( !isdigit(*(uint8_t*)z) ){
-+ return 0;
-+ }
-+ z += incr;
-+ if( realnum ) *realnum = 0;
-+ while( isdigit(*(uint8_t*)z) ){ z += incr; }
-+ if( *z=='.' ){
-+ z += incr;
-+ if( !isdigit(*(uint8_t*)z) ) return 0;
-+ while( isdigit(*(uint8_t*)z) ){ z += incr; }
-+ if( realnum ) *realnum = 1;
-+ }
-+ if( *z=='e' || *z=='E' ){
-+ z += incr;
-+ if( *z=='+' || *z=='-' ) z += incr;
-+ if( !isdigit(*(uint8_t*)z) ) return 0;
-+ while( isdigit(*(uint8_t*)z) ){ z += incr; }
-+ if( realnum ) *realnum = 1;
-+ }
-+ return *z==0;
-+}
-+
-+/*
- ** Output the given string as a quoted string using SQL quoting conventions.
- */
- static void output_quoted_string(FILE *out, const char *z){
-@@ -192,7 +226,7 @@
- char *zSep = i>0 ? ",": "";
- if( azArg[i]==0 ){
- fprintf(p->out,"%sNULL",zSep);
-- }else if( sqlite3IsNumber(azArg[i], NULL, SQLITE_UTF8) ){
-+ }else if( _isNumber(azArg[i], NULL, SQLITE_UTF8) ){
- fprintf(p->out,"%s%s",zSep, azArg[i]);
- }else{
- if( zSep[0] ) fprintf(p->out,"%s",zSep);
-@@ -350,7 +384,7 @@
- static int _is_command_terminator(const char *zLine){
- while( isspace(*zLine) ){ zLine++; };
- if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ) return 1; /* Oracle */
-- if( sqlite3StrNICmp(zLine,"go",2)==0 && _all_whitespace(&zLine[2]) ){
-+ if( strncasecmp(zLine,"go",2)==0 && _all_whitespace(&zLine[2]) ){
- return 1; /* SQL Server */
- }
- return 0;