refresh patches

Author: sorah

debian/patches/Fallback-PKG_CONFIG-to-the-configured-pkg-config-always.patch

@@ -7,15 +7,15 @@ Subject: Fallback PKG_CONFIG to the configured pkg-config always
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 8241494..3014c2a 100644
+index 3725a0c..78435f3 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -1867,7 +1867,7 @@ SRC
+@@ -1823,7 +1823,7 @@ SRC
      if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
-       # if and only if package specific config command is given
+       # iff package specific config command is given
      elsif ($PKGCONFIG ||=
 -           (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
 +           (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) &&
             find_executable0(pkgconfig) && pkgconfig) and
-         xsystem([*envs, $PKGCONFIG, "--exists", pkg])
+         xsystem("#{$PKGCONFIG} --exists #{pkg}")
        # default to pkg-config command

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

@@ -9,7 +9,7 @@ Bug: #954293
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 49e0c79..5fb8282 100644
+index 158924a..1368961 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [

debian/patches/Honor-the-tool-prefix-against-pkg-config.patch

@@ -7,10 +7,10 @@ Subject: Honor the tool prefix against pkg-config
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 49897ad..e7c00ce 100644
+index 1368961..8d90b4c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -488,11 +488,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
+@@ -470,11 +470,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
  AC_CHECK_PROGS(DOT, dot)
  AC_CHECK_PROGS(DOXYGEN, doxygen)
 

debian/patches/lib-mkmf.rb-sort-list-of-object-files-in-generated-Makefi.patch

@@ -14,10 +14,10 @@ Signed-off-by: Reiner Herrmann <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 9468a2c..516fa1e 100644
+index 66f2960..3725a0c 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -2315,7 +2315,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
+@@ -2320,7 +2320,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
  LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
  ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
  SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}