Run of fresh-releases for ruby-pkg-config

Try this locally package):

debcheckout ruby-pkg-config
cd ruby-pkg-config
DEB_UPDATE_CHANGELOG=auto deb-new-upstream --refresh-patches

Summary

DEB_UPDATE_CHANGELOG=auto deb-new-upstream --refresh-patches

Diff

Branch: main

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..a7c0271
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,45 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    name: "Ruby ${{ matrix.ruby-version }}: ${{ matrix.runs-on }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+        runs-on:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install system dependencies
+        if: |
+          runner.os == 'macOS'
+        run: |
+          brew bundle
+      - name: Install system dependencies
+        if: |
+          runner.os == 'Windows'
+        run: |
+          ridk exec pacman --sync --noconfirm mingw-w64-x86_64-cairo mingw-w64-ucrt-x86_64-cairo
+      - name: Install dependencies
+        run: |
+          bundle install
+      - name: Test
+        run: |
+          bundle exec rake
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b3f38f3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-notifications:
-  webhooks:
-    - https://webhook.commit-email.info/
-
-matrix:
-  include:
-    - name: Ruby 2.4
-      rvm: 2.4
-    - name: Ruby 2.5
-      rvm: 2.5
-    - name: Ruby 2.6
-      rvm: 2.6
-    - name: Ruby 2.7
-      rvm: 2.7
-    - name: macOS
-      os: osx
-      rvm: 2.7
-      before_install:
-        - brew update
-        - brew bundle
diff --git a/NEWS b/NEWS
index 10b5aa9..19c4300 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.4.7 - 2022-01-16
+
+=== Improvements
+
+  * Added support for RubyInstaller2 3.1 or later.
+    [Reported by golirev][GitHub:ruby-gnome/ruby-gnome#1457]
+
+=== Thanks
+
+  * golirev
+
 == 1.4.6 - 2021-04-12
 
 === Improvements
diff --git a/debian/changelog b/debian/changelog
index 9ba57df..b7c1d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-pkg-config (1.4.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 10:13:34 -0000
+
 ruby-pkg-config (1.4.6-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index c29c389..2caf3ca 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -301,7 +301,7 @@ class PackageConfig
   end
 
   def normalize_path_flags(path_flags, flag_option)
-    return path_flags unless /-mingw32\z/ === RUBY_PLATFORM
+    return path_flags unless /-mingw(?:32|-ucrt)\z/ === RUBY_PLATFORM
 
     pkg_config_prefix = self.class.native_pkg_config_prefix
     return path_flags unless pkg_config_prefix
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index 155ea92..0a8c5f2 100644
--- a/lib/pkg-config/version.rb
+++ b/lib/pkg-config/version.rb
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end
diff --git a/test/test-pkg-config.rb b/test/test-pkg-config.rb
index 0a731e1..1445865 100644
--- a/test/test-pkg-config.rb
+++ b/test/test-pkg-config.rb
@@ -25,12 +25,14 @@ class PkgConfigTest < Test::Unit::TestCase
   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)
   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)
@@ -175,7 +177,22 @@ class PkgConfigTest < Test::Unit::TestCase
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
     args = args.collect {|arg| arg.dump}.join(" ")
-    `pkg-config #{args} #{package}`.strip
+    normalize_pkg_config_result(`pkg-config #{args} #{package}`.strip)
+  end
+
+  def normalize_pkg_config_result(result)
+    case RUBY_PLATFORM
+    when /mingw/
+      result = result.gsub(/\/bin\/..\//, "/")
+      if result.include?(" -mms-bitfields ")
+        # Reorder -mms-bitfields (non path flag)
+        result = result.gsub(" -mms-bitfields ", " ")
+        result = "-mms-bitfields #{result}"
+      end
+      result
+    else
+      result
+    end
   end
 
   def assert_pkg_config(package, pkg_config_args, actual)

Branch: pristine-tar

diff --git a/ruby-pkg-config_1.4.7.orig.tar.gz.delta b/ruby-pkg-config_1.4.7.orig.tar.gz.delta
new file mode 100644
index 0000000..e4db69f
Binary files /dev/null and b/ruby-pkg-config_1.4.7.orig.tar.gz.delta differ
diff --git a/ruby-pkg-config_1.4.7.orig.tar.gz.id b/ruby-pkg-config_1.4.7.orig.tar.gz.id
new file mode 100644
index 0000000..1c155f7
--- /dev/null
+++ b/ruby-pkg-config_1.4.7.orig.tar.gz.id
@@ -0,0 +1 @@
+dc1f9695764dc9d8eaa8902892e6f5533407ff1e

Branch: upstream

Tag: upstream/1.4.7
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..a7c0271
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,45 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    name: "Ruby ${{ matrix.ruby-version }}: ${{ matrix.runs-on }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+        runs-on:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install system dependencies
+        if: |
+          runner.os == 'macOS'
+        run: |
+          brew bundle
+      - name: Install system dependencies
+        if: |
+          runner.os == 'Windows'
+        run: |
+          ridk exec pacman --sync --noconfirm mingw-w64-x86_64-cairo mingw-w64-ucrt-x86_64-cairo
+      - name: Install dependencies
+        run: |
+          bundle install
+      - name: Test
+        run: |
+          bundle exec rake
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b3f38f3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-notifications:
-  webhooks:
-    - https://webhook.commit-email.info/
-
-matrix:
-  include:
-    - name: Ruby 2.4
-      rvm: 2.4
-    - name: Ruby 2.5
-      rvm: 2.5
-    - name: Ruby 2.6
-      rvm: 2.6
-    - name: Ruby 2.7
-      rvm: 2.7
-    - name: macOS
-      os: osx
-      rvm: 2.7
-      before_install:
-        - brew update
-        - brew bundle
diff --git a/NEWS b/NEWS
index 10b5aa9..19c4300 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 = NEWS
 
+== 1.4.7 - 2022-01-16
+
+=== Improvements
+
+  * Added support for RubyInstaller2 3.1 or later.
+    [Reported by golirev][GitHub:ruby-gnome/ruby-gnome#1457]
+
+=== Thanks
+
+  * golirev
+
 == 1.4.6 - 2021-04-12
 
 === Improvements
diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index c29c389..2caf3ca 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -301,7 +301,7 @@ class PackageConfig
   end
 
   def normalize_path_flags(path_flags, flag_option)
-    return path_flags unless /-mingw32\z/ === RUBY_PLATFORM
+    return path_flags unless /-mingw(?:32|-ucrt)\z/ === RUBY_PLATFORM
 
     pkg_config_prefix = self.class.native_pkg_config_prefix
     return path_flags unless pkg_config_prefix
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index 155ea92..0a8c5f2 100644
--- a/lib/pkg-config/version.rb
+++ b/lib/pkg-config/version.rb
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end
diff --git a/test/test-pkg-config.rb b/test/test-pkg-config.rb
index 0a731e1..1445865 100644
--- a/test/test-pkg-config.rb
+++ b/test/test-pkg-config.rb
@@ -25,12 +25,14 @@ class PkgConfigTest < Test::Unit::TestCase
   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)
   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)
@@ -175,7 +177,22 @@ class PkgConfigTest < Test::Unit::TestCase
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
     args = args.collect {|arg| arg.dump}.join(" ")
-    `pkg-config #{args} #{package}`.strip
+    normalize_pkg_config_result(`pkg-config #{args} #{package}`.strip)
+  end
+
+  def normalize_pkg_config_result(result)
+    case RUBY_PLATFORM
+    when /mingw/
+      result = result.gsub(/\/bin\/..\//, "/")
+      if result.include?(" -mms-bitfields ")
+        # Reorder -mms-bitfields (non path flag)
+        result = result.gsub(" -mms-bitfields ", " ")
+        result = "-mms-bitfields #{result}"
+      end
+      result
+    else
+      result
+    end
   end
 
   def assert_pkg_config(package, pkg_config_args, actual)

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases ruby-pkg-config

Lintian Result

Full worker log Full build log