pkg-config 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a3d87cdf57d9d78a5458eb6743ae3dd175e0760284c0ed6b885149ef3ebd53
-  data.tar.gz: d6c27bc63a6e3191ee88b53387428cfedbced08104f8d5c71a68f6deb75a82a8
+  metadata.gz: 0a4a54b361004652d84f50b2d4f2cfaaf447ffd2fc97c44490ed7c7751763721
+  data.tar.gz: 3ae709328a845092794bca9d2753e5d7867170b5832d7f85023c0692ec1e8178
 SHA512:
-  metadata.gz: 488102c7ff0f8d6bfb6ba89d28a3db6bc98a1ecf4bcfa78df1d04020b1fede9e4517549830214fcd941832fe2db878a643951b7943b4d2edfee9d59a0777fd89
-  data.tar.gz: b3d212d31f385b43dbf5e24d2632fc99b0523d1b1f1defc458daceae11bb4021ecfc9a3fc34e7609c3fd94638c970dc9f34e6c6f4abee14c2f1e33a6f9dc4da3
+  metadata.gz: 748e225bef3d590013e8bf3efcc2c0422d6d2a802a65f104f15feebd01bcf526d29b0909b922d444b261c5354a2b6101d549871867f7e5bb95c0bd01da12ba48
+  data.tar.gz: 0203aee2b542ca94a0dbf18e7515ff73339b3910931eeb209d19e791f30a63d8a70bf36c500271f68b73a2045abfc60fe6c0a5727e265df01843c893c95e7936

data/NEWS.md

@@ -1,5 +1,29 @@
 # NEWS
 
+## 1.6.5 - 2025-12-01
+
+### Improvements
+
+  * Improved pkgconf compatibility: Removed duplicated `-D`/`-W` flags.
+    * [ruby-gnome/pkg-config#43](https://github.com/ruby-gnome/pkg-config/issues/43)
+    * Patch by takuya kodama
+
+### Thanks
+
+  * takuya kodama
+
+## 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

data/lib/pkg-config.rb

@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.3"
+  VERSION = "1.6.5"
 
   @@paths = []
   @@override_variables = {}
@@ -545,6 +545,7 @@ class PackageConfig
         flag.gsub(/\A-I/, "/I")
       end
     end
+    other_flags = merge_back_cflags(other_flags)
     [path_flags, other_flags]
   end
 
@@ -579,6 +580,32 @@ class PackageConfig
     normalized_cflags
   end
 
+  # Implementing behavior compatible with pkgconf's pkgconf_fragment_copy().
+  # This is not a complete reproduction yet, but the goal is to stay compatible.
+  # https://github.com/pkgconf/pkgconf/blob/pkgconf-2.5.1/libpkgconf/fragment.c#L381-L416
+  def merge_back_cflags(cflags)
+    merge_backed_cflags = []
+    cflags.each do |cflag|
+      if mergeable_flag?(cflag)
+        # NOTE: This may be slow because this checks merge_back_cflags N times
+        # (where N is the number of mergeable flags).
+        merge_backed_cflags.delete(cflag)
+      end
+      merge_backed_cflags << cflag
+    end
+    merge_backed_cflags
+  end
+
+  def mergeable_flag?(flag)
+    return false unless flag.start_with?("-")
+    return true if flag.start_with?("-D")
+    if flag.start_with?("-W")
+      return false if flag.start_with?("-Wa,", "-Wl,", "-Wp,")
+      return true
+    end
+    false
+  end
+
   def collect_libs
     target_packages = [*required_packages, self]
     libs_set = []
@@ -637,13 +664,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
@@ -651,6 +683,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)
@@ -262,4 +314,34 @@ class PkgConfigTest < Test::Unit::TestCase
                    parse_requires("fribidi = 1.0"))
     end
   end
+
+  sub_test_case("#merge_back_cflags") do
+    def merge_back_cflags(cflags)
+      @glib.__send__(:merge_back_cflags, cflags)
+    end
+
+    def test_d
+      assert_equal(["-DFOO"],
+                   merge_back_cflags(["-DFOO", "-DFOO"]))
+    end
+
+    def test_w
+      assert_equal(["-Wno-unknown-warning-option"],
+                   merge_back_cflags(["-Wno-unknown-warning-option",
+                                      "-Wno-unknown-warning-option"]))
+    end
+
+    def test_wa_wl_wp
+      assert_equal(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                    "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"],
+                   merge_back_cflags(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                                      "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"]))
+    end
+
+    def test_mixed
+      assert_equal(["-Wl,--as-needed", "-DFOO", "-Wall", "-Wl,--as-needed"],
+                   merge_back_cflags(["-DFOO", "-Wall", "-Wl,--as-needed",
+                                      "-DFOO", "-Wall", "-Wl,--as-needed"]))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Sutou Kouhei
@@ -29,7 +29,7 @@ homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
 metadata:
-  msys2_mingw_dependencies: pkg-config
+  msys2_mingw_dependencies: pkgconf
 rdoc_options: []
 require_paths:
 - lib