3.48.0

2025-01-15 17:30:31 +08:00
parent 538d9d59d9
commit 4e33528100
11 changed files with 35 additions and 60 deletions
@@ -1 +1,2 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
@@ -1,33 +0,0 @@
-# https://sqlite.org/forum/forumpost/0683a49cb02f31a1
-# https://bugs.gentoo.org/942918
-# Compiled from https://sqlite.org/forum/forumpost/6fd4ca69e86eafc6, https://www.sqlite.org/src/info/38136b33f9536b63 and https://www.sqlite.org/src/info/2f6e5946cf34e094
-
--- a/tool/buildtclext.tcl
-+++ b/tool/buildtclext.tcl
-@@ -140,12 +140,13 @@
-   if {[string length $OPTS]>1} {
-     append LDFLAGS $OPTS
-   }
-  set CMD [subst $cmd]
-   if {$TCLMAJOR>8} {
-     set OUT libtcl9sqlite$VERSION.$SUFFIX
-   } else {
-     set OUT libsqlite$VERSION.$SUFFIX
-   }
-+  set @ $OUT; # workaround for https://sqlite.org/forum/forumpost/6b1af7eb10884373
-+  set CMD [subst $cmd]
- }
-   
- # Show information about prior installs
-
--- a/tool/buildtclext.tcl	2024-11-18 14:01:05.040080030 +0800
-+++ b/tool/buildtclext.tcl	2024-11-18 14:01:27.998394871 +0800
-@@ -232,7 +232,7 @@
- 
-   # Generate and execute the command with which to do the compilation.
-   #
-  set cmd "$CMD tclsqlite3.c -o $OUT $LIBS"
-+  set cmd "$CMD tclsqlite3.c -o $OUT $LIBS -lm"
-   puts $cmd
-   file delete -force $OUT
-   catch {exec {*}$cmd} errmsg
@@ -0,0 +1,11 @@
+--- a/tool/buildtclext.tcl	2024-11-18 14:01:05.040080030 +0800
+++ b/tool/buildtclext.tcl	2024-11-18 14:01:27.998394871 +0800
+@@ -232,7 +232,7 @@
+ 
+   # Generate and execute the command with which to do the compilation.
+   #
+-  set cmd "$CMD tclsqlite3.c -o $OUT $LIBS"
+  set cmd "$CMD tclsqlite3.c -o $OUT $LIBS -lm"
+   puts $cmd
+   file delete -force $OUT
+   catch {exec {*}$cmd} errmsg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5
+size 3337615
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6dcca89a6749029fba81bc0f4188cbd4f78acb48d6a3eadc6d548af9117c3f41
-size 10957830
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3dc137fcd7c6acb326af60a61b9844dd15d3773cb05e7a9ce276c41f713d765a
+size 11391112
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6a471f1238225f34c2c48c5601b54024cc538044368230f59ff0672be1fc623
-size 14421983
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d7b032b6fdfe8c442aa809f850687a81d06381deecd7be3312601d28612e640
+size 14350897
@@ -1,19 +1,19 @@
 %bcond_without check

 Name:    sqlite
-Version: 3.47.2
+Version: 3.48.0
 %global extver %(echo %{version} |awk -F. '{printf "%d%02d%02d00", $1,$2,$3}')
 Release: 1
 Summary: Embeded SQL database
 License: Public Domain
-URL:     http://www.sqlite.org/
+URL:     https://www.sqlite.org/

-Source0: https://www.sqlite.org/2024/sqlite-src-%{extver}.zip
-Source1: http://www.sqlite.org/2024/sqlite-doc-%{extver}.zip
-Source2: https://www.sqlite.org/2024/sqlite-autoconf-%{extver}.tar.gz
-Patch0:  sqlite-3.47.1-buildtclext.patch
+Source0: https://www.sqlite.org/2025/sqlite-src-%{extver}.zip
+Source1: https://www.sqlite.org/2025/sqlite-doc-%{extver}.zip
+Source2: https://www.sqlite.org/2025/sqlite-autoconf-%{extver}.tar.gz
+Patch0:  sqlite-3.48.0-buildtclext.patch

-BuildRequires: gcc autoconf tcl tcl-devel
+BuildRequires: gcc tcl tcl-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: rpm_macro(tcl_sitearch)

@@ -58,32 +58,26 @@ This contains man files and HTML files for the using of sqlite.
 rm -f %{name}-doc-%{extver}/sqlite.css~ || :

 %build
-
-autoconf
 export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
               -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 \
               -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \
               -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
               -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \
               -Wall -fno-strict-aliasing"
-
-%configure --enable-fts5 \
+export CC=%{__cc}
+%configure --fts5 \
           --enable-threadsafe \
           --enable-load-extension \
 	   --disable-static \
           TCLLIBDIR=%{tcl_sitearch}/sqlite3

-# rpath removal
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 %make_build

 %make_build sqlite3_analyzer

 %install
 mkdir -p %{buildroot}/%{tcl_sitearch}/sqlite3
-%make_install
+%make_install TCLLIBDIR=%{tcl_sitearch}/sqlite3
 %delete_la

 install -D -m 755 lemon %{buildroot}%{_bindir}/lemon
@@ -91,10 +85,6 @@ install -D -m 644 tool/lempar.c %{buildroot}%{_datadir}/lemon/lempar.c
 install -D -m 644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 install -D -m 755 sqlite3_analyzer %{buildroot}%{_bindir}/sqlite3_analyzer

-mkdir -p %{buildroot}%{tcl_sitearch}
-mv %{buildroot}%{tcl_sitelib}/sqlite%{version} %{buildroot}%{tcl_sitearch}
-chmod 755 %{buildroot}/%{tcl_sitearch}/sqlite%{version}/*.so
-
 %if %{with check}
 %check
 export LD_LIBRARY_PATH=`pwd`/.libs
@@ -117,7 +107,7 @@ rm -rf test/thread2.test
 %{_bindir}/{sqlite3,lemon,sqlite3_analyzer}
 %{_libdir}/*.so.*
 %{_datadir}/lemon
-%{tcl_sitearch}/sqlite%{version}
+%{tcl_sitearch}/sqlite3

 %files devel
 %{_includedir}/*.h
@@ -129,6 +119,9 @@ rm -rf test/thread2.test
 %{_mandir}/man*/*

 %changelog
+* Tue Jan 14 2025 Funda Wang <fundawang@yeah.net> - 3.48.0-1
+- update to 3.48.0
+
 * Sun Dec 08 2024 Funda Wang <fundawang@yeah.net> - 3.47.2-1
 - update to 3.47.2