pkg-config 1.3.7 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4657b85e9f8971fcb4c962494770ad50f66f0517904e815f62a49b60bbced375
-  data.tar.gz: fcd422845f64d152fa196a94a62b0d3c0136f2ca9dd1ab6f3beacbe692994dfc
+  metadata.gz: ca2690b236cb0845ff444ae843a41f4ad77532dc47eb65c984616398605510ed
+  data.tar.gz: 8434a6be7c364013b1a497406e797bebac4f7cb911764024bdd596e0b4c38f08
 SHA512:
-  metadata.gz: ba1320c3c3f5f51ae3b5b51cf665d58d7c9f2c7b4fb384b329917d381d6dfc0f8908bf6408ddee6617c39cd5d3e96da4d6acf444852cfd805a883e45b7f2c5cd
-  data.tar.gz: d05605e7648547cca52dbe9f0f474d84645b0d6905a7af766984c52818d346b23b5249cf20991f590430483dd65c2698fa9bee3d35430485d53b4be7e6490558
+  metadata.gz: 067f058cf005a0c6835d9648f0dbbc224873ee1fc3b7596988a93866389c487d33059abf6d94ed0d81ac326371db66c5c755362efb2292e74ad5701adcc4cb99
+  data.tar.gz: 78b5ec42683dd4e87f07221f84ae634e535aacab38fba199de6f72e8b197662cb80ac4ac23a950d9795c559f3d8628ab28e975d0a0bd753dd187ad3dfbf10ffd

data/NEWS

@@ -1,5 +1,52 @@
 = NEWS
 
