pkg-config 1.4.3 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5fd5654e9bb6bcd643ec49f1c3a5e4dffeb8741663c7c5bcb1138bffcf2bfb
-  data.tar.gz: e9ade52de5043ccc219d0f5bcf0083048db0ac10cb5f022df7497f845793711a
+  metadata.gz: 56f761ee856442aa5a1cab954113684151dffb48a87069862a7600ae549ae583
+  data.tar.gz: c005ee17fbd0499d8a4f28c6cae27d670e0ef891e69f63fcf5aef42dc07e5a0b
 SHA512:
-  metadata.gz: 345270f9e96221baed66995429b561c8e0264a65802846abf3d3aaf5be5cd489060dcfa3c6ff4cb9ca5539e0b3e3cb21fd01343d47bac60ee980ab37ae7c0d3d
-  data.tar.gz: 7a16605e05c797c5666a9005bdb75554afffe9fba4c36097e1378c1a5f735be215c4c643ecb64fa516780f8ba7f004ca7c606bf31e8a00dfb84e993e23699d7b
+  metadata.gz: fe85cafd6e90bcc5722631dc59e40e86944d8e0fe3603e55560a5ece0eea63bdbe9a631a44a80c7b116a562b7ec6445fa5a17a64f15b8c54ac1e41b282edfeca
+  data.tar.gz: 91e6dbeaa6205cabe300c12cfa6f93088145d79c3dffc7d30f3ed9868fe943fa22e0dcde683d7ed2e4d7df1f1d29939abe0763ae1f82bc273d17efb766021be4

data/NEWS

@@ -1,5 +1,57 @@
 = 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
+
+  * 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
+
+  * Added support for macOS 11.2.
+    [Reported by Ludovic Moutury][GitHub:rcairo/rcairo#69]
+
+=== Thanks
+
+  * Ludovic Moutury
+
+== 1.4.4 - 2020-09-23
+
+=== Fixes
+
+  * Fixed a bug that NoMethodError instead of
+    PackageConfig::NotFoundError is raised.
+    [GitHub#21][Fixed by kojix2]
+
+=== Thanks
+
+  * kojix2
+
+== 1.4.3 - 2020-09-15
+
+=== Improvements
+
+  * Changed to use PackageConfig::NotFoundError instead of RuntimeError
+    for exception on no .pc is found.
+
 == 1.4.2 - 2020-08-10
 
 === Improvements

data/README.rdoc

@@ -8,17 +8,13 @@ pkg-config
 
 A pkg-config implementation by Ruby.
 
-== Dependencies
-
-* ruby >= 1.8 (1.9.2 is also supported!)
-
 == Install
 
   # gem install pkg-config
 
 == Documents
 
-* TODO
+* https://rubydoc.info/gems/pkg-config
 
 == Source
 
@@ -27,7 +23,7 @@ http://github.com/ruby-gnome/pkg-config
 
 == Copyright
 
-Copyright 2008-2019 Kouhei Sutou <kou@clear-code.com>
+Copyright 2008-2020 Kouhei Sutou <kou@clear-code.com>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -45,10 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 See LGPL-2.1 file for details.
 
-== Mailing list
-
-TODO
-
 == Thanks
 
 * Funky Bibimbap

data/lib/pkg-config/version.rb

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

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2020  Sutou Kouhei <kou@cozmixng.org>
+# Copyright 2008-2021  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
@@ -386,7 +386,7 @@ class PackageConfig
 
   IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
-    raise NotFoundError ".pc for #{@name} doesn't exist." unless exist?
+    raise NotFoundError, ".pc doesn't exist: <#{@name}>" unless exist?
     @variables = {}
     @declarations = {}
     File.open(pc_path) do |input|
@@ -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`
@@ -485,7 +486,11 @@ class PackageConfig
         homebrew_repository_candidates << Pathname(homebrew_repository)
       end
       homebrew_repository_candidates.uniq.each do |candidate|
-        path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+        pkgconfig_base_path = candidate + "Library/Homebrew/os/mac/pkgconfig"
+        path = pkgconfig_base_path + mac_os_version
+        unless path.exist?
+          path = pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
+        end
         paths << path.to_s if path.exist?
       end
     end

data/test/{test_pkg_config.rb → 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)
@@ -164,11 +166,33 @@ class PkgConfigTest < Test::Unit::TestCase
     end
   end
 
+  def test_not_found
+    message = ".pc doesn't exist: <nonexistent>"
+    assert_raise(PackageConfig::NotFoundError.new(message)) do
+      PKGConfig.modversion("nonexistent")
+    end
+  end
+
   private
   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.3
+  version: 1.4.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -68,7 +68,7 @@ files:
 - lib/pkg-config.rb
 - lib/pkg-config/version.rb
 - test/run-test.rb
-- test/test_pkg_config.rb
+- test/test-pkg-config.rb
 homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
@@ -89,10 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files:
 - test/run-test.rb
-- test/test_pkg_config.rb
+- test/test-pkg-config.rb