sqlite3 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16e52d4fb2cbeb74c1b9e081bd5a19d31cf1750b0c4441a6d99d190ec3c0983
-  data.tar.gz: 27fbce7b613a4b7a7ace7d2f9ede2236eee361a71f4ebf8f991224e1c7e0619d
+  metadata.gz: 2b90b6b29818fed972c55598d50dd2e395e4c7b9f3c0709d34cb99a462ea8ec5
+  data.tar.gz: e28aa12b3bac56cb43f8935bd654274cc79464cbef355a07aab3f0a19321b656
 SHA512:
-  metadata.gz: 277fc25b7ca8472462de6a39ba5342e9d098eb467313a2454d117212b498a69347153bffd4f8b9aae3aa197ce30ed8bab550a115f3efcbbf240391fa76bb062d
-  data.tar.gz: 5002e61993b96abcd7c70d3276449c23a72bc9a5415287a63d0624bab300f2b9c5d6e92527cab1d4b0216b74a606a6af8fbea83a9e169b4feaacbc07931401ae
+  metadata.gz: 1b8eb37dbf8097870eec21db848c51494834790d547896f1769da7ad7a40d5f2857dc3c09271ab4ec2e242527b993d105fe813f0e13efbc4b0977570cb45aedd
+  data.tar.gz: a0a2b779e97adb130490734a5b0699aa63064681fea662f61a8a5dc03b75664c0da929cd8f8be8a7f74ddc1925b0192ed9447e6f47bc3161151df4759a91ca8b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # sqlite3-ruby Changelog
 