+== 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
+
+  * Added support for cycled depended .pc such as freetype2.pc and
+    harfbuzz.pc on PLD Linux.
+    [Reported by Jakub Bogusz]
+
+=== Thanks
+
+  * Jakub Bogusz
+
+== 1.4.0 - 2019-10-24
+
+=== Improvements
+
+  * Improved Homebrew detection.
+
+== 1.3.9 - 2019-09-28
+
+=== Improvements
+
+  * Added support for absolute path in Requires.
+    [GitHub#18][Reported by Josh Huckabee]
+
+=== Thanks
+
+  * Josh Huckabee
+
+== 1.3.8 - 2019-08-13
+
+=== Improvements
+
+  * Added support for -framework on macOS.
+    [GitHub:ruby-gnome2/ruby-gnome2#1287][Reported by Viko]
+
+=== Thanks
+
+  * Viko
+
 == 1.3.7 - 2019-03-17
 
 === Improvements

data/README.rdoc

@@ -14,14 +14,8 @@ A pkg-config implementation by Ruby.
 
 == Install
 
-=== Package
-
   # gem install pkg-config
 
-=== No package
-
-  # ruby setup.rb
-
 == Documents
 
 * TODO
@@ -29,11 +23,11 @@ A pkg-config implementation by Ruby.
 == Source
 
 There is the pkg-config repository at GitHub:
-http://github.com/rcairo/pkg-config
+http://github.com/ruby-gnome/pkg-config
 
 == Copyright
 
-Copyright 2008-2011 Kouhei Sutou <kou@clear-code.com>
+Copyright 2008-2019 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

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2008-2020  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,15 +15,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 begin
-  require "pkg-config/version"
+  require_relative "pkg-config/version"
 rescue LoadError
 end
 
+require "English"
+require "pathname"
 require "rbconfig"
-
-require 'shellwords'
-require 'English'
-require 'pathname'
+require "shellwords"
 
 class PackageConfig
   SEPARATOR = File::PATH_SEPARATOR
@@ -122,6 +121,7 @@ class PackageConfig
     def compute_native_pkg_config_prefix
       pkg_config = native_pkg_config
       return nil unless pkg_config.absolute?
+      return nil unless pkg_config.exist?
 
       pkg_config_prefix = pkg_config.parent.parent
       if File::ALT_SEPARATOR
@@ -134,10 +134,19 @@ class PackageConfig
     end
   end
 
+  attr_reader :name
   attr_reader :paths
   attr_accessor :msvc_syntax
   def initialize(name, options={})
-    @name = name
+    if Pathname(name).absolute?
+      @pc_path = name
+      @path_position = 0
+      @name = File.basename(@pc_path, ".*")
+    else
+      @pc_path = nil
+      @path_position = nil
+      @name = name
+    end
     @options = options
     path = @options[:path] || ENV["PKG_CONFIG_PATH"]
     @paths = [path, guess_default_path].compact.join(SEPARATOR).split(SEPARATOR)
@@ -220,29 +229,63 @@ class PackageConfig
   end
 
   def pc_path
-    @paths.each do |path|
-      _pc_path = File.join(path, "#{@name}.pc")
-      return _pc_path if File.exist?(_pc_path)
+    if @pc_path
+      return @pc_path if File.exist?(@pc_path)
+    else
+      @paths.each_with_index do |path, i|
+        _pc_path = File.join(path, "#{@name}.pc")
+        if File.exist?(_pc_path)
+          @path_position = i + 1
+          return _pc_path
+        end
+      end
     end
     nil
   end
 
+  protected
+  def path_position
+    @path_position
+  end
+
+  def collect_requires(processed_packages={}, &block)
+    packages = []
+    targets = yield(self)
+    targets.each do |name|
+      next if processed_packages.key?(name)
+      package = self.class.new(name, @options)
+      processed_packages[name] = package
+      packages << package
+      packages.concat(package.collect_requires(processed_packages, &block))
+    end
+    packages_without_self = packages.reject do |package|
+      package.name == @name
+    end
+    packages_without_self.uniq do |package|
+      package.name
+    end
+  end
+
   private
-  def collect_cflags
-    cflags_set = [declaration("Cflags")]
-    cflags_set += private_required_packages.collect do |package|
-      self.class.new(package, @options).cflags
+  def sort_packages(packages)
+    packages.sort_by.with_index do |package, i|
+      [package.path_position, i]
     end
-    cflags_set += required_packages.collect do |package|
-      self.class.new(package, @options).cflags
+  end
+
+  def collect_cflags
+    target_packages = sort_packages([self, *all_required_packages])
+    cflags_set = []
+    target_packages.each do |package|
+      cflags_set << package.declaration("Cflags")
     end
     all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
     path_flags, other_flags = all_cflags.partition {|flag| /\A-I/ =~ flag}
     path_flags = normalize_path_flags(path_flags, "-I")
-    path_flags = remove_duplicated_include_paths(path_flags)
     path_flags = path_flags.reject do |flag|
       flag == "-I/usr/include"
     end
+    path_flags = path_flags.uniq
     if @msvc_syntax
       path_flags = path_flags.collect do |flag|
         flag.gsub(/\A-I/, "/I")
@@ -284,21 +327,19 @@ class PackageConfig
     normalized_cflags
   end
 
-  def remove_duplicated_include_paths(path_flags)
-    path_flags.uniq
-  end
-
   def collect_libs
-    all_libs = required_packages.collect do |package|
-      self.class.new(package, @options).libs
+    target_packages = sort_packages(required_packages + [self])
+    libs_set = []
+    target_packages.each do |package|
+      libs_set << package.declaration("Libs")
     end
-    all_libs = [declaration("Libs")] + all_libs
-    all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
-    path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag}
+    all_flags = split_lib_flags(libs_set.join(" "))
+    path_flags, other_flags = all_flags.partition {|flag| /\A-L/ =~ flag}
     path_flags = normalize_path_flags(path_flags, "-L")
     path_flags = path_flags.reject do |flag|
       /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
     end
+    path_flags = path_flags.uniq
     if @msvc_syntax
       path_flags = path_flags.collect do |flag|
         flag.gsub(/\A-L/, "/libpath:")
@@ -314,6 +355,29 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
+  def split_lib_flags(libs_command_line)
+    all_flags = {}
+    flags = []
+    in_option = false
+    libs_command_line.gsub(/-([Ll]) /, "\\1").split.each do |arg|
+      if in_option
+        flags << arg
+        in_option = false
+      else
+        case arg
+        when /-[lL]/
+          next if all_flags.key?(arg)
+          all_flags[arg] = true
+          flags << arg
+          in_option = true
+        else
+          flags << arg
+        end
+      end
+    end
+    flags
+  end
+
   IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
     raise ".pc for #{@name} doesn't exist." unless exist?
@@ -321,7 +385,7 @@ class PackageConfig
     @declarations = {}
     File.open(pc_path) do |input|
       input.each_line do |line|
-        line = line.gsub(/#.*/, '').strip
+        line = line.gsub(/#.*/, "").strip
         next if line.empty?
         case line
         when /^(#{IDENTIFIER_RE})=/
@@ -335,7 +399,7 @@ class PackageConfig
 
   def parse_requires(requires)
     return [] if requires.nil?
-    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, '')
+    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, "")
     requires_without_version.split(/[,\s]+/)
   end
 
@@ -375,6 +439,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
 
@@ -403,14 +472,13 @@ class PackageConfig
           homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
           homebrew_repository_candidates << pkg_config_prefix
         end
-      else
-        brew = self.class.__send__(:search_executable_from_path, "brew")
-        if brew
-          homebrew_repository = `brew --repository`.chomp
-          homebrew_repository_candidates << Pathname(homebrew_repository)
-        end
       end
-      homebrew_repository_candidates.each do |candidate|
+      brew = self.class.__send__(:search_executable_from_path, "brew")
+      if brew
+        homebrew_repository = `brew --repository`.chomp
+        homebrew_repository_candidates << Pathname(homebrew_repository)
+      end
+      homebrew_repository_candidates.uniq.each do |candidate|
         path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
         paths << path.to_s if path.exist?
       end
@@ -420,21 +488,15 @@ class PackageConfig
   end
 
   def required_packages
-    requires.reject do |package|
-      @name == package
-    end.uniq
-  end
-
-  def private_required_packages
-    requires_private.reject do |package|
-      @name == package
-    end.uniq
+    collect_requires do |package|
+      package.requires
+    end
   end
 
   def all_required_packages
-    (requires_private + requires.reverse).reject do |package|
-      @name == package
-    end.uniq
+    collect_requires do |package|
+      package.requires_private + package.requires
+    end
   end
 
   def normalize_paths(paths)
@@ -458,7 +520,7 @@ module PKGConfig
   end
 
   def msvc?
-    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG['CC'])
+    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG["CC"])
   end
 
   def package_config(package)
