pkg-config 1.5.9 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568c790e6c8520f9e99712aa1589824a4338b70a7c4f2de671ba5ad5aa6a96f2
-  data.tar.gz: 4e98a0c87e9449d3864f433ca38f48bfaad836567eee3f9d82d60263e4d2c640
+  metadata.gz: ef8beac3c87c96d3308aa5f2f8ef54f7f9036a70641609d523068ee9867c0703
+  data.tar.gz: ef4c71b465bb7c533629b85a300a1e258320ac1f4eea7bb042f8a378fb3a56f5
 SHA512:
-  metadata.gz: e25b477c8c8ea1612547120a36e974a8aabf898c5dcf4fa5d4eb78b00db2ab805adc69870bcc00e2ba5a9ff10d35d4b913d6180c50fcde466ad75669afe79909
-  data.tar.gz: 6b774c150ea79e3d5c6122373cdf368e439ac54d15a18bae06d188a56062daaaf82f2a2b369ac0a41149d962cd4627cfe9efee771d010e772eee778e95642d00
+  metadata.gz: f633d31398dc965c562933ecc42fa04c83451a5c7701fbed586534fbd0ecd740ae44b678c6dab666e2461c55b6601b126eb154d49be4965aacb7e0bcee0e6821
+  data.tar.gz: 7284c972962f75e0b6147ee338ab4ad8c4791e93c74d7857af535293b32bfd74bb2e03d4671951176bf889965df3abb34f0a43c5d9008eb1c7e7f1a90701374d

data/Gemfile

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2025  Sutou Kouhei <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
@@ -18,3 +18,13 @@
 source "https://rubygems.org/"
 
 gemspec
+
+group :development, :test do
+  gem "bundler"
+  gem "rake"
+end
+
+group :test do
+  gem "test-unit"
+end
+

data/NEWS.md

@@ -1,5 +1,25 @@
 # NEWS
 
+## 1.6.1 - 2025-04-17
+
+### Improvements
+
+  * Added support for `--with-pkg-config-path`.
+    * [ruby-gnome/ruby-gnome#1670](https://github.com/ruby-gnome/ruby-gnome/issues/1670)
+    * Reported by Stanisław Pitucha
+
+### Thanks
+
+  * Stanisław Pitucha
+
+## 1.6.0 - 2025-03-02
+
+### Improvements
+
+  * Changed to use only one file: `pkg-config.rb`
+
+  * Removed `English` dependency.
+
 ## 1.5.9 - 2025-01-08
 
 ### Improvements

data/Rakefile

@@ -1,6 +1,6 @@
-# -*- coding: utf-8; mode: ruby -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2010-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2025  Sutou Kouhei <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
@@ -33,7 +33,7 @@ spec = helper.gemspec
 
 desc "Run tests"
 task :test do
-  ruby("test/run-test.rb")
+  ruby("test/run.rb")
 end
 
 release_task = Rake.application["release"]

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2023  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2008-2025  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
@@ -14,16 +14,127 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-begin
-  require_relative "pkg-config/version"
-rescue LoadError
-end
-
-require "English"
 require "pathname"
 require "rbconfig"
 require "shellwords"
 
+module PKGConfig
+  VERSION = "1.6.1"
+
+  @@paths = []
+  @@override_variables = {}
+
+  module_function
+  def add_path(path)
+    @@paths << path
+  end
+
+  def set_override_variable(key, value)
+    @@override_variables[key] = value
+  end
+
+  def msvc?
+    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG["CC"])
+  end
+
+  def package_config(package)
+    PackageConfig.new(package,
+                      :msvc_syntax => msvc?,
+                      :override_variables => @@override_variables,
+                      :paths => @@paths)
+  end
+
+  def exist?(pkg)
+    package_config(pkg).exist?
+  end
+
+  def libs(pkg)
+    package_config(pkg).libs
+  end
+
+  def libs_only_l(pkg)
+    package_config(pkg).libs_only_l
+  end
+
+  def libs_only_L(pkg)
+    package_config(pkg).libs_only_L
+  end
+
+  def cflags(pkg)
+    package_config(pkg).cflags
+  end
+
+  def cflags_only_I(pkg)
+    package_config(pkg).cflags_only_I
+  end
+
+  def cflags_only_other(pkg)
+    package_config(pkg).cflags_only_other
+  end
+
+  def modversion(pkg)
+    package_config(pkg).version
+  end
+
+  def description(pkg)
+    package_config(pkg).description
+  end
+
+  def variable(pkg, name)
+    package_config(pkg).variable(name)
+  end
+
+  def check_version?(pkg, major=0, minor=0, micro=0)
+    return false unless exist?(pkg)
+    ver = modversion(pkg).split(".").collect {|item| item.to_i}
+    (0..2).each {|i| ver[i] = 0 unless ver[i]}
+
+    (ver[0] > major ||
+     (ver[0] == major && ver[1] > minor) ||
+     (ver[0] == major && ver[1] == minor &&
+      ver[2] >= micro))
+  end
+
+  def have_package(pkg, major=nil, minor=0, micro=0)
+    message = "#{pkg}"
+    unless major.nil?
+      message << " version (>= #{major}.#{minor}.#{micro})"
+    end
+    major ||= 0
+    result = checking_for(checking_message(message), "%s") do
+      if check_version?(pkg, major, minor, micro)
+        "yes (#{modversion(pkg)})"
+      else
+        if exist?(pkg)
+          "no (#{modversion(pkg)})"
+        else
+          "no (nonexistent)"
+        end
+      end
+    end
+    enough_version = result.start_with?("yes")
+    if enough_version
+      libraries = libs_only_l(pkg)
+      dldflags = libs(pkg)
+      dldflags = (Shellwords.shellwords(dldflags) -
+                  Shellwords.shellwords(libraries))
+      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(" ")
+      $libs   += " " + libraries
+      if /mswin/ =~ RUBY_PLATFORM
+        $DLDFLAGS += " " + dldflags
+      else
+        $LDFLAGS += " " + dldflags
+      end
+      $CFLAGS += " " + cflags_only_other(pkg)
+      if defined?($CXXFLAGS)
+        $CXXFLAGS += " " + cflags_only_other(pkg)
+      end
+      $INCFLAGS += " " + cflags_only_I(pkg)
+    end
+    enough_version
+  end
+end
+
 class PackageConfig
   class Error < StandardError
   end
@@ -243,7 +354,10 @@ class PackageConfig
         end
       end
       paths.concat(default_paths)
-      paths.join(SEPARATOR)
+      [
+        with_config("pkg-config-path") || ENV["PKG_CONFIG_PATH"],
+        *paths,
+      ].compact.join(SEPARATOR)
     end
 
     def run_command(*command_line)
@@ -277,8 +391,10 @@ class PackageConfig
       @name = name
     end
     @options = options
-    path = @options[:path] || ENV["PKG_CONFIG_PATH"]
-    @paths = [path, self.class.default_path].compact.join(SEPARATOR).split(SEPARATOR)
+    @paths = [
+      @options[:path],
+      self.class.default_path,
+    ].compact.join(SEPARATOR).split(SEPARATOR)
     @paths.unshift(*(@options[:paths] || []))
     @paths = normalize_paths(@paths)
     @msvc_syntax = @options[:msvc_syntax]
@@ -289,6 +405,14 @@ class PackageConfig
     @override_variables = default_override_variables.merge(@override_variables)
   end
 
+  def eql?(other)
+    other.is_a?(self.class) and @name == other.name
+  end
+
+  def hash
+    @name.hash
+  end
+
   def exist?
     not pc_path.nil?
   end
@@ -303,7 +427,7 @@ class PackageConfig
 
   def cflags
     path_flags, other_flags = collect_cflags
-    (other_flags + path_flags).join(" ")
+    (path_flags + other_flags).join(" ")
   end
 
   def cflags_only_I
@@ -315,26 +439,25 @@ class PackageConfig
   end
 
   def libs
-    path_flags, other_flags = collect_libs
-    (path_flags + other_flags).join(" ")
+    collect_libs.join(" ")
   end
 
   def libs_only_l