+## 1.5.4 / 2022-11-18
+
+### Dependencies
+
+* Vendored sqlite is updated to [v3.40.0](https://sqlite.org/releaselog/3_40_0.html).
+
+
+## 1.5.3 / 2022-10-11
+
+### Fixed
+
+* Fixed installation of the "ruby" platform gem when building from source on Fedora. In v1.5.0..v1.5.2, installation failed on some systems due to the behavior of Fedora's pkg-config implementation. [#355]
+
+
 ## 1.5.2 / 2022-10-01
 
 ### Packaging

data/CONTRIBUTING.md

@@ -17,8 +17,8 @@ Run `bin/build-gems` which will package gems for all supported platforms, and ru
 A quick checklist:
 
 - [ ] make sure CI is green!
-- [ ] update `CHANGELOG.md` and `lib/sqlite3/version.rb` including `VersionProxy::{MINOR,TINY}`
-- [ ] create a git tag using a format that matches the pattern `v\d+\.\d+\.\d+`, e.g. `v1.3.13`
+- [x] update `CHANGELOG.md` and `lib/sqlite3/version.rb` including `VersionProxy::{MINOR,TINY}`
+- [x] create a git tag using a format that matches the pattern `v\d+\.\d+\.\d+`, e.g. `v1.3.13`
 - [ ] run `bin/build-gems` and make sure it completes and all the tests pass
-- [ ] `for g in gems/*.gem ; do gem push $g ; done`s
+- [ ] `for g in gems/*.gem ; do gem push $g ; done`
 - [ ] create a release at https://github.com/sparklemotion/sqlite3-ruby/releases and include sha2 checksums

data/dependencies.yml

@@ -2,13 +2,13 @@
 :sqlite3:
   # checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
   #
-  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3390400.tar.gz
-  # 431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090  ports/archives/sqlite-autoconf-3390400.tar.gz
+  # $ sha3sum -a 256 ports/archives/sqlite-autoconf-3400000.tar.gz
+  # 7ee8f02b21edb4489df5082b5cf5b7ef47bcebcdb0e209bf14240db69633c878  ports/archives/sqlite-autoconf-3400000.tar.gz
   #
-  # $ sha256sum ports/archives/sqlite-autoconf-3390400.tar.gz
-  # f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb  ports/archives/sqlite-autoconf-3390400.tar.gz
+  # $ sha256sum ports/archives/sqlite-autoconf-3400000.tar.gz
+  # 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7  ports/archives/sqlite-autoconf-3400000.tar.gz
   #
-  :version: "3.39.4"
+  :version: "3.40.0"
   :files:
-    - :url: "https://sqlite.org/2022/sqlite-autoconf-3390400.tar.gz"
-      :sha256: "f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb"
+    - :url: "https://sqlite.org/2022/sqlite-autoconf-3400000.tar.gz"
+      :sha256: "0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7"

data/ext/sqlite3/extconf.rb

@@ -66,15 +66,24 @@ module Sqlite3
           end
           recipe.activate
 
-          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t" # on macos, pkg-config will not return --cflags without this
-          pcfile = File.join(recipe.path, "lib", "pkgconfig", "sqlite3.pc")
-          if pkg_config(pcfile)
-            # see https://bugs.ruby-lang.org/issues/18490
-            libs = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
-            libs.split.each { |lib| append_ldflags(lib) } if $?.success?
-          else
-            abort("\nCould not configure the build properly. Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+          # on macos, pkg-config will not return --cflags without this
+          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
+
+          lib_path = File.join(recipe.path, "lib")
+          pcfile = File.join(lib_path, "pkgconfig", "sqlite3.pc")
+          abort_pkg_config("pkg_config") unless pkg_config(pcfile)
+
+          # see https://bugs.ruby-lang.org/issues/18490
+          flags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
+          abort_pkg_config("xpopen") unless $?.success?
+          flags = flags.split
+
+          # see https://github.com/flavorjones/mini_portile/issues/118
+          "-L#{lib_path}".tap do |lib_path_flag|
+            flags.prepend(lib_path_flag) unless flags.include?(lib_path_flag)
           end
+
+          flags.each { |flag| append_ldflags(flag) }
         end
       end
 
@@ -117,9 +126,13 @@ module Sqlite3
 
       def minimal_recipe
         MiniPortile.new(libname, sqlite3_config[:version]).tap do |recipe|
-          recipe.files = sqlite3_config[:files]
-          recipe.target = File.join(package_root_dir, "ports")
-          recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort
+          if sqlite_source_dir
+            recipe.source_directory = sqlite_source_dir
+          else
+            recipe.files = sqlite3_config[:files]
+            recipe.target = File.join(package_root_dir, "ports")
+            recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort
+          end
         end
       end
 
@@ -140,10 +153,18 @@ module Sqlite3
         abort("\nCould not find #{missing}.\nPlease visit https://github.com/sparklemotion/sqlite3-ruby for installation instructions.\n\n")
       end
 
+      def abort_pkg_config(id)
+        abort("\nCould not configure the build properly (#{id}). Please install either the `pkg-config` utility or the `pkg-config` rubygem.\n\n")
+      end
+
       def cross_build?
         enable_config("cross-build")
       end
 
+      def sqlite_source_dir
+        arg_config("--with-sqlite-source-dir")
+      end
+
       def download
         minimal_recipe.download
       end
@@ -165,6 +186,9 @@ module Sqlite3
                     Use libsqlcipher instead of libsqlite3.
                     (Implies `--enable-system-libraries`.)
 
+                --with-sqlite-source-dir=DIRECTORY
+                    (dev only) Build sqlite from the source code in DIRECTORY
+
                 --help
                     Display this message.
 

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.5.2"
+  VERSION = "1.5.4"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 5
-    TINY  = 2
+    TINY  = 4
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -145,7 +145,7 @@ files:
 - lib/sqlite3/translator.rb
 - lib/sqlite3/value.rb
 - lib/sqlite3/version.rb
-- ports/archives/sqlite-autoconf-3390400.tar.gz
+- ports/archives/sqlite-autoconf-3400000.tar.gz
 - test/helper.rb
 - test/test_backup.rb
 - test/test_collation.rb