cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.6.16.1; a simple but important fix (and needed to update

Browse Source 
Firefox). Mainline sqlite has moved beyond this but involves some changes
to the build infrastructure which need to be looked at separately.

Since the distfile is no longer available upstream, this is provided
as a patch to the 3.6.16 distfile and is taken from upstream's SCM.

Requested by naddy@.
This commit is contained in:
sthen 2009-12-19 23:08:48 +00:00
parent acd818ba68
commit b4b78be2ae
5 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
databases/sqlite3/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.47 2009/08/03 09:55:47 sthen Exp $
# $OpenBSD: Makefile,v 1.48 2009/12/19 23:08:48 sthen Exp $
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
V= 3.6.16
DISTNAME= sqlite-${V}
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME-lemon= lemon-${V}
PKGNAME-main= sqlite3-${V}.1
PKGNAME-tcl= sqlite3-tcl-${V}.1
PKGNAME-lemon= lemon-${V}.1
CATEGORIES= databases
SHARED_LIBS += sqlite3 13.3 # .8.6
SHARED_LIBS += tclsqlite3 12.3 # .8.6

6
databases/sqlite3/patches/patch-VERSION Normal file
View File

@ -0,0 +1,6 @@
$OpenBSD: patch-VERSION,v 1.1 2009/12/19 23:08:48 sthen Exp $
--- VERSION.orig Fri Dec 18 22:05:03 2009
+++ VERSION Fri Dec 18 22:05:04 2009
@@ -1 +1 @@
-3.6.16
+3.6.16.1

17
databases/sqlite3/patches/patch-configure
View File

@ -1,6 +1,17 @@
$OpenBSD: patch-configure,v 1.7 2009/04/22 21:23:43 martynas Exp $
--- configure.orig Mon Apr 13 12:09:25 2009
+++ configure Thu Apr 16 23:11:23 2009
$OpenBSD: patch-configure,v 1.8 2009/12/19 23:08:48 sthen Exp $
--- configure.orig Thu Jun 25 12:45:57 2009
+++ configure Fri Dec 18 22:16:44 2009
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.6.16'
-PACKAGE_STRING='sqlite 3.6.16'
+PACKAGE_VERSION='3.6.16.1'
+PACKAGE_STRING='sqlite 3.6.16.1'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -12259,7 +12259,7 @@ USE_AMALGAMATION=1
# if not, then we fall back to plain tclsh.
# TODO: try other versions before falling back?

12
databases/sqlite3/patches/patch-src_expr_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_expr_c,v 1.1 2009/12/19 23:08:48 sthen Exp $
--- src/expr.c.orig Fri Dec 18 22:05:11 2009
+++ src/expr.c Fri Dec 18 22:05:22 2009
@@ -1672,7 +1672,7 @@ void sqlite3CodeSubselect(
if( sqlite3Select(pParse, pSel, &dest) ){
return;
}
- pExpr->iColumn = (i16)dest.iParm;
+ pExpr->iColumn = dest.iParm;
ExprSetIrreducible(pExpr);
break;
}

13
databases/sqlite3/patches/patch-src_sqliteInt_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.5 2009/08/03 09:55:47 sthen Exp $
$OpenBSD: patch-src_sqliteInt_h,v 1.6 2009/12/19 23:08:48 sthen Exp $
--- src/sqliteInt.h.orig Fri Jun 26 16:14:55 2009
+++ src/sqliteInt.h Sun Jun 28 14:40:40 2009
+++ src/sqliteInt.h Fri Dec 18 22:05:53 2009
@@ -35,11 +35,6 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@ -59,3 +59,12 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.5 2009/08/03 09:55:47 sthen Exp $
/*
** Round up a number to the next larger multiple of 8. This is used
@@ -1511,7 +1499,7 @@ struct Expr {
int iTable; /* TK_COLUMN: cursor number of table holding column
** TK_REGISTER: register number */
- i16 iColumn; /* TK_COLUMN: column index. -1 for rowid */
+ int iColumn; /* TK_COLUMN: column index. -1 for rowid */
i16 iAgg; /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
i16 iRightJoinTable; /* If EP_FromJoin, the right table of the join */
u16 flags2; /* Second set of flags. EP2_... */