pkg-config 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce019f0f6ac801e5c218c7f9e721d5c428ffbef30e6bfdbae678a80c364a46b
-  data.tar.gz: '082d9fdd2413f734de37a5573a0747a3de8d46af22c1f904452e63765edc7d6b'
+  metadata.gz: 568c790e6c8520f9e99712aa1589824a4338b70a7c4f2de671ba5ad5aa6a96f2
+  data.tar.gz: 4e98a0c87e9449d3864f433ca38f48bfaad836567eee3f9d82d60263e4d2c640
 SHA512:
-  metadata.gz: 6d0f96d09ec77da0d85688684eeeac8dd46095eca8fa2e296080d9f2bc65b46302ab846df62bbb8ae62c9da707488b24151b5c7ae58703c7bbee269479d7b30e
-  data.tar.gz: ceda5ab27054ea938d5136240d5005babe6cdb034ec9bf221a114419cf55a21168266b427e93b44759014458cd8851aa6c7587d74a7d2aac2535779d0d50e4f6
+  metadata.gz: e25b477c8c8ea1612547120a36e974a8aabf898c5dcf4fa5d4eb78b00db2ab805adc69870bcc00e2ba5a9ff10d35d4b913d6180c50fcde466ad75669afe79909
+  data.tar.gz: 6b774c150ea79e3d5c6122373cdf368e439ac54d15a18bae06d188a56062daaaf82f2a2b369ac0a41149d962cd4627cfe9efee771d010e772eee778e95642d00

data/NEWS.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 1.5.9 - 2025-01-08
+
+### Improvements
+
+  * Added support for `.pc` that uses UTF-8.
+
+## 1.5.8 - 2024-11-21
+
+### Improvements
+
+  * Added support for pkgconf.
+
 ## 1.5.7 - 2024-10-24
 
 ### Improvements

data/Rakefile

@@ -35,3 +35,7 @@ desc "Run tests"
 task :test do
   ruby("test/run-test.rb")
 end
+
+release_task = Rake.application["release"]
+# We use Trusted Publishing.
+release_task.prerequisites.delete("release:rubygem_push")

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2023  Sutou Kouhei <kou@cozmixng.org>
+# 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
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.5.7"
+  VERSION = "1.5.9"
 end

data/lib/pkg-config.rb

@@ -72,18 +72,25 @@ class PackageConfig
 
     def guess_native_pkg_config
       exeext = RbConfig::CONFIG["EXEEXT"]
-      default_pkg_config = ENV["PKG_CONFIG"] || "pkg-config#{exeext}"
-      pkg_config = with_config("pkg-config", default_pkg_config)
-      pkg_config = Pathname.new(pkg_config)
-      unless pkg_config.absolute?
-        found_pkg_config = search_executable_from_path(pkg_config)
-        pkg_config = found_pkg_config if found_pkg_config
-      end
-      unless pkg_config.absolute?
-        found_pkg_config = search_pkg_config_by_dln_find_exe(pkg_config)
-        pkg_config = found_pkg_config if found_pkg_config
+      candidates = [
+        with_config("pkg-config"),
+        ENV["PKG_CONFIG"],
+        "pkgconf#{exeext}",
+        "pkg-config#{exeext}",
+      ].compact
+      candidates.each do |pkg_config|
+        pkg_config = Pathname.new(pkg_config)
+        return pkg_config if pkg_config.absolute? and pkg_config.exist?
+        unless pkg_config.absolute?
+          found_pkg_config = search_executable_from_path(pkg_config)
+          return found_pkg_config if found_pkg_config
+        end
+        unless pkg_config.absolute?
+          found_pkg_config = search_pkg_config_by_dln_find_exe(pkg_config)
+          return found_pkg_config if found_pkg_config
+        end
       end
-      pkg_config
+      Pathname.new(candidates[0])
     end
 
     def search_executable_from_path(name)
@@ -507,6 +514,9 @@ class PackageConfig
     @declarations = {}
     File.open(pc_path) do |input|
       input.each_line do |line|
+        if line.dup.force_encoding("UTF-8").valid_encoding?
+          line.force_encoding("UTF-8")
+        end
         line = line.gsub(/#.*/, "").strip
         next if line.empty?
         case line

data/test/test-pkg-config.rb

@@ -2,7 +2,18 @@ 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)
@@ -10,17 +21,17 @@ class PkgConfigTest < Test::Unit::TestCase
   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(system("#{@pkgconf} --exists cairo"))
     assert(@cairo.exist?)
 
-    assert(system("pkg-config --exists cairo-png"))
+    assert(system("#{@pkgconf} --exists cairo-png"))
     assert(@cairo_png.exist?)
   end
 
@@ -177,7 +188,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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - Kouhei Sutou
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files: