pkg-config 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e1cf5d660f2266bd2b7b33b4bea74f886eaf24018e6381ece093e3175fc9cc
-  data.tar.gz: 5297a48889e115f5f08a508eaf3bd43e409d56ea19354f6d8817b31422cc3106
+  metadata.gz: 1aa00fc6e840f6d61f9d63a7455da3a9a6fd4febfb4d9909508aa5f32fcbd838
+  data.tar.gz: 318ecf2df122cbaa86fc972fbd32017d8afe938cc0b0dc492cf75c6d0706aaa6
 SHA512:
-  metadata.gz: 18f13c71bc84f415e69190fca6eb0518242896c4606fa56f585ced55cad394d2d5d8916fa098a978418736b145959c332056597be5570598e7fb94bd2e891c53
-  data.tar.gz: 2e88e75e57d264b56a756dd720a504f8138ecdced79ecde4358915a394793cfe7b4030bdf6e9c2bb9ad433d6566bad33efd588bd250abe4133a9fcee968114b5
+  metadata.gz: 077e55fa2ddf6791ae05f24012c29bb3cdb126e713d5f07c58e204facc62885a33901cea3fd5985f4e64adfa3acab2e40a893250a0095675fea416c0b302b186
+  data.tar.gz: 5b0fc63366cd7dd3e41185fb35338547b407ad6a0ba0e2018e59e072a5cbc2a83ed22a23ab172e0b5a0506d07e29ce256aee5528a1c7cec01787240554483377

data/NEWS.md

@@ -1,5 +1,30 @@
 # NEWS
 
+## 1.6.4 - 2025-09-03
+
+### Improvements
+
+  * Added support for continuous line.
+    * [ruby-gnome/ruby-gnome#1686](https://github.com/ruby-gnome/ruby-gnome/issues/1686)
+    * Reported by Vincent Garrigues
+
+### Thanks
+
+  * Vincent Garrigues
+
+## 1.6.3 - 2025-08-27
+
+### Improvements
+
+  * Added support for detecting Homebrew's pkgconfig path by `brew
+    --path`.
+    * [ruby-gnome/pkg-config#36](https://github.com/ruby-gnome/pkg-config/issues/36)
+    * Patch by meredith
+
+### Thanks
+
+  * meredith
+
 ## 1.6.2 - 2025-04-27
 
 ### Improvements

data/lib/pkg-config.rb

@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.2"
+  VERSION = "1.6.4"
 
   @@paths = []
   @@override_variables = {}
@@ -343,6 +343,11 @@ class PackageConfig
             homebrew_repository_candidates <<
               Pathname(homebrew_repository.strip)
           end
+          homebrew_prefix = run_command("brew", "--prefix")
+          if homebrew_prefix
+            homebrew_repository_candidates <<
+              Pathname(homebrew_prefix.strip)
+          end
         end
         homebrew_repository_candidates.uniq.each do |candidate|
           mac_pkgconfig_base_path =
@@ -632,13 +637,18 @@ class PackageConfig
     @variables = {}
     @declarations = {}
     File.open(pc_path) do |input|
+      current_line = +""
       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
+        if line.end_with?("\\")
+          current_line += line[0..-2]
+          next
+        end
+        current_line += line
+        case current_line
         when /^(#{IDENTIFIER_RE})\s*=\s*/
           match = Regexp.last_match
           @variables[match[1]] = match.post_match.strip
@@ -646,6 +656,7 @@ class PackageConfig
           match = Regexp.last_match
           @declarations[match[1]] = match.post_match.strip
         end
+        current_line = +""
       end
     end
   end

data/test/test-pkg-config.rb

@@ -1,4 +1,6 @@
 require "mkmf"
+require "tempfile"
+
 require "pkg-config"
 
 class PkgConfigTest < Test::Unit::TestCase
@@ -227,6 +229,56 @@ class PkgConfigTest < Test::Unit::TestCase
     $configure_args = original_configure_args
   end
 
+  sub_test_case("#parse_pc") do
+    def parse_pc(content)
+      Tempfile.create(["pkg-config", ".pc"]) do |file|
+        file.puts(content)
+        file.close
+        package_config = PackageConfig.new(file.path)
+        package_config.__send__(:parse_pc)
+        [
+          package_config.instance_variable_get(:@variables),
+          package_config.instance_variable_get(:@declarations),
+        ]
+      end
+    end
+
+    def test_continuous_line
+      assert_equal([
+                     {
+                       "prefix" => "/usr/local",
+                       "libdir" => "/usr/local/lib",
+                       "includedir" => "/usr/local/include",
+                     },
+                     {
+                       "Name" => "my-package",
+                       "Description" => "This is my package",
+                       "Version" => "1.0.0",
+                       "Requires" => "glib-2.0 >= 2.72 gobject-2.0 >= 2.72",
+                       "Requires.private" => "gio-2.0 >= 2.72 " +
+                                             "                  cairo",
+                       "Libs" => "-L${libdir} -lmy-package",
+                       "Cflags" => "-I${includedir}/my-package",
+                     },
+                   ],
+                   parse_pc(<<-PC))
+prefix=/usr/local
+libdir=/usr/local/lib
+includedir=/usr/local/include
+
+Name: my-package
+Description: This is my package
+Version: 1.0.0
+Requires: glib-2.0 >= 2.72 gobject-2.0 >= 2.72
+Requires.private: gio-2.0 >= 2.72 \
+                  cairo
+
+Libs: -L${libdir} -lmy-package
+Cflags: -I${includedir}/my-package
+      PC
+    end
+  end
+
   sub_test_case("#parse_requires") do
     def parse_requires(requires)
       @glib.__send__(:parse_requires, requires)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Sutou Kouhei
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files: