Merge pull request #22422 from raedrizqie/ruby

ruby: update to 3.3.6
msys2 · Nov 21, 2024 · 1964876 · 1964876
2 parents 608fff9 + 84abecc
commit 1964876
Show file tree

Hide file tree

Showing 15 changed files with 229 additions and 458 deletions.
diff --git a/mingw-w64-asciidoctor/PKGBUILD b/mingw-w64-asciidoctor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=asciidoctor
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of AsciiDoc in Ruby (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -20,30 +20,29 @@ check() {
   local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem check --verbose \
-    "${_realname}-${pkgver}.gem"
+  gem check --verbose "${_realname}-${pkgver}.gem"
 }
 
 package() {
-  local _gemdir="$(${MINGW_PREFIX}/bin/ruby -e 'puts Gem.default_dir')"
+  local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install --verbose \
+  gem install --ignore-dependencies --no-user-install --verbose \
     -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
     "${_realname}-${pkgver}.gem"
 
   local _ruby_exe=$(cygpath -m ${MINGW_PREFIX}/bin/ruby.exe)
 
-  #for this conversion, we want the fully qualified ruby .exe path
-  #so that we can be sure that we are calling the correct one.
+  # For this conversion, we want the fully qualified ruby.exe path
+  # so that we can be sure that we are calling the correct one.
   sed -e "s|${_ruby_exe}|${MINGW_PREFIX}/bin/ruby|g" \
       -i ${pkgdir}${MINGW_PREFIX}/bin/asciidoctor
 
-  #for Win32 .bat files, we want to drop the path references as the path
-  #refs are not needed since it's involved from the same dir.  If we did
-  #need fully-qualified pathes, they would have to be fully-qualified and
+  # For Win32 .bat files, we want to drop the path references as the path
+  # refs are not needed since it's invoked from the same dir. If we did
+  # need fully-qualified paths, they would have to be fully-qualified and
   # in DOS format.
-  local _inst_dir=$(cygpath -m ${pkgdir}/${MINGW_PREFIX}/bin/)
+  local _inst_dir=$(cygpath -m ${pkgdir}${MINGW_PREFIX}/bin/)
   local _w_ruby_exe=$(cygpath -w ${MINGW_PREFIX}/bin/ruby.exe | sed 's/\\/\\\\/g')
   sed  -e "s|${_w_ruby_exe}|ruby.exe|g" \
        -e "s|${_inst_dir}||g" \

diff --git a/mingw-w64-ngraph-gtk/PKGBUILD b/mingw-w64-ngraph-gtk/PKGBUILD
@@ -4,8 +4,8 @@ _realname=ngraph-gtk
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=6.09.09
-pkgrel=1
-pkgdesc="create scientific 2-dimensional graphs (mingw-w64)"
+pkgrel=2
+pkgdesc="Create scientific 2-dimensional graphs (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://htrb.github.io/ngraph-gtk/"

diff --git a/mingw-w64-ruby-dbus/PKGBUILD b/mingw-w64-ruby-dbus/PKGBUILD
@@ -1,28 +1,29 @@
 # Maintainer: Andrew Sun <[email protected]>
 
-_gemname=ruby-dbus
-_realname=${_gemname}
+_realname=ruby-dbus
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.17.0
+pkgver=0.23.1
 pkgrel=1
 pkgdesc="Ruby module for interaction with D-Bus (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/mvidner/ruby-dbus"
 license=('spdx:LGPL-2.1-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
-source=(https://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-sha256sums=('7c5380a0797c6050160fd5940aba11741ac4d7050fd3ffd38be386a35643502e')
+source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
+noextract=(${_realname}-${pkgver}.gem)
+sha256sums=('f582da0a66e7a907dade9473c152194197e322e50771275853ac87b868f1c941')
 
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install -N -i "${pkgdir}${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" ${_gemname}-${pkgver}.gem
+  gem install --ignore-dependencies --no-user-install --verbose \
+    -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
+    "${_realname}-${pkgver}.gem"
 
-  rm "${pkgdir}${_gemdir}/cache/${_gemname}-${pkgver}.gem"
+  rm "${pkgdir}/${_gemdir}/cache/${_realname}-${pkgver}.gem"
 
-  install -D -m644 "${pkgdir}${_gemdir}/gems/${_gemname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${pkgdir}/${_gemdir}/gems/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-ruby-mustache/PKGBUILD b/mingw-w64-ruby-mustache/PKGBUILD
@@ -4,43 +4,43 @@ _realname=mustache
 pkgbase="mingw-w64-ruby-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-ruby-${_realname}"
 pkgver=1.1.1
-pkgrel=4
-pkgdesc="Mustache is a framework-agnostic way to render logic-free views. (mingw-w64)"
+pkgrel=5
+pkgdesc="A framework-agnostic way to render logic-free views (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/mustache/mustache'
+url='https://mustache.github.io/'
+msys2_repository_url='https://github.com/mustache/mustache'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
 source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
-noextract=(${_realname}-$pkgver.gem)
+noextract=(${_realname}-${pkgver}.gem)
 sha256sums=('90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0')
 
 check() {
   local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem check --verbose \
-    "${_realname}-${pkgver}.gem"
+  gem check --verbose "${_realname}-${pkgver}.gem"
 }
 
 package() {
   local _gemdir="$(${MINGW_PREFIX}/bin/ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install --verbose \
+  gem install --ignore-dependencies --no-user-install --verbose \
     -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
     "${_realname}-${pkgver}.gem"
 
   local _ruby_exe=$(cygpath -m ${MINGW_PREFIX}/bin/ruby.exe)
 
-  #for this conversion, we want the fully qualified ruby .exe path
-  #so that we can be sure that we are calling the correct one.
+  # For this conversion, we want the fully qualified ruby.exe path
+  # so that we can be sure that we are calling the correct one.
   sed -e "s|${_ruby_exe}|${MINGW_PREFIX}/bin/ruby|g" \
       -i ${pkgdir}${MINGW_PREFIX}/bin/mustache
 
-  #for Win32 .bat files, we want to drop the path references as the path
-  #refs are not needed since it's involved from the same dir.  If we did
-  #need fully-qualified pathes, they would have to be fully-qualified and
+  # For Win32 .bat files, we want to drop the path references as the path
+  # refs are not needed since it's invoked from the same dir. If we did
+  # need fully-qualified paths, they would have to be fully-qualified and
   # in DOS format.
   local _inst_dir=$(cygpath -m ${pkgdir}/${MINGW_PREFIX}/bin/)
   local _w_ruby_exe=$(cygpath -w ${MINGW_PREFIX}/bin/ruby.exe | sed 's/\\/\\\\/g')

diff --git a/mingw-w64-ruby-native-package-installer/PKGBUILD b/mingw-w64-ruby-native-package-installer/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: Andrew Sun <[email protected]>
 
-_gemname=native-package-installer
-_realname=ruby-${_gemname}
-pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.1.5
+_realname=native-package-installer
+pkgbase=mingw-w64-ruby-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-ruby-${_realname}")
+pkgver=1.1.9
 pkgrel=1
-pkgdesc="native-package-installer helps to install native packages on gem install (mingw-w64)"
+pkgdesc="A helper to install native packages on gem install (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/ruby-gnome2/native-package-installer"
 license=('spdx:LGPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
-source=("https://rubygems.org/downloads/${_gemname}-${pkgver}.gem")
-noextract=("${_gemname}-${pkgver}.gem")
-sha256sums=('516ebbacd7382b7e424da96eda6666d60dfad4dd407245a6ad5c1ad94e803ae4')
+source=("https://rubygems.org/downloads/${_realname}-${pkgver}.gem")
+noextract=("${_realname}-${pkgver}.gem")
+sha256sums=('fbb41b6b22750791a4304f0a0aeea3dd837668892117f49c4caf2e8e0f4e792f')
 
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install -i "${pkgdir}${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" ${_gemname}-${pkgver}.gem
+  gem install --ignore-dependencies --no-user-install --verbose \
+    -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
+    "${_realname}-${pkgver}.gem"
 
-  rm "${pkgdir}${_gemdir}/cache/${_gemname}-${pkgver}.gem"  
+  rm "${pkgdir}/${_gemdir}/cache/${_realname}-${pkgver}.gem"
 }
diff --git a/mingw-w64-ruby-pkg-config/PKGBUILD b/mingw-w64-ruby-pkg-config/PKGBUILD
@@ -1,29 +1,27 @@
 # Maintainer: Andrew Sun <[email protected]>
 
-_gemname=pkg-config
-_realname=ruby-${_gemname}
-pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.4.9
+_realname=pkg-config
+pkgbase=mingw-w64-ruby-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-ruby-${_realname}")
+pkgver=1.5.7
 pkgrel=1
 pkgdesc="Implementation of pkg-config in ruby (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/ruby-gnome2/pkg-config"
 license=('spdx:LGPL-2.1-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
-provides=("${MINGW_PACKAGE_PREFIX}-ruby-pkgconfig")
-replaces=("${MINGW_PACKAGE_PREFIX}-ruby-pkgconfig")
-conflicts=("${MINGW_PACKAGE_PREFIX}-ruby-pkgconfig")
-source=("https://rubygems.org/downloads/${_gemname}-${pkgver}.gem")
-noextract=("${_gemname}-${pkgver}.gem")
-sha256sums=('14968c3fec94a66f53a273b74478ed6372f2cf9a08bc081ba7642878ebac3b6d')
+source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
+noextract=(${_realname}-${pkgver}.gem)
+sha256sums=('713671c6af034325dc7e7c12026b02570fbb1358d9f3a023d3a001ce0159b1c7')
 
 package() {
   local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install -i "${pkgdir}${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" ${_gemname}-${pkgver}.gem
+  gem install --ignore-dependencies --no-user-install --verbose \
+    -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
+    "${_realname}-${pkgver}.gem"
 
-  rm "${pkgdir}${_gemdir}/cache/${_gemname}-${pkgver}.gem"  
+  rm "${pkgdir}/${_gemdir}/cache/${_realname}-${pkgver}.gem"
 }
diff --git a/mingw-w64-rake-compiler/PKGBUILD → mingw-w64-ruby-rake-compiler/PKGBUILD b/mingw-w64-rake-compiler/PKGBUILD → mingw-w64-ruby-rake-compiler/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=rake-compiler
 pkgbase="mingw-w64-ruby-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-ruby-${_realname}"
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.2.8
+pkgrel=1
 pkgdesc="Rake-based Ruby Extension (C, Java) task generator (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -13,34 +13,33 @@ license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
 source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
 noextract=(${_realname}-$pkgver.gem)
-sha256sums=('ee6e2f06ac0ca045f80d41eb596c8f33f25415973294952351a66509027f5d87')
+sha256sums=('f314105ecb3d23d4287014d30c189cab9da14150de0201e48b99c25a04749176')
 
 check() {
   local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem check --verbose \
-    "${_realname}-${pkgver}.gem"
+  gem check --verbose "${_realname}-${pkgver}.gem"
 }
 
 package() {
   local _gemdir="$(${MINGW_PREFIX}/bin/ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install --verbose \
+  gem install --ignore-dependencies --no-user-install --verbose \
     -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
     "${_realname}-${pkgver}.gem"
 
   local _ruby_exe=$(cygpath -m ${MINGW_PREFIX}/bin/ruby.exe)
 
-  #for this conversion, we want the fully qualified ruby .exe path
-  #so that we can be sure that we are calling the correct one.
+  # For this conversion, we want the fully qualified ruby.exe path
+  # so that we can be sure that we are calling the correct one.
   sed -e "s|${_ruby_exe}|${MINGW_PREFIX}/bin/ruby|g" \
       -i ${pkgdir}${MINGW_PREFIX}/bin/${_realname}
 
-  #for Win32 .bat files, we want to drop the path references as the path
-  #refs are not needed since it's involved from the same dir.  If we did
-  #need fully-qualified pathes, they would have to be fully-qualified and
+  # For Win32 .bat files, we want to drop the path references as the path
+  # refs are not needed since it's invoked from the same dir. If we did
+  # need fully-qualified paths, they would have to be fully-qualified and
   # in DOS format.
   local _inst_dir=$(cygpath -m ${pkgdir}/${MINGW_PREFIX}/bin/)
   local _w_ruby_exe=$(cygpath -w ${MINGW_PREFIX}/bin/ruby.exe | sed 's/\\/\\\\/g')

diff --git a/mingw-w64-ruby-rdiscount/PKGBUILD b/mingw-w64-ruby-rdiscount/PKGBUILD
@@ -3,55 +3,55 @@
 _realname=rdiscount
 pkgbase="mingw-w64-ruby-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-ruby-${_realname}"
-pkgver=2.2.7.1
+pkgver=2.2.7.3
 pkgrel=1
 pkgdesc="Fast Implementation of Gruber's Markdown in C (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/davidfstr/rdiscount'
+url='http://dafoster.net/projects/rdiscount/'
+msys2_repository_url='https://github.com/davidfstr/rdiscount'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-ruby")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
 source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
-noextract=(${_realname}-$pkgver.gem)
-sha256sums=('51ab13ce8781c813c88a191eb7d5704ebde2a5d2417cf0e01fd46997748330a9')
+noextract=(${_realname}-${pkgver}.gem)
+sha256sums=('8a4844f930916fc7215dc369932626be85f2da13cdf48185b836055b63126113')
 
 check() {
   local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem check --verbose \
-    "${_realname}-${pkgver}.gem"
+  gem check --verbose "${_realname}-${pkgver}.gem"
 }
 
 package() {
-  local _gemdir="$(${MINGW_PREFIX}/bin/ruby -e 'puts Gem.default_dir')"
+  local _gemdir="$(ruby -e 'puts Gem.default_dir')"
   _gemdir="$(cygpath -u ${_gemdir})"
 
-  ${MINGW_PREFIX}/bin/gem install --ignore-dependencies --no-user-install --verbose \
-    -i "${pkgdir}${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
+  gem install --ignore-dependencies --no-user-install --verbose \
+    -i "${pkgdir}/${_gemdir}" -n "${pkgdir}${MINGW_PREFIX}/bin" \
     "${_realname}-${pkgver}.gem"
 
   local _ruby_exe=$(cygpath -m ${MINGW_PREFIX}/bin/ruby.exe)
 
-  #for this conversion, we want the fully qualified ruby .exe path
-  #so that we can be sure that we are calling the correct one.
+  # For this conversion, we want the fully qualified ruby.exe path
+  # so that we can be sure that we are calling the correct one.
   sed -e "s|${_ruby_exe}|${MINGW_PREFIX}/bin/ruby|g" \
       -i ${pkgdir}${MINGW_PREFIX}/bin/rdiscount
 
-  #for Win32 .bat files, we want to drop the path references as the path
-  #refs are not needed since it's involved from the same dir.  If we did
-  #need fully-qualified pathes, they would have to be fully-qualified and
+  # For Win32 .bat files, we want to drop the path references as the path
+  # refs are not needed since it's invoked from the same dir. If we did
+  # need fully-qualified paths, they would have to be fully-qualified and
   # in DOS format.
-  local _inst_dir=$(cygpath -m ${pkgdir}/${MINGW_PREFIX}/bin/)
+  local _inst_dir=$(cygpath -m ${pkgdir}${MINGW_PREFIX}/bin/)
   local _w_ruby_exe=$(cygpath -w ${MINGW_PREFIX}/bin/ruby.exe | sed 's/\\/\\\\/g')
   sed  -e "s|${_w_ruby_exe}|ruby.exe|g" \
        -e "s|${_inst_dir}||g" \
        -i ${pkgdir}${MINGW_PREFIX}/bin/rdiscount.bat
 
-  install -Dm644 "${pkgdir}${_gemdir}/gems/${_realname}-${pkgver}/man/rdiscount.1" \
+  install -Dm644 "${pkgdir}/${_gemdir}/gems/${_realname}-${pkgver}/man/rdiscount.1" \
     "${pkgdir}${MINGW_PREFIX}/share/man/man1/rdiscount.1"
 
-  rm "${pkgdir}${_gemdir}/cache/${_realname}-${pkgver}.gem"
-  rm -rf "${pkgdir}${_gemdir}/gems/${_realname}-${pkgver}/man"
+  rm "${pkgdir}/${_gemdir}/cache/${_realname}-${pkgver}.gem"
+  rm -rf "${pkgdir}/${_gemdir}/gems/${_realname}-${pkgver}/man"
 }
diff --git a/mingw-w64-ruby/0007-nm-use-full-options.patch b/mingw-w64-ruby/0007-nm-use-full-options.patch
diff --git a/mingw-w64-ruby/0008-ucrt-32-win11-insns.patch b/mingw-w64-ruby/0008-ucrt-32-win11-insns.patch
@@ -1,6 +1,6 @@
 --- a/win32/win32.c
 +++ b/win32/win32.c
-@@ -2596,15 +2596,21 @@
+@@ -2699,15 +2699,21 @@
  # else /* x86 */
      /* pop ebp */
  #  define FUNCTION_BEFORE_RET_MARK "\x5d"