pkg-config 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa734326aace2a082621cebde9999bab5917805ff2148b046488471c5206db7
-  data.tar.gz: 7d6b09c7530dcc1710e12286ce7dc8fd8d5d84018c90c0708f49879b59031077
+  metadata.gz: bd3801ee52598218ff2e302d7f3333061b37e37b11c05f358bd879c74fe08830
+  data.tar.gz: 555996afc720c1df211f3ab1a50df6187dc8c25319f7b7f6c7e2968f48584f7a
 SHA512:
-  metadata.gz: 3d0ccc44aed59fe08e92f7b2f3fda3979e48e4dec6356b11067c9068841b3a4483ede5d94dcd8fd7880e99a065aef466b89cb48b2905b29387ada1f95078bb8e
-  data.tar.gz: 04e1038f82ecd393e0529a312baa6d4d0c887b10a36c7089fdef0d9b3c584040f056bc2e8b1945e995f1e49f24d197d5c98ca8f1fdb2682b4b1705398da97980
+  metadata.gz: c178151d14bab1004d468c23250b4b46e1d6eda4d21df0001773f16dbb75df959b60f6408ee77e24fbbea9ac1bfd20618b480d8c55fe08d081a49acb0ece6509
+  data.tar.gz: 6f442145770a3ceaaa70d4de5c25845e141a8d50fd7ab0fa22a1114fad9abaf70c8e6d0cf11b012569d812883b282f9be96896a2534efd175391af61f0f98609

data/NEWS

@@ -1,5 +1,20 @@
 = NEWS
 
+== 1.5.2 - 2023-06-25
+
+=== Improvements
+
+  * Added support for conda.
+
+== 1.5.1 - 2022-11-23
+
+=== Improvements
+
+  * Improved the default search path. "/usr" in "/usr/bin/pkg-config"
+    isn't used for buidling the default search path if "pkg-config
+    --variable=pc_path pkg-config" is available.
+    [Reported by Watson][GitHub:#22]
+
 == 1.5.0 - 2022-11-23
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.5.0"
+  VERSION = "1.5.2"
 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
@@ -158,24 +158,38 @@ class PackageConfig
       end
       if default_paths.nil?
         arch_depended_path = Dir.glob("/usr/lib/*/pkgconfig")
-        default_paths = [
-          "/usr/local/lib64/pkgconfig",
-          "/usr/local/libx32/pkgconfig",
-          "/usr/local/lib/pkgconfig",
-          "/usr/local/libdata/pkgconfig",
-          "/usr/local/share/pkgconfig",
-          "/opt/local/lib/pkgconfig",
-          *arch_depended_path,
-          "/usr/lib64/pkgconfig",
-          "/usr/libx32/pkgconfig",
-          "/usr/lib/pkgconfig",
-          "/usr/libdata/pkgconfig",
-          "/usr/X11R6/lib/pkgconfig",
-          "/usr/X11R6/share/pkgconfig",
-          "/usr/X11/lib/pkgconfig",
-          "/opt/X11/lib/pkgconfig",
-          "/usr/share/pkgconfig",
-        ]
+        default_paths = []
+        pkg_config_prefix = native_pkg_config_prefix
+        if pkg_config_prefix
+          pkg_config_arch_depended_paths =
+            Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+          default_paths.concat(pkg_config_arch_depended_paths)
+          default_paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+          default_paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+          default_paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+          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"
+        default_paths << "/usr/local/libdata/pkgconfig"
+        default_paths << "/usr/local/share/pkgconfig"
+        default_paths << "/opt/local/lib/pkgconfig"
+        default_paths.concat(arch_depended_path)
+        default_paths << "/usr/lib64/pkgconfig"
+        default_paths << "/usr/libx32/pkgconfig"
+        default_paths << "/usr/lib/pkgconfig"
+        default_paths << "/usr/libdata/pkgconfig"
+        default_paths << "/usr/X11R6/lib/pkgconfig"
+        default_paths << "/usr/X11R6/share/pkgconfig"
+        default_paths << "/usr/X11/lib/pkgconfig"
+        default_paths << "/opt/X11/lib/pkgconfig"
+        default_paths << "/usr/share/pkgconfig"
       end
       if Object.const_defined?(:RubyInstaller)
         mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
@@ -186,17 +200,6 @@ class PackageConfig
       default_paths.unshift(libdir) if libdir
 
       paths = []
-      pkg_config_prefix = native_pkg_config_prefix
-      if pkg_config_prefix
-        pkg_config_arch_depended_paths =
-          Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
-        paths.concat(pkg_config_arch_depended_paths)
-        paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
-        paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
-        paths << (pkg_config_prefix + "lib/pkgconfig").to_s
-        paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
-        paths << (pkg_config_prefix + "share/pkgconfig").to_s
-      end
       if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
         /\A(\d+\.\d+)/ =~ run_command("sw_vers", "-productVersion")
         mac_os_version = $1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-06-15 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