sqlite3 1.5.2-arm64-darwin → 1.5.3-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5b1f8ab4707eade36c5feb979a9512169c0f85c4aeed66246c07d57634e4b2
-  data.tar.gz: fd0cb2184a81d99cee50359acd4db2cb6afdec99c63d7ae0e3e9e821aac7dfe1
+  metadata.gz: 4f94e80289254b0bc7c6978920fa48c21ae2e7559252e70af490eed2453937f4
+  data.tar.gz: 7e7c707be5f39a43523c8753ffb04651339d11bddbba2b19e336bba47a78c73a
 SHA512:
-  metadata.gz: 9ca890c1088dd4e71285508a11d0080e8c8251388242504e72e1e80180cdb3783d5374ded1fcd93864b7302d45917e624ac1c64b28b28b732ad5636ebc724396
-  data.tar.gz: 948f345f1c71aa19f105b8d60a63651c4c093da0e2e5ca38dc394d7cc58fd1c15d1e969cec33d331b3b421d9191b54313c9a4e5d575d70deb90f9ac6a4075495
+  metadata.gz: dfcabccdf97f099a61c6f1677df1589cdc7ca13819749c638303644b043dbff9d33e50ddf19107cc99a18c32f95bd758aec70c096bcba134d9434b941cc5772b
+  data.tar.gz: cb6ed052e21b04612abf1a38193009b62685e9c9de9a8b9f9504b0bb443815d254278bbb2b1069716a380eb17ae5d4eb7202350c68a7b97b60a686e313fab176

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # sqlite3-ruby Changelog
 
+## 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

@@ -20,5 +20,5 @@ A quick checklist:
 - [ ] 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`
 - [ ] 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/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
 
@@ -140,6 +149,10 @@ 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

data/lib/sqlite3/version.rb

@@ -1,11 +1,11 @@
 module SQLite3
 
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 
   module VersionProxy
     MAJOR = 1
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
     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.3
 platform: arm64-darwin
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest