pkg-config 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe82e6b78d94b2bcf0b1805e01061b48b9b0a3d
-  data.tar.gz: 9f984bc5d47073fd92c5c02fa3b0c786a8626dfd
+  metadata.gz: 11b312f0ff5b0ea6b556ddf155f0298fb7ef5467
+  data.tar.gz: e7a171afa76835a1c16ba38977a4d85ae5c45e46
 SHA512:
-  metadata.gz: 5f06130d4efc5532d2c0b909644dbe34e7c2ac0f122a7554403993657d0dcd086a32744b6f4113ec4dbb773c392b6b242b5491b858b6793a752bae83d12f02e8
-  data.tar.gz: 535570aa221d8f46c812e0ad2c6baa19836874fb72ee55875e5ac78db4be274231cbd086cdba1fb0b90b8b2e927f6a4cda51c456c82162f6bd5ac6d9a7696602
+  metadata.gz: dfbdd95f6930ea73e9d58568898ae35baba7b12dd466ab978d2c5543c23a635a0dd3d55e2d082eb8b2eb7075ce4016168f8fe074d8ee4a9a328fc8bf49e7ea89
+  data.tar.gz: dddb03560e40be24ce601389205fd9f6c701c267adecc39c66e5f79391462a6938f573043cb8b9683a9f524b125af3d51d81b57decacecc47a57fcf69fbdbdeb

data/NEWS

@@ -1,5 +1,19 @@
 = NEWS
 
+== 1.2.4 - 2017-08-07
+
+=== Improvements
+
+  * Added `pkg-config` 0.29 or later compatible result support.
+    [GitHub#13][Reported by HIGUCHI Daisuke]
+
+  * test: Updated expected value for the latest cairo.
+    [GitHub#14][Patch by HIGUCHI Daisuke]
+
+=== Thanks
+
+  * HIGUCHI Daisuke
+
 == 1.2.3 - 2017-05-29
 
 === Fixes

data/lib/pkg-config.rb

@@ -208,7 +208,10 @@ class PackageConfig
   private
   def collect_cflags
     cflags_set = [declaration("Cflags")]
-    cflags_set += all_required_packages.collect do |package|
+    cflags_set += required_packages.collect do |package|
+      self.class.new(package, @options).cflags
+    end
+    cflags_set += private_required_packages.collect do |package|
       self.class.new(package, @options).cflags
     end
     all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
@@ -378,6 +381,12 @@ class PackageConfig
     end.uniq
   end
 
+  def private_required_packages
+    requires_private.reject do |package|
+      @name == package
+    end.uniq
+  end
+
   def all_required_packages
     (requires_private + requires.reverse).reject do |package|
       @name == package

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.3"
+  VERSION = "1.2.4"
 end

data/test/test_pkg_config.rb

@@ -9,6 +9,13 @@ class PkgConfigTest < Test::Unit::TestCase
     @cairo_png = PackageConfig.new("cairo-png", options)
   end
 
+  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
+    omit("Require pkg-config #{pkg_config_version} or later")
+  end
+
   def test_exist?
     assert(system('pkg-config --exists cairo'))
     assert(@cairo.exist?)
@@ -19,11 +26,13 @@ class PkgConfigTest < Test::Unit::TestCase
 
   def test_cflags
     assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
+    only_pkg_config_version(0, 29)
     assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
   end
 
   def test_cflags_only_I
     assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
+    only_pkg_config_version(0, 29)
     assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
   end
 
@@ -45,7 +54,7 @@ class PkgConfigTest < Test::Unit::TestCase
 
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-l")
-    msvc_result = result.gsub(/-l(cairo|png[0-9]+)\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

metadata

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