pkg-config 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b5f3195aaf3256d321cff0a2173dca2be59ccad2aad4540911cabdb7eddc25f
-  data.tar.gz: c8aa9959e02716ad500c43991f4d1de68529af222ec17ef32f4eaba37cdfc9f9
+  metadata.gz: cb7bbc85c094847a31538ce2c4ed0adfb26046c5e869e20135cdf97d560d76ee
+  data.tar.gz: 61e0d10717cf5a95b2e86274954143730a69512093a73d1202e7d2a9b5957a05
 SHA512:
-  metadata.gz: fd72aed899f6ca7b03284663d5c8b70cbe702f9efe901829ad19faf6ee27afe16ee627ffbf879ee2fd7e44d4dadc7b165fe08eae29a56bef583610981628d568
-  data.tar.gz: e2725c187a7f9fc13868b128f85b34c8f16adbe397fb5b64b446870e82919aa3be5886d533c8b499fdfc1daceb3b906eca4a8794122aa1714705f6f03dd8c0dc
+  metadata.gz: c0c1de601a893060b82f7ffd3b96541780152fe82e63ca0e9f04653d471134a0b752db24969949485be825226bd278872bdf90384368c7007c503f961cb8e688
+  data.tar.gz: 74a24c0a5d04ecf648d6c9193508bf43c4fa64144c87a69da601a745e2009e5748573467ddf8aa386e985771036e40993adb0883659e6f71baae111edd29908f

data/NEWS

@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.3.5 - 2019-03-08
+
+=== Fixes
+
+  * Fixed MSYS2 detection installed at non standard folder.
+    [GitHub:ruby-gnome2/ruby-gnome2#1271][Reported by Simon Arnaud]
+
+=== Thanks
+
+  * Simon Arnaud
+
 == 1.3.4 - 2019-02-19
 
 === Fixes

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2008-2019 Kouhei Sutou <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
@@ -34,6 +34,11 @@ class PackageConfig
       @native_pkg_config ||= guess_native_pkg_config
     end
 
+    @native_pkg_config_prefix = nil
+    def native_pkg_config_prefix
+      @native_pkg_config_prefix ||= compute_native_pkg_config_prefix
+    end
+
     @custom_override_variables = nil
     def custom_override_variables
       @custom_override_variables ||= with_config("override-variables", "")
@@ -41,6 +46,7 @@ class PackageConfig
 
     def clear_configure_args_cache
       @native_pkg_config = nil
+      @native_pkg_config_prefix = nil
       @custom_override_variables = nil
     end
 
@@ -112,6 +118,20 @@ class PackageConfig
         Pathname(path.to_s)
       end
     end
+
+    def compute_native_pkg_config_prefix
+      pkg_config = native_pkg_config
+      return nil unless pkg_config.absolute?
+
+      pkg_config_prefix = pkg_config.parent.parent
+      if File::ALT_SEPARATOR
+        normalized_pkg_config_prefix =
+          pkg_config_prefix.to_s.split(File::ALT_SEPARATOR).join(File::SEPARATOR)
+        Pathname(normalized_pkg_config_prefix)
+      else
+        pkg_config_prefix
+      end
+    end
   end
 
   attr_reader :paths
@@ -232,26 +252,18 @@ class PackageConfig
   end
 
   def normalize_path_flags(path_flags, flag_option)
+    return path_flags unless /-mingw32\z/ === RUBY_PLATFORM
+
+    pkg_config_prefix = self.class.native_pkg_config_prefix
+    return path_flags unless pkg_config_prefix
+
+    mingw_dir = pkg_config_prefix.basename.to_s
     path_flags.collect do |path_flag|
-      path = path_flag.sub(flag_option, "")
-      prefix = ""
-      case RUBY_PLATFORM
-      when "i386-mingw32"
-        ruby_prefix = RbConfig::CONFIG["prefix"]
-        candidates = Dir.glob("#{ruby_prefix}/msys{32,64,*}")
-        candidates.concat(Dir.glob("c:/msys{32,64,*}"))
-        prefix = candidates.first
-      when "x64-mingw32"
-        ruby_prefix = RbConfig::CONFIG["prefix"]
-        candidates = Dir.glob("#{ruby_prefix}/msys{64,*}")
-        candidates.concat(Dir.glob("c:/msys{64,*}"))
-        prefix = candidates.first
-      end
-      if /\A[a-z]:/i === path
-        "#{flag_option}#{path}"
-      else
-        "#{flag_option}#{prefix}#{path}"
+      path = path_flag.sub(/\A#{Regexp.escape(flag_option)}/, "")
+      path = path.sub(/\A\/#{Regexp.escape(mingw_dir)}/i) do
+        pkg_config_prefix.to_s
       end
+      "#{flag_option}#{path}"
     end
   end
 
@@ -363,23 +375,12 @@ class PackageConfig
       "/opt/X11/lib/pkgconfig",
       "/usr/share/pkgconfig",
     ]
-    case RUBY_PLATFORM
-    when "x86-mingw32"
-      prefix = RbConfig::CONFIG["prefix"]
-      default_paths.concat(Dir.glob("#{prefix}/msys*/mingw32/lib/pkgconfig"))
-      default_paths.concat(Dir.glob("c:/msys*/mingw32/lib/pkgconfig"))
-    when "x64-mingw32"
-      prefix = RbConfig::CONFIG["prefix"]
-      default_paths.concat(Dir.glob("#{prefix}/msys*/mingw64/lib/pkgconfig"))
-      default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
-    end
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_paths.unshift(libdir) if libdir
 
-    pkg_config = self.class.native_pkg_config
-    return default_paths.join(SEPARATOR) unless pkg_config.absolute?
+    pkg_config_prefix = self.class.native_pkg_config_prefix
+    return default_paths.join(SEPARATOR) unless pkg_config_prefix
 
-    pkg_config_prefix = pkg_config.parent.parent
     pkg_config_arch_depended_paths =
       Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
     paths = []

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.3.4"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit