pkg-config 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11b312f0ff5b0ea6b556ddf155f0298fb7ef5467
-  data.tar.gz: e7a171afa76835a1c16ba38977a4d85ae5c45e46
+  metadata.gz: '09358e3bde84ec7d5a2a90f63c7645fb157826c1'
+  data.tar.gz: e51b468a0e04475368df7a1812dc8261fb1bd2e2
 SHA512:
-  metadata.gz: dfbdd95f6930ea73e9d58568898ae35baba7b12dd466ab978d2c5543c23a635a0dd3d55e2d082eb8b2eb7075ce4016168f8fe074d8ee4a9a328fc8bf49e7ea89
-  data.tar.gz: dddb03560e40be24ce601389205fd9f6c701c267adecc39c66e5f79391462a6938f573043cb8b9683a9f524b125af3d51d81b57decacecc47a57fcf69fbdbdeb
+  metadata.gz: 35f46161d07e06730e9411e4a0c5fee1a75e60c186af40dbcde8200f2a4093f3d4c35ed2f8ed8d4ff0ae4860144a8fb2c06b86e962ebf231bfc462fb44f136ec
+  data.tar.gz: 88a56de322a6d128145b5a07835a37a786b98bece0a90968badfdbd4c1a17a4c49b5f2482e91fd878b0c5300959f26bfb42f0cecc411a9667ff44b4e4ab1d46a

data/NEWS

@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.2.5 - 2017-08-10
+
+=== Improvements
+
+  * Supported Homebrew bundled .pc files.
+    [GitHub:rcairo/rcairo#49][Reported by choboy11]
+
+=== Thanks
+
+  * choboy11
+
 == 1.2.4 - 2017-08-07
 
 === Improvements

data/lib/pkg-config.rb

@@ -358,21 +358,30 @@ class PackageConfig
     when "x64-mingw32"
       default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
     end
-    default_path = default_paths.join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_path = [libdir, default_path].join(SEPARATOR) if libdir
+    default_paths.unshift(libdir) if libdir
 
     pkg_config = self.class.native_pkg_config
-    return default_path unless pkg_config.absolute?
+    return default_paths.join(SEPARATOR) unless pkg_config.absolute?
+
     pkg_config_prefix = pkg_config.parent.parent
-    pkg_config_arch_depended_path =
-      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
-    [pkg_config_arch_depended_path,
-     (pkg_config_prefix + "lib64/pkgconfig").to_s,
-     (pkg_config_prefix + "libx32/pkgconfig").to_s,
-     (pkg_config_prefix + "lib/pkgconfig").to_s,
-     (pkg_config_prefix + "libdata/pkgconfig").to_s,
-     default_path].join(SEPARATOR)
+    pkg_config_arch_depended_paths =
+      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+    paths = []
+    paths.concat(pkg_config_arch_depended_paths)
+    paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+    paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+    if /-darwin\d+\z/ =~ RUBY_PLATFORM and
+        /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
+      mac_os_version = $1
+      path = pkg_config_prefix +
+        "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+      paths << path.to_s if path.exist?
+    end
+    paths.concat(default_paths)
+    paths.join(SEPARATOR)
   end
 
   def required_packages

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.2.4"
+  VERSION = "1.2.5"
 end

data/test/test_pkg_config.rb

@@ -12,7 +12,7 @@ class PkgConfigTest < Test::Unit::TestCase
   def only_pkg_config_version(major, minor)
     pkg_config_version = `pkg-config --version`.chomp
     current_major, current_minor = pkg_config_version.split(".").collect(&:to_i)
-    return if ([major, minor] <=> [current_major, current_minor]) < 0
+    return if ([major, minor] <=> [current_major, current_minor]) <= 0
     omit("Require pkg-config #{pkg_config_version} or later")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit