pkg-config 1.4.6 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c1b5cb0cedf685a806efd09bdfbf787852c2b2eef92b43754a69156f5acb65
-  data.tar.gz: 4528eb9c10553f8547159793f39a21cae9f6ff33a98d7790c57b9f9f69c6718b
+  metadata.gz: a8744b07afc1df6d424780519cc0bc63c958c3933b1b4ee58ed8c97b73c240f9
+  data.tar.gz: 4cdef6c98e5f88ac45a0bc5c26f580a1d9fb31fb637bfd37eb014e7aa6798bff
 SHA512:
-  metadata.gz: 0cae292cac6ced18946b212af545098462422f69b8be86b40a8e069640934060d6449ba2dcdc7cf81f99f9e28c962b5ac61c4236831cdbc50e45be02e2f8e89a
-  data.tar.gz: 0d1fc6aa1408c6b72a83e8381e36db9944a6bc704ad8814cde4807cf06195b840de7e666342ae440a76bdc155400e3e5036ba2d3a3e9a6a5b91250172aeb5243
+  metadata.gz: daad81936552a5db084c32c3c91825917cdb5f35c3940aa7cd0249f433ab02b5b5ee779538e7cad51721f9daed7890e9a45571244078f927db895b243045a2bd
+  data.tar.gz: 970f917f76ed381f3d427c3add37495107c5bb556aa9470b72459b06bb768b4ad21215f9efd6fb712535a9f99f9ffb2019313e562d5f57c1228de5824634c36b

data/NEWS

@@ -1,5 +1,32 @@
 = NEWS
 
+== 1.4.9 - 2022-07-31
+
+This is a bug fix release of 1.4.8. All 1.4.8 users should be upgraded
+to 1.4.9.
+
+=== Fixes
+
+  * Fixed a regression bug in 1.4.8 that PkgConfig.have_package can't
+    detect nonexistent package.
+
+== 1.4.8 - 2022-07-30
+
+=== Improvements
+
+  * Added support for showing found package version.
+
+== 1.4.7 - 2022-01-16
+
+=== Improvements
+
+  * Added support for RubyInstaller2 3.1 or later.
+    [Reported by golirev][GitHub:ruby-gnome/ruby-gnome#1457]
+
+=== Thanks
+
+  * golirev
+
 == 1.4.6 - 2021-04-12
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright 2012-2022  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.4.6"
+  VERSION = "1.4.9"
 end

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright 2008-2022  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
@@ -301,7 +301,7 @@ class PackageConfig
   end
 
   def normalize_path_flags(path_flags, flag_option)
-    return path_flags unless /-mingw32\z/ === RUBY_PLATFORM
+    return path_flags unless /-mingw(?:32|-ucrt)\z/ === RUBY_PLATFORM
 
     pkg_config_prefix = self.class.native_pkg_config_prefix
     return path_flags unless pkg_config_prefix
@@ -598,9 +598,14 @@ module PKGConfig
       message << " version (>= #{major}.#{minor}.#{micro})"
     end
     major ||= 0
-    enough_version = checking_for(checking_message(message)) do
-      check_version?(pkg, major, minor, micro)
+    result = checking_for(checking_message(message), "%s") do
+      if check_version?(pkg, major, minor, micro)
+        "yes (#{modversion(pkg)})"
+      else
+        "no"
+      end
     end
+    enough_version = (result != "no")
     if enough_version
       libraries = libs_only_l(pkg)
       dldflags = libs(pkg)

data/test/test-pkg-config.rb

@@ -25,12 +25,14 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_cflags
+    omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
     assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
     only_pkg_config_version(0, 29)
     assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
   end
 
   def test_cflags_only_I
+    omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
     assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
     only_pkg_config_version(0, 29)
     assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
@@ -175,7 +177,22 @@ class PkgConfigTest < Test::Unit::TestCase
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
     args = args.collect {|arg| arg.dump}.join(" ")
-    `pkg-config #{args} #{package}`.strip
+    normalize_pkg_config_result(`pkg-config #{args} #{package}`.strip)
+  end
+
+  def normalize_pkg_config_result(result)
+    case RUBY_PLATFORM
+    when /mingw/
+      result = result.gsub(/\/bin\/..\//, "/")
+      if result.include?(" -mms-bitfields ")
+        # Reorder -mms-bitfields (non path flag)
+        result = result.gsub(" -mms-bitfields ", " ")
+        result = "-mms-bitfields #{result}"
+      end
+      result
+    else
+      result
+    end
   end
 
   def assert_pkg_config(package, pkg_config_args, actual)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2022-07-30 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.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby