pkg-config 1.5.6 → 1.6.2

data/test/test-pkg-config.rb

@@ -2,44 +2,46 @@ require "mkmf"
 require "pkg-config"
 
 class PkgConfigTest < Test::Unit::TestCase
+  def find_program(name)
+    exeext = RbConfig::CONFIG["EXEEXT"]
+    ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+      program = File.join(path, name)
+      return name if File.exist?(program)
+      return name if File.exist?("#{program}.#{exeext}")
+    end
+    nil
+  end
+
   def setup
+    @pkgconf = find_program("pkgconf") || "pkg-config"
     @custom_libdir = "/tmp/local/lib"
     options = {:override_variables => {"libdir" => @custom_libdir}}
-    @cairo = PackageConfig.new("cairo", options)
-    @cairo_png = PackageConfig.new("cairo-png", options)
+    @glib = PackageConfig.new("glib-2.0", options)
   end
 
   def only_pkg_config_version(major, minor)
-    pkg_config_version = `pkg-config --version`.chomp
+    pkg_config_version = `#{@pkgconf} --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")
+    omit("Require #{@pkgconf} #{pkg_config_version} or later")
   end
 
   def test_exist?
-    assert(system("pkg-config --exists cairo"))
-    assert(@cairo.exist?)
-
-    assert(system("pkg-config --exists cairo-png"))
-    assert(@cairo_png.exist?)
+    assert(system("#{@pkgconf} --exists glib-2.0"))
   end
 
   def test_cflags
     omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
-    assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
-    only_pkg_config_version(0, 29)
-    assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
+    assert_pkg_config("glib-2.0", ["--cflags"], @glib.cflags)
   end
 
   def test_cflags_only_I
     omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
-    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)
+    assert_pkg_config("glib-2.0", ["--cflags-only-I"], @glib.cflags_only_I)
   end
 
   def split_lib_flags(libs_command_line)
-    @cairo.__send__(:split_lib_flags, libs_command_line)
+    @glib.__send__(:split_lib_flags, libs_command_line)
   end
 
   def test_split_libs
@@ -88,60 +90,57 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_libs
-    assert_pkg_config("cairo", ["--libs"], @cairo.libs)
-    assert_pkg_config("cairo-png", ["--libs"], @cairo_png.libs)
+    assert_pkg_config("glib-2.0", ["--libs"], @glib.libs)
   end
 
   def test_libs_msvc
-    @cairo.msvc_syntax = true
-    result = pkg_config("cairo", "--libs")
-    msvc_result = result.gsub(/-lcairo\b/, "cairo.lib")
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs")
+    msvc_result = result.gsub(/-l(glib-2\.0|intl)\b/, "\\1.lib")
     msvc_result = msvc_result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
-    assert_equal(msvc_result, @cairo.libs)
+    assert_equal(msvc_result, @glib.libs)
   end
 
   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)
+    assert_pkg_config("glib-2.0", ["--libs-only-l"], @glib.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")
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs-only-l")
+    msvc_result = result.gsub(/-l(glib-2\.0|intl)\b/, "\\1.lib")
     assert_not_equal(msvc_result, result)
-    assert_equal(msvc_result, @cairo_png.libs_only_l)
+    assert_equal(msvc_result, @glib.libs_only_l)
   end
 
   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)
+    assert_pkg_config("glib-2.0", ["--libs-only-L"], @glib.libs_only_L)
   end
 
   def test_libs_only_L_msvc
-    @cairo_png.msvc_syntax = true
-    result = pkg_config("cairo-png", "--libs-only-L")
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs-only-L")
     msvc_result = result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
-    assert_equal(msvc_result, @cairo_png.libs_only_L)
+    assert_equal(msvc_result, @glib.libs_only_L)
   end
 
   def test_requires
-    assert_equal([], @cairo.requires)
+    assert_equal([], @glib.requires)
   end
 
   def test_requires_private
-    requires_private = pkg_config("cairo", "--print-requires-private")
+    requires_private = pkg_config("glib-2.0", "--print-requires-private")
     expected_requires = requires_private.split(/\n/).collect do |require|
       require.split(/\s/, 2)[0]
     end
     assert_equal(expected_requires,
-                 @cairo.requires_private)
+                 @glib.requires_private)
   end
 
   def test_version
-    assert_pkg_config("cairo", ["--modversion"], @cairo.version)
+    assert_pkg_config("glib-2.0", ["--modversion"], @glib.version)
   end
 
   def test_parse_override_variables
@@ -158,11 +157,11 @@ class PkgConfigTest < Test::Unit::TestCase
 
   def test_override_variables
     overridden_prefix = "c:\\\\gtk-dev"
-    original_prefix = @cairo.variable("prefix")
+    original_prefix = @glib.variable("prefix")
     assert_not_equal(overridden_prefix, original_prefix)
     with_override_variables("prefix=#{overridden_prefix}") do
-      cairo = PackageConfig.new("cairo")
-      assert_equal(overridden_prefix, cairo.variable("prefix"))
+      glib = PackageConfig.new("glib-2.0")
+      assert_equal(overridden_prefix, glib.variable("prefix"))
     end
   end
 
@@ -177,7 +176,7 @@ class PkgConfigTest < Test::Unit::TestCase
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
     args = args.collect {|arg| arg.dump}.join(" ")
-    normalize_pkg_config_result(`pkg-config #{args} #{package}`.strip)
+    normalize_pkg_config_result(`#{@pkgconf} #{args} #{package}`.strip)
   end
 
   def normalize_pkg_config_result(result)
@@ -203,8 +202,8 @@ class PkgConfigTest < Test::Unit::TestCase
 
   def assert_override_variables(expected, override_variables)
     with_override_variables(override_variables) do
-      cairo = PackageConfig.new("cairo")
-      assert_equal(expected, cairo.instance_variable_get("@override_variables"))
+      glib = PackageConfig.new("glib-2.0")
+      assert_equal(expected, glib.instance_variable_get("@override_variables"))
     end
   end
 
@@ -230,14 +229,14 @@ class PkgConfigTest < Test::Unit::TestCase
 
   sub_test_case("#parse_requires") do
     def parse_requires(requires)
-      @cairo.__send__(:parse_requires, requires)
+      @glib.__send__(:parse_requires, requires)
     end
 
     def test_broken_version
       assert_equal(["fribidi"],
                    parse_requires("fribidi >= fribidi_required_dep"))
     end
-  
+
     def test_greater_than_or_equals_to
       assert_equal(["fribidi"],
                    parse_requires("fribidi >= 1.0"))

metadata

@@ -1,57 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.2
 platform: ruby
 authors:
-- Kouhei Sutou
-autorequire:
+- Sutou Kouhei
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: pkg-config can be used in your extconf.rb to properly detect need libraries
   for compiling Ruby native extensions
 email:
@@ -62,19 +19,17 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LGPL-2.1
-- NEWS
+- NEWS.md
 - README.rdoc
 - Rakefile
 - lib/pkg-config.rb
-- lib/pkg-config/version.rb
-- test/run-test.rb
+- test/run.rb
 - test/test-pkg-config.rb
 homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
 metadata:
   msys2_mingw_dependencies: pkg-config
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,10 +44,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files:
-- test/run-test.rb
+- test/run.rb
 - test/test-pkg-config.rb

data/lib/pkg-config/version.rb

@@ -1,19 +0,0 @@
-# Copyright 2012-2023  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
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-module PKGConfig
-  VERSION = "1.5.6"
-end