-    collect_libs[1].find_all do |arg|
+    collect_libs.find_all do |arg|
       if @msvc_syntax
-        /\.lib\z/ =~ arg
+        arg.end_with?(".lib")
       else
-        /\A-l/ =~ arg
+        arg.start_with?("-l")
       end
     end.join(" ")
   end
 
   def libs_only_L
-    collect_libs[0].find_all do |arg|
+    collect_libs.find_all do |arg|
       if @msvc_syntax
-        /\A\/libpath:/ =~ arg
+        arg.start_with?("/libpath:")
       else
-        /\A-L/ =~ arg
+        arg.start_with?("-L")
       end
     end.join(" ")
   end
@@ -377,40 +500,32 @@ class PackageConfig
     @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
+  def collect_requires(&block)
+    dependencies = {}
+    pending_packages = yield(self).collect {|name| self.class.new(name, @options)}
+    until pending_packages.empty?
+      package = pending_packages.shift
+      next if dependencies.key?(package)
+      dependencies[package] = true
+      targets = yield(package)
+      targets.each do |name|
+        require_package = self.class.new(name, @options)
+        pending_packages.push(require_package)
+      end
     end
+    dependencies.keys
   end
 
   private
-  def sort_packages(packages)
-    packages.sort_by.with_index do |package, i|
-      [package.path_position, i]
-    end
-  end
-
   def collect_cflags
-    target_packages = sort_packages([self, *all_required_packages])
+    target_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 = path_flags.collect {|flag| normalize_path_flag(flag, "-I")}
     path_flags = path_flags.reject do |flag|
       flag == "-I/usr/include"
     end
@@ -423,20 +538,18 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
-  def normalize_path_flags(path_flags, flag_option)
-    return path_flags unless /-mingw(?:32|-ucrt)\z/ === RUBY_PLATFORM
+  def normalize_path_flag(path_flag, flag_option)
+    return path_flag unless /-mingw(?:32|-ucrt)\z/ === RUBY_PLATFORM
 
     pkg_config_prefix = self.class.native_pkg_config_prefix
-    return path_flags unless pkg_config_prefix
+    return path_flag unless pkg_config_prefix
 
     mingw_dir = pkg_config_prefix.basename.to_s
-    path_flags.collect do |path_flag|
-      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}"
+    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
 
   def normalize_cflags(cflags)
@@ -457,31 +570,32 @@ class PackageConfig
   end
 
   def collect_libs
-    target_packages = sort_packages(required_packages + [self])
+    target_packages = [*required_packages, self]
     libs_set = []
     target_packages.each do |package|
       libs_set << package.declaration("Libs")
     end
-    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|
+    flags = split_lib_flags(libs_set.join(" "))
+    flags = flags.collect do |flag|
+      flag = normalize_path_flag(flag, "-L") if flag.start_with?("-L")
+      flag
+    end
+    flags = flags.reject do |flag|
       /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
     end
-    path_flags = path_flags.uniq
+    flags = flags.uniq
     if @msvc_syntax
-      path_flags = path_flags.collect do |flag|
-        flag.gsub(/\A-L/, "/libpath:")
-      end
-      other_flags = other_flags.collect do |flag|
-        if /\A-l/ =~ flag
-          "#{$POSTMATCH}.lib"
+      flags = flags.collect do |flag|
+        if flag.start_with?("-L")
+          flag.gsub(/\A-L/, "/libpath:")
+        elsif flag.start_with?("-l")
+          "#{flag[2..-1]}.lib"
         else
           flag
         end
       end
     end
-    [path_flags, other_flags]
+    flags
   end
 
   def split_lib_flags(libs_command_line)
