diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e4a77a..9fdd27a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,7 +132,7 @@ jobs: if ($v -eq '') { $v = '1.17' } Write-Output -InputObject "ICONV_VERSION=$v" >>"$env:GITHUB_ENV" $v = '${{ github.event.inputs.gettext-version }}'.Trim() - if ($v -eq '') { $v = '0.22.5a' } + if ($v -eq '') { $v = '0.23' } Write-Output -InputObject "GETTEXT_VERSION=$v" >>"$env:GITHUB_ENV" - name: Checkout diff --git a/build-exe/vars.ps1 b/build-exe/vars.ps1 index b670c73..6631fee 100644 --- a/build-exe/vars.ps1 +++ b/build-exe/vars.ps1 @@ -408,7 +408,7 @@ if (-not($cygwinMirror)) { } $cldrPluralWorks = 'yes' -if ($Link -eq 'shared') { +if ($Link -eq 'shared' -and $gettextVersion -lt [Version]'0.23') { # See https://savannah.gnu.org/bugs/?66356 $cldrPluralWorks = 'no' } @@ -435,7 +435,7 @@ Export-Variable -Name 'gettext-peversion-libtextstyle' -Value $gettextPEVersionL Export-Variable -Name 'iconv-tp-version' -Value $iconvTPVersion Export-Variable -Name 'gettext-tp-version' -Value $gettextTPVersion Export-Variable -Name 'cldr-plural-works' -Value $cldrPluralWorks -Export-Variable -Name 'simplify-plurals-xml' -Value ($gettextVersion -le [Version]'0.23.0' ? 'true' : '') +Export-Variable -Name 'simplify-plurals-xml' -Value ($gettextVersion -le [Version]'0.23' ? 'true' : '') Write-Output '## Outputs' Get-Content -LiteralPath $env:GITHUB_OUTPUT