Attachment 190479 Details for Bug 225627 – new patch (one string was lost)

[patch] new patch (one string was lost)

sqlite3-20180210.diff (text/plain), 5.84 KB, created by Pavel Volkov on 2018-02-10 12:56:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2018-02-10 12:56:16 UTC

Size: 5.84 KB

patch

obsolete

>diff -urNd databases/sqlite3.orig/Makefile databases/sqlite3/Makefile
>--- databases/sqlite3.orig/Makefile	2018-02-10 12:33:19.340351000 +0000
>+++ databases/sqlite3/Makefile	2018-02-10 12:35:45.438688000 +0000
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/databases/sqlite3/Makefile 453790 2017-11-09 02:31:47Z jbeich $
> 
> PORTNAME=	sqlite3
>-PORTVERSION=	3.21.0
>-PORTREVISION=	1
>+PORTVERSION=	3.22.0
> CATEGORIES=	databases
>-MASTER_SITES=	https://www.sqlite.org/2017/ http://www2.sqlite.org/2017/ http://www3.sqlite.org/2017/
>+MASTER_SITES=	https://www.sqlite.org/2018/ http://www2.sqlite.org/2018/ http://www3.sqlite.org/2018/
> DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
> 
> MAINTAINER=	pavelivolkov@gmail.com
>@@ -23,8 +22,8 @@
> # Compilation Options For SQLite https://www.sqlite.org/compile.html
> OPTIONS_DEFINE=	FTS4 UPD_DEL_LIMIT URI URI_AUTHORITY SOUNDEX METADATA \
> 		DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \
>-		EXTENSION ARMOR STMT DBPAGE DBSTAT FTS5 JSON1 RBU NULL_TRIM \
>-		LIKENOTBLOB STSHELL FTS3_TOKEN SESSION UNKNOWN_SQL
>+		EXTENSION ARMOR STMT FTS5 JSON1 RBU NULL_TRIM \
>+		OFFSET LIKENOTBLOB STSHELL FTS3_TOKEN SESSION UNKNOWN_SQL
> OPTIONS_SINGLE=	RAMT
> OPTIONS_RADIO=	STAT
> OPTIONS_GROUP=	UNICODE RTREEG RL
>@@ -44,6 +43,9 @@
> # https://sqlite.org/compile.html#enable_null_trim
> NULL_TRIM_DESC=		Omits NULL columns at the ends of rows
> 
>+# http://www.sqlite.org/compile.html#enable_offset_sql_func
>+OFFSET_DESC=		Enabled the sqlite_offset() SQL function
>+
> # https://www.sqlite.org/sessionintro.html
> SESSION_DESC=		Enable the Session Extension
> 
>@@ -90,21 +92,14 @@
> STAT3_DESC=		collect histogram data from leftmost column
> STAT4_DESC=		collect histogram data from all columns
> 
>-# https://sqlite.org/compile.html#enable_dbpage_vtab
>-DBPAGE_DESC=		Enable DBPAGE Virtual Table
>-
>-# https://www.sqlite.org/dbstat.html
>-DBSTAT_DESC=		Enable DBSTAT Virtual Table
>-
> # https://www.sqlite.org/fts3.html#tokenizer
> OPTIONS_GROUP_UNICODE=	ICU UNICODE61
> UNICODE_DESC=		Unicode support
> UNICODE61_DESC=		Unicode Version 6.1 tokenizer
> 
> # https://www.sqlite.org/rtree.html
>-OPTIONS_GROUP_RTREEG=	RTREE RTREE_INT
>+OPTIONS_GROUP_RTREEG=	RTREE_INT
> RTREEG_DESC=		Index type for range queries
>-RTREE_DESC=		Enable R*Tree module
> RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
> 
> OPTIONS_GROUP_RL=	READLINES READLINEP EDITLINE
>@@ -117,7 +112,7 @@
> EDITLINE_PREVENTS=	READLINES READLINEP
> 
> OPTIONS_DEFAULT=	FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \
>-			EXTENSION TS1 UNICODE61 RTREE DBSTAT STSHELL READLINES \
>+			EXTENSION TS1 UNICODE61 STSHELL READLINES \
> 			FTS3_TOKEN FTS5
> # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
> # RTREE used by graphics/mapnik, databases/spatialite
>@@ -142,10 +137,9 @@
> TS2_CPPFLAGS=	-DSQLITE_TEMP_STORE=2
> TS3_CPPFLAGS=	-DSQLITE_TEMP_STORE=3
> 
>-RTREE_CPPFLAGS=	-DSQLITE_ENABLE_RTREE=1
> RTREE_INT_CPPFLAGS=	-DSQLITE_RTREE_INT_ONLY=1
> 
>-FTS4_CPPFLAGS=	-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
>+FTS4_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1
> FTS5_CONFIGURE_ENABLE=	fts5
> FTS5_LIBS=		-lm
> FTS3_TOKEN_CPPFLAGS=	-DSQLITE_ENABLE_FTS3_TOKENIZER=1
>@@ -160,8 +154,6 @@
> METADATA_CPPFLAGS=	-DSQLITE_ENABLE_COLUMN_METADATA=1
> STAT3_CPPFLAGS=	-DSQLITE_ENABLE_STAT3=1
> STAT4_CPPFLAGS=	-DSQLITE_ENABLE_STAT4=1
>-DBPAGE_CPPFLAGS=	-DSQLITE_ENABLE_DBPAGE_VTAB=1
>-DBSTAT_CPPFLAGS=	-DSQLITE_ENABLE_DBSTAT_VTAB=1
> URI_CPPFLAGS=	-DSQLITE_USE_URI=1
> URI_AUTHORITY_CPPFLAGS=	-DSQLITE_ALLOW_URI_AUTHORITY=1
> DIRECT_READ_CPPFLAGS=	-DSQLITE_DIRECT_OVERFLOW_READ=1
>@@ -202,6 +194,8 @@
> 
> NULL_TRIM_CPPFLAGS=	-DSQLITE_ENABLE_NULL_TRIM=1
> 
>+OFFSET_CPPFLAGS=	-DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
>+
> .include <bsd.port.options.mk>
> 
> # Platform Configuration
>diff -urNd databases/sqlite3.orig/distinfo databases/sqlite3/distinfo
>--- databases/sqlite3.orig/distinfo	2018-02-10 12:33:19.340348000 +0000
>+++ databases/sqlite3/distinfo	2018-02-10 12:33:24.457809000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1509525928
>-SHA256 (sqlite-autoconf-3210000.tar.gz) = d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3
>-SIZE (sqlite-autoconf-3210000.tar.gz) = 2568942
>+TIMESTAMP = 1517654018
>+SHA256 (sqlite-autoconf-3220000.tar.gz) = 2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612
>+SIZE (sqlite-autoconf-3220000.tar.gz) = 2644649
>diff -urNd databases/sqlite3.orig/files/patch-Makefile.am databases/sqlite3/files/patch-Makefile.am
>--- databases/sqlite3.orig/files/patch-Makefile.am	2018-02-10 12:33:19.340324000 +0000
>+++ databases/sqlite3/files/patch-Makefile.am	1970-01-01 00:00:00.000000000 +0000
>@@ -1,9 +0,0 @@
>---- Makefile.am.orig	2016-05-29 06:03:15 UTC
>-+++ Makefile.am
>-@@ -1,5 +1,5 @@
>- 
>--AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
>-+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@
>- 
>- lib_LTLIBRARIES = libsqlite3.la
>- libsqlite3_la_SOURCES = sqlite3.c
>diff -urNd databases/sqlite3.orig/files/patch-Makefile.in databases/sqlite3/files/patch-Makefile.in
>--- databases/sqlite3.orig/files/patch-Makefile.in	2018-02-10 12:33:19.340339000 +0000
>+++ databases/sqlite3/files/patch-Makefile.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2016-05-29 06:04:20 UTC
>-+++ Makefile.in
>-@@ -363,7 +363,7 @@ target_alias = @target_alias@
>- top_build_prefix = @top_build_prefix@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>--AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
>-+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@
>- lib_LTLIBRARIES = libsqlite3.la
>- libsqlite3_la_SOURCES = sqlite3.c
>- libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8

Flags:

pavelivolkov: maintainer-approval+

Actions: View | Diff

Attachments on bug 225627: 190291 | 190292 | 190479