@@ -521,9 +635,11 @@ class PackageConfig
         next if line.empty?
         case line
         when /^(#{IDENTIFIER_RE})\s*=\s*/
-          @variables[$1] = $POSTMATCH.strip
+          match = Regexp.last_match
+          @variables[match[1]] = match.post_match.strip
         when /^(#{IDENTIFIER_RE})\s*:\s*/
-          @declarations[$1] = $POSTMATCH.strip
+          match = Regexp.last_match
+          @declarations[match[1]] = match.post_match.strip
         end
       end
     end
@@ -569,118 +685,3 @@ class PackageConfig
     end
   end
 end
-
-module PKGConfig
-  @@paths = []
-  @@override_variables = {}
-
-  module_function
-  def add_path(path)
-    @@paths << path
-  end
-
-  def set_override_variable(key, value)
-    @@override_variables[key] = value
-  end
-
-  def msvc?
-    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG["CC"])
-  end
-
-  def package_config(package)
-    PackageConfig.new(package,
-                      :msvc_syntax => msvc?,
-                      :override_variables => @@override_variables,
-                      :paths => @@paths)
-  end
-
-  def exist?(pkg)
-    package_config(pkg).exist?
-  end
-
-  def libs(pkg)
-    package_config(pkg).libs
-  end
-
-  def libs_only_l(pkg)
-    package_config(pkg).libs_only_l
-  end
-
-  def libs_only_L(pkg)
-    package_config(pkg).libs_only_L
-  end
-
-  def cflags(pkg)
-    package_config(pkg).cflags
-  end
-
-  def cflags_only_I(pkg)
-    package_config(pkg).cflags_only_I
-  end
-
-  def cflags_only_other(pkg)
-    package_config(pkg).cflags_only_other
-  end
-
-  def modversion(pkg)
-    package_config(pkg).version
-  end
-
-  def description(pkg)
-    package_config(pkg).description
-  end
-
-  def variable(pkg, name)
-    package_config(pkg).variable(name)
-  end
-
-  def check_version?(pkg, major=0, minor=0, micro=0)
-    return false unless exist?(pkg)
-    ver = modversion(pkg).split(".").collect {|item| item.to_i}
-    (0..2).each {|i| ver[i] = 0 unless ver[i]}
-
-    (ver[0] > major ||
-     (ver[0] == major && ver[1] > minor) ||
-     (ver[0] == major && ver[1] == minor &&
-      ver[2] >= micro))
-  end
-
-  def have_package(pkg, major=nil, minor=0, micro=0)
-    message = "#{pkg}"
-    unless major.nil?
-      message << " version (>= #{major}.#{minor}.#{micro})"
-    end
-    major ||= 0
-    result = checking_for(checking_message(message), "%s") do
-      if check_version?(pkg, major, minor, micro)
-        "yes (#{modversion(pkg)})"
-      else
-        if exist?(pkg)
-          "no (#{modversion(pkg)})"
-        else
-          "no (nonexistent)"
-        end
-      end
-    end
-    enough_version = result.start_with?("yes")
-    if enough_version
-      libraries = libs_only_l(pkg)
-      dldflags = libs(pkg)
-      dldflags = (Shellwords.shellwords(dldflags) -
-                  Shellwords.shellwords(libraries))
-      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(" ")
-      $libs   += " " + libraries
-      if /mswin/ =~ RUBY_PLATFORM
-        $DLDFLAGS += " " + dldflags
-      else
-        $LDFLAGS += " " + dldflags
-      end
-      $CFLAGS += " " + cflags_only_other(pkg)
-      if defined?($CXXFLAGS)
-        $CXXFLAGS += " " + cflags_only_other(pkg)
-      end
-      $INCFLAGS += " " + cflags_only_I(pkg)
-    end
-    enough_version
-  end
-end

data/test/test-pkg-config.rb

@@ -16,8 +16,7 @@ class PkgConfigTest < Test::Unit::TestCase
     @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)
@@ -28,29 +27,21 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_exist?
-    assert(system("#{@pkgconf} --exists cairo"))
-    assert(@cairo.exist?)
-
-    assert(system("#{@pkgconf} --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
@@ -99,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
@@ -169,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
 
@@ -214,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
 
@@ -241,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,56 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.1
 platform: ruby
 authors:
-- Kouhei Sutou
+- Sutou Kouhei
 bindir: bin
 cert_chain: []
-date: 2025-01-08 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:
@@ -65,8 +23,7 @@ files:
 - 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:
@@ -87,9 +44,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+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 (C) 2012-2024  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.9"
-end