pkg-config 1.5.1 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90e9d9dd81d99b7fd6412e1befe74deaabf67d3c181d50261846a2da0fe9d43
-  data.tar.gz: 9dd90a3ffc4e140bce369c8b45ba0c34ba8f3ccea6f0a49ce884b8ba6a2d9825
+  metadata.gz: 02f5ffc55f6c6be0c817f99382bf952d6034409f5739b028df92ca7c14df81c2
+  data.tar.gz: dff862614b13e2f884baa5d97769cce3fda34045d70f4edd7ce909eaaf14b529
 SHA512:
-  metadata.gz: de054c89cbe328715e28258636442959dfbca1c859e1fbff4f076bd945e019ced3aa0515f69cdb470288c76811b2d0138293b65398470acc24415c4631f298bc
-  data.tar.gz: a5414ffd42e1bc9cdde74df9ae83689473c9799ef7b6606ee9bb02379017b42db93b5d80f550820f9cea9befddd2a3402cf65435290b0f78db578c55480b9c00
+  metadata.gz: 35d5915bb0394db4eedea0c7cec0f527678cca9d77ecf709aa40b764f1fcc05c51e9c9dfb916d318d800890659f4249c81e16ef92bc21edd61c620629e38208f
+  data.tar.gz: 9bd75f5f78dd824aae20e96ff2f8e4aa221c2310d6464db465b2ae2fd319fb2969ac916659d9b22363f31220ce832a5c75bb2e552bd55d69766fa4b76b5c2d61

data/NEWS

@@ -1,5 +1,44 @@
 = NEWS
 
+== 1.5.6 - 2023-11-19
+
+=== Improvements
+
+  * Added support for "<" and ">" operators in "Requires:".
+
+    GH-23
+
+    Patch by Daisuke Fujimura
+
+=== Thanks
+
+  * Daisuke Fujimura
+
+== 1.5.5 - 2023-09-05
+
+=== Fixes
+
+  * Fixed a bug in 1.5.4 that success detection doesn't work.
+
+== 1.5.4 - 2023-09-05
+
+=== Improvements
+
+  * Added package version to unsatisfied version is only found case.
+
+== 1.5.3 - 2023-08-29
+
+=== Improvements
+
+  * Accepted spaces between "=" and ":". For example, "prefix = /usr"
+    is accepted.
+
+== 1.5.2 - 2023-06-25
+
+=== Improvements
+
+  * Added support for conda.
+
 == 1.5.1 - 2022-11-23
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright 2012-2023  Sutou Kouhei <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.5.1"
+  VERSION = "1.5.6"
 end

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright 2008-2023  Sutou Kouhei <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -170,6 +170,10 @@ class PackageConfig
           default_paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
           default_paths << (pkg_config_prefix + "share/pkgconfig").to_s
         end
+        conda_prefix = ENV["CONDA_PREFIX"]
+        if conda_prefix
+          default_paths << File.join(conda_prefix, "lib", "pkgconfig")
+        end
         default_paths << "/usr/local/lib64/pkgconfig"
         default_paths << "/usr/local/libx32/pkgconfig"
         default_paths << "/usr/local/lib/pkgconfig"
@@ -505,9 +509,9 @@ class PackageConfig
         line = line.gsub(/#.*/, "").strip
         next if line.empty?
         case line
-        when /^(#{IDENTIFIER_RE})=/
+        when /^(#{IDENTIFIER_RE})\s*=\s*/
           @variables[$1] = $POSTMATCH.strip
-        when /^(#{IDENTIFIER_RE}):/
+        when /^(#{IDENTIFIER_RE})\s*:\s*/
           @declarations[$1] = $POSTMATCH.strip
         end
       end
@@ -516,7 +520,7 @@ class PackageConfig
 
   def parse_requires(requires)
     return [] if requires.nil?
-    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, "")
+    requires_without_version = requires.gsub(/(?:<|>|<=|>=|=)\s*[\d.a-zA-Z_-]+\s*/, "")
     requires_without_version.split(/[,\s]+/)
   end
 
@@ -640,10 +644,14 @@ module PKGConfig
       if check_version?(pkg, major, minor, micro)
         "yes (#{modversion(pkg)})"
       else
-        "no"
+        if exist?(pkg)
+          "no (#{modversion(pkg)}"
+        else
+          "no (nonexistent)"
+        end
       end
     end
-    enough_version = (result != "no")
+    enough_version = result.start_with?("yes")
     if enough_version
       libraries = libs_only_l(pkg)
       dldflags = libs(pkg)

data/test/test-pkg-config.rb

@@ -237,5 +237,30 @@ class PkgConfigTest < Test::Unit::TestCase
       assert_equal(["fribidi"],
                    parse_requires("fribidi >= fribidi_required_dep"))
     end
+  
+    def test_greater_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi >= 1.0"))
+    end
+
+    def test_greater_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi > 1.0"))
+    end
+
+    def test_less_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi <= 1.0"))
+    end
+
+    def test_less_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi < 1.0"))
+    end
+
+    def test_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi = 1.0"))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A pkg-config implementation for Ruby