@@ -533,18 +595,18 @@ module PKGConfig
       dldflags = libs(pkg)
       dldflags = (Shellwords.shellwords(dldflags) -
                   Shellwords.shellwords(libraries))
-      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(' ')
-      $libs   += ' ' + libraries
+      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(" ")
+      $libs   += " " + libraries
       if /mswin/ =~ RUBY_PLATFORM
-        $DLDFLAGS += ' ' + dldflags
+        $DLDFLAGS += " " + dldflags
       else
-        $LDFLAGS += ' ' + dldflags
+        $LDFLAGS += " " + dldflags
       end
-      $CFLAGS += ' ' + cflags_only_other(pkg)
+      $CFLAGS += " " + cflags_only_other(pkg)
       if defined?($CXXFLAGS)
-        $CXXFLAGS += ' ' + cflags_only_other(pkg)
+        $CXXFLAGS += " " + cflags_only_other(pkg)
       end
-      $INCFLAGS += ' ' + cflags_only_I(pkg)
+      $INCFLAGS += " " + cflags_only_I(pkg)
     end
     enough_version
   end

data/lib/pkg-config/version.rb

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

data/test/test_pkg_config.rb

@@ -17,10 +17,10 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_exist?
-    assert(system('pkg-config --exists cairo'))
+    assert(system("pkg-config --exists cairo"))
     assert(@cairo.exist?)
 
-    assert(system('pkg-config --exists cairo-png'))
+    assert(system("pkg-config --exists cairo-png"))
     assert(@cairo_png.exist?)
   end
 
@@ -36,14 +36,65 @@ class PkgConfigTest < Test::Unit::TestCase
     assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
   end
 
