rubygems-requirements-system 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5df5e519aeace78d1dd3458027a2ac8f035b01b603a1e802c24d95397b59a09
-  data.tar.gz: 4abb564599ef2b88a7a4de12650abfd440f7151b314f8613de9159fc64d8d297
+  metadata.gz: b9ae4c0c03cef9d3553020e858e0f3a124e4bff919111568563795765568bb1c
+  data.tar.gz: 30c19cb58a56b30c2ce09c4020678f526093bcb7636b641476a1b4b72a4af870
 SHA512:
-  metadata.gz: fa69897a8464203ea3171e68d34ab2bda417262941e53d7fdf4110f04196041fb92f6bcb313f944e9b6adc0af72807255da8576cf59e4c53d74d49654fc4b600
-  data.tar.gz: 9e589167215ee1d51f773fa4130e11b59624d76a643b4e87a3f380524004cd1092f9b4d0c2dabe390e76bb57d1f97146f16efb3ce84b4e90e7faa77eea31d9a5
+  metadata.gz: 8d227279c190f067f1cdf6aea23e708a822eb38a8b16c9f9627aea16c13052070d05b9719cf99800415dd5b01e97e2474333f01fd660f937ab25385214347f8f
+  data.tar.gz: 30ddb08431f3b6c995d45a24e31a157b9340631c61e220bd9ecc2090145d89d8824dc8d9a5671bf33ef224480b380bd8d098847e8014f513ba5697c63dcfe998

data/doc/text/news.md

@@ -1,5 +1,26 @@
 # News
 
+## 0.1.5 - 2025-12-01
+
+### Improvements
+
+  * Updated bundled `pkg-config` gem to 1.6.5.
+
+## 0.1.4 - 2025-11-26
+
+### Improvements
+
+  * Added support for Ruby installed by MSYS2. Note that this is not
+    for Ruby installed by RubyInstaller. Ruby installed by
+    RubyInstaller must use `msys2_mingw_dependencies` gemspec metadata
+    instead of this.
+    * GH-16
+    * Patch by takuya kodama
+
+### Thanks
+
+  * takuya kodama
+
 ## 0.1.3 - 2025-09-03
 
 ### Improvements

data/lib/rubygems-requirements-system/pkg-config.rb

@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.4"
+  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 = []

data/lib/rubygems-requirements-system/platform/msys2.rb

@@ -0,0 +1,54 @@
+# Copyright (C) 2025  Ruby-GNOME Project Team
+#
+# This program 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+
+require_relative "base"
+
+module RubyGemsRequirementsSystem
+  module Platform
+    class MSYS2 < Base
+      Platform.register(self)
+
+      class << self
+        def current_platform?
+          return false if Object.const_defined?(:RubyInstaller)
+          return false if package_prefix.nil?
+          ExecutableFinder.exist?("pacman")
+        end
+
+        def package_prefix
+          ENV["MINGW_PACKAGE_PREFIX"]
+        end
+      end
+
+      def target?(platform)
+        platform == "msys2"
+      end
+
+      private
+      def install_command_line(package)
+        [
+          "pacman",
+          "-S",
+          "--noconfirm",
+          "#{self.class.package_prefix}-#{package}"
+        ]
+      end
+
+      def need_super_user_priviledge?
+        false
+      end
+    end
+  end
+end

data/lib/rubygems-requirements-system/platform.rb

@@ -62,6 +62,10 @@ require_relative "platform/suse"
 require_relative "platform/alpine-linux"
 
 
+# Windows
+require_relative "platform/msys2"
+
+
 # Platform independent
 require_relative "platform/homebrew"
 require_relative "platform/conda"

data/lib/rubygems-requirements-system/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module RubyGemsRequirementsSystem
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-requirements-system
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Sutou Kouhei
@@ -48,6 +48,7 @@ files:
 - lib/rubygems-requirements-system/platform/gentoo-linux.rb
 - lib/rubygems-requirements-system/platform/homebrew.rb
 - lib/rubygems-requirements-system/platform/macports.rb
+- lib/rubygems-requirements-system/platform/msys2.rb
 - lib/rubygems-requirements-system/platform/pld-linux.rb
 - lib/rubygems-requirements-system/platform/red-hat-enterprise-linux.rb
 - lib/rubygems-requirements-system/platform/suse.rb