pkg-config 1.4.1 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b6c4b1e8df7f419e2faa25afd76dc8a29aa665aa0774b6ea9ff6bd8e2d5768
-  data.tar.gz: e885bc6fe1a7f17f01cfdff2db3822a76ae9bdafc0c299192a90f2e582634b90
+  metadata.gz: b1c1b5cb0cedf685a806efd09bdfbf787852c2b2eef92b43754a69156f5acb65
+  data.tar.gz: 4528eb9c10553f8547159793f39a21cae9f6ff33a98d7790c57b9f9f69c6718b
 SHA512:
-  metadata.gz: d5c54b359d84ce673cd8556f5124671514ce68b9f6b952652429165e43b7e9a8b35ed6834f72aab18e2d0a25c0844b74816191ac66b024c31f43a071b1bc9ef2
-  data.tar.gz: fd44996b5a304e03caabfd7ce55b156e6eb2b19eada66c64bab3777326263db51a3f444d651d1ba64d175172f895f9674b5e7fcb6e52e3a948fb55bee6540148
+  metadata.gz: 0cae292cac6ced18946b212af545098462422f69b8be86b40a8e069640934060d6449ba2dcdc7cf81f99f9e28c962b5ac61c4236831cdbc50e45be02e2f8e89a
+  data.tar.gz: 0d1fc6aa1408c6b72a83e8381e36db9944a6bc704ad8814cde4807cf06195b840de7e666342ae440a76bdc155400e3e5036ba2d3a3e9a6a5b91250172aeb5243

data/NEWS

@@ -1,5 +1,53 @@
 = NEWS
 
+== 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
+
+  * Added support for detecting pkgconfig path on RubyInstaller
+    without "ridk exec".
+
 == 1.4.1 - 2020-02-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.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
@@ -25,6 +25,12 @@ require "rbconfig"
 require "shellwords"
 
 class PackageConfig
+  class Error < StandardError
+  end
+
+  class NotFoundError < Error
+  end
+
   SEPARATOR = File::PATH_SEPARATOR
 
   class << self
@@ -380,7 +386,7 @@ class PackageConfig
 
   IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
-    raise ".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|
@@ -439,6 +445,11 @@ class PackageConfig
       "/opt/X11/lib/pkgconfig",
       "/usr/share/pkgconfig",
     ]
+    if Object.const_defined?(:RubyInstaller)
+      mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
+      mingw_pkgconfig_path = Pathname.new(mingw_bin_path) + "../lib/pkgconfig"
+      default_paths.unshift(mingw_pkgconfig_path.cleanpath.to_s)
+    end
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_paths.unshift(libdir) if libdir
 
@@ -452,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`
@@ -474,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/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Kouhei Sutou <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.1"
+  VERSION = "1.4.6"
 end

data/test/run-test.rb

@@ -6,9 +6,6 @@ base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
-ENV["BUNDLE_GEMFILE"] ||= File.join(base_dir, "Gemfile")
-require "bundler/setup"
-
 require 'test-unit'
 
 $LOAD_PATH.unshift(lib_dir)

data/test/{test_pkg_config.rb → test-pkg-config.rb}

@@ -164,6 +164,13 @@ 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}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2021-04-12 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,11 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.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