pkg-config 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47d4bf798e1d6eb5ad3c16fad3ab29dead0f05b2d41e39d98ecb3b3642ac6ea
-  data.tar.gz: 3ca7a21d13ffba40247e65134cbac57a07690c69312898af8e29fd5394616293
+  metadata.gz: 026c6c256fc6bb3656cfcde885adcc911f26987d1ac26d48d87f724ebc4045a2
+  data.tar.gz: 95cbb634f8f37a2dd5d6ef3b644a45f810c8ef99d834e9281402e50ce5233dde
 SHA512:
-  metadata.gz: 21d73b0dd4803571c903e01410c1d199297af2d3c17a5254197511285f1f1807875c70d819e06cc1b28a6158c715111be694aae997799432af1eb4c41e657aaf
-  data.tar.gz: 31a9e5bae18a521b65c6ba3b82cffb3197cd076e0318682b44b2f71c65dbd80fe40369ba09125ed3a4b2ad2ce1b9c39a11237922e798583fe94ed060bb329e06
+  metadata.gz: 64c6915207090a91ca6d24e4de7c34fb368d3c32c901e8b56c06c2fc0e275742658e05b29ee7477124cf4038eb6f8269abbf7712f1a538dfc9155d4976d7b048
+  data.tar.gz: 5ff7d590b763b9b5c114887ec5ee32f311bdfad06da4c8e696bb1f129906b2f511a018d3508ce71dd69b1ff9bbc217fc596d7a2d0a9efaf1a0814d4ead86bb32

data/NEWS

@@ -1,5 +1,16 @@
 = NEWS
 
+== 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

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

@@ -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,61 @@ 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(&block)
+    packages = []
+    targets = yield(self)
+    targets.each do |name|
+      package = self.class.new(name, @options)
+      packages << package
+      packages.concat(package.collect_requires(&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 +325,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_flags = split_lib_flags(all_libs.join(" "))
+    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:")
@@ -443,21 +482,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)

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.8"
+  VERSION = "1.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-27 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: