pkg-config 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c1b5cb0cedf685a806efd09bdfbf787852c2b2eef92b43754a69156f5acb65
-  data.tar.gz: 4528eb9c10553f8547159793f39a21cae9f6ff33a98d7790c57b9f9f69c6718b
+  metadata.gz: 56f761ee856442aa5a1cab954113684151dffb48a87069862a7600ae549ae583
+  data.tar.gz: c005ee17fbd0499d8a4f28c6cae27d670e0ef891e69f63fcf5aef42dc07e5a0b
 SHA512:
-  metadata.gz: 0cae292cac6ced18946b212af545098462422f69b8be86b40a8e069640934060d6449ba2dcdc7cf81f99f9e28c962b5ac61c4236831cdbc50e45be02e2f8e89a
-  data.tar.gz: 0d1fc6aa1408c6b72a83e8381e36db9944a6bc704ad8814cde4807cf06195b840de7e666342ae440a76bdc155400e3e5036ba2d3a3e9a6a5b91250172aeb5243
+  metadata.gz: fe85cafd6e90bcc5722631dc59e40e86944d8e0fe3603e55560a5ece0eea63bdbe9a631a44a80c7b116a562b7ec6445fa5a17a64f15b8c54ac1e41b282edfeca
+  data.tar.gz: 91e6dbeaa6205cabe300c12cfa6f93088145d79c3dffc7d30f3ed9868fe943fa22e0dcde683d7ed2e4d7df1f1d29939abe0763ae1f82bc273d17efb766021be4

data/NEWS

@@ -1,5 +1,16 @@
 = NEWS
 
+== 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

@@ -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.7"
 end

data/lib/pkg-config.rb

@@ -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

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.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2022-01-16 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