pkg-config 1.4.5 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c534d5c0df96e67e72a0571920884897446ee0f744a16396826c97556bad064d
-  data.tar.gz: 3f98e05ee7a23b4e849caf6fe122b9efd25da4dd905cbe12bd2885333c679156
+  metadata.gz: c2c16e146d0ccf624f6d0bb159f794819283d0a03473faa688464c85529c76a8
+  data.tar.gz: 7bf14f8e591acf8eaae6ac8859499e1bb193e098d3f1ae6fd73027992433a87e
 SHA512:
-  metadata.gz: a1974ba13aa57590a7608a0baded10dd18f22dde4a0c242c81d1adba0dd1809bd2ec03fa3fdb03e57bb63acc94957a14da856b048baf4aa41eca38a98e37d61e
-  data.tar.gz: 40383987f314bacb2e8e9d39fca02bd0f9f4b60c1670fc7270e9757f6836bbd2c84001f07329882ef0713381e91054bf10bd06edea51b0fdb8e0eb3f97481ab4
+  metadata.gz: 78855df890fe391b08d049034817b8df3e238bbf584fe206dbea89c035ef3bc09651bc233c0623b09750f425afeeef0339fec0eca22555775e7f76a0bd3afdcc
+  data.tar.gz: d1baeaa40e6e8334c8b90dce84b8d53e5709164e983e267728897124f07f700051539b3cf5c347d1107c799535aa7a1aa860a9cd3fba1937147acfae05ffe585

data/NEWS

@@ -1,5 +1,33 @@
 = NEWS
 
+== 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
+
+  * Improved support for .pc detection installed by Homebrew.
+    [Reported by Evan Shea][GitHub:rcairo/rcairo#66]
+
+=== Thanks
+
+  * Evan Shea
+
 == 1.4.5 - 2021-02-04
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2020  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.5"
+  VERSION = "1.4.8"
 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
@@ -463,6 +463,7 @@ class PackageConfig
       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+)/ =~ `sw_vers -productVersion`
@@ -597,8 +598,12 @@ module PKGConfig
       message << " version (>= #{major}.#{minor}.#{micro})"
     end
     major ||= 0
-    enough_version = checking_for(checking_message(message)) do
-      check_version?(pkg, major, minor, micro)
+    enough_version = checking_for(checking_message(message), "%s") do
+      if check_version?(pkg, major, minor, micro)
+        "yes (#{modversion(pkg)})"
+      else
+        "no"
+      end
     end
     if enough_version
       libraries = libs_only_l(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.5
+  version: 1.4.8
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 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