+  def split_lib_flags(libs_command_line)
+    @cairo.__send__(:split_lib_flags, libs_command_line)
+  end
+
+  def test_split_libs
+    assert_equal([
+                   "-L/usr/local/Cellar/gtk+3/3.24.10/lib",
+                   "-L/usr/local/Cellar/pango/1.44.3/lib",
+                   "-L/usr/local/Cellar/harfbuzz/2.5.3/lib",
+                   "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib",
+                   "-L/usr/local/Cellar/cairo/1.16.0_2/lib",
+                   "-L/usr/local/Cellar/glib/2.60.6/lib",
+                   "-L/usr/local/opt/gettext/lib",
+                   "-lgdk-3",
+                   "-framework", "Cocoa",
+                   "-framework", "Carbon",
+                   "-framework", "CoreGraphics",
+                   "-lpangocairo-1.0",
+                   "-lpango-1.0",
+                   "-lharfbuzz",
+                   "-lgdk_pixbuf-2.0",
+                   "-lcairo-gobject",
+                   "-lcairo",
+                   "-lgobject-2.0",
+                   "-lglib-2.0",
+                   "-lintl"
+                 ],
+                 split_lib_flags("-L/usr/local/Cellar/gtk+3/3.24.10/lib " +
+                                 "-L/usr/local/Cellar/pango/1.44.3/lib " +
+                                 "-L/usr/local/Cellar/harfbuzz/2.5.3/lib " +
+                                 "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib " +
+                                 "-L/usr/local/Cellar/cairo/1.16.0_2/lib " +
+                                 "-L/usr/local/Cellar/glib/2.60.6/lib " +
+                                 "-L/usr/local/opt/gettext/lib " +
+                                 "-lgdk-3 " +
+                                 "-framework Cocoa " +
+                                 "-framework Carbon " +
+                                 "-framework CoreGraphics " +
+                                 "-lpangocairo-1.0 " +
+                                 "-lpango-1.0 " +
+                                 "-lharfbuzz " +
+                                 "-lgdk_pixbuf-2.0 " +
+                                 "-lcairo-gobject " +
+                                 "-lcairo " +
+                                 "-lgobject-2.0 " +
+                                 "-lglib-2.0 " +
+                                 "-lintl"))
+  end
+
   def test_libs
     assert_pkg_config("cairo", ["--libs"], @cairo.libs)
     assert_pkg_config("cairo-png", ["--libs"], @cairo_png.libs)
+  end
 
+  def test_libs_msvc
     @cairo.msvc_syntax = true
     result = pkg_config("cairo", "--libs")
     msvc_result = result.gsub(/-lcairo\b/, "cairo.lib")
-    msvc_result = msvc_result.gsub(/-L/, '/libpath:')
+    msvc_result = msvc_result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo.libs)
   end
@@ -51,10 +102,12 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_l
     assert_pkg_config("cairo", ["--libs-only-l"], @cairo.libs_only_l)
     assert_pkg_config("cairo-png", ["--libs-only-l"], @cairo_png.libs_only_l)
+  end
 
+  def test_libs_only_l_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-l")
-    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
+    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, "\\1.lib")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo_png.libs_only_l)
   end
@@ -62,10 +115,12 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_L
     assert_pkg_config("cairo", ["--libs-only-L"], @cairo.libs_only_L)
     assert_pkg_config("cairo-png", ["--libs-only-L"], @cairo_png.libs_only_L)
+  end
 
+  def test_libs_only_L_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-L")
-    msvc_result = result.gsub(/-L/, '/libpath:')
+    msvc_result = result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo_png.libs_only_L)
   end
@@ -112,7 +167,7 @@ class PkgConfigTest < Test::Unit::TestCase
   private
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
-    args = args.collect {|arg| arg.dump}.join(' ')
+    args = args.collect {|arg| arg.dump}.join(" ")
     `pkg-config #{args} #{package}`.strip
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -69,7 +69,7 @@ files:
 - lib/pkg-config/version.rb
 - test/run-test.rb
 - test/test_pkg_config.rb
-homepage: https://github.com/ruby-gnome2/pkg-config
+homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
 metadata:
@@ -89,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby