meson, build, INSTALL: we now use mypaint-brushes-2.0 for all Windows platform.

Thanks to lazka and the whole MSYS2 project for adding this package to
their repository so that we don't need ugly special-casing anymore.

See: e515fe48bc

INSTALL.in

@@ -147,7 +147,7 @@ help in that regard:
      incompatible with the version 2 (which is still experimental anyway
      and has no stable release at time of writing).
 
- 11. We also need the mypaint-brushes data package:
+ 11. We also need the mypaint-brushes v2 data package:
 
         https://github.com/mypaint/mypaint-brushes
 

build/windows/1_build-deps-msys2.ps1

@@ -42,8 +42,6 @@ if ("$PSCommandPath" -like "*1_build-deps-msys2.ps1*" -or "$CI_JOB_NAME" -like "
   {
     & $MSYS_ROOT\usr\bin\pacman --noconfirm -Suy
   }
-# TODO: When we drop 32-bit support, move an unconditional mypaint-brushes2 dependency back to all-deps-uni.txt
-& $MSYS_ROOT\usr\bin\pacman --noconfirm -S --needed $(if ($MSYSTEM_PREFIX -ne 'mingw32') { "$(if ($MSYSTEM_PREFIX -eq 'clangarm64') { 'mingw-w64-clang-aarch64' } else { 'mingw-w64-clang-x86_64' })-mypaint-brushes2" } else { 'mingw-w64-i686-mypaint-brushes' })
 & $MSYS_ROOT\usr\bin\pacman --noconfirm -S --needed $(if ($MSYSTEM_PREFIX -ne 'mingw32') { "$(if ($MSYSTEM_PREFIX -eq 'clangarm64') { 'mingw-w64-clang-aarch64' } else { 'mingw-w64-clang-x86_64' })-perl" }) (Get-Content build/windows/all-deps-uni.txt | Where-Object { $_.Trim() -ne '' }).Replace('${MINGW_PACKAGE_PREFIX}',$(if ($MINGW_PACKAGE_PREFIX) { "$MINGW_PACKAGE_PREFIX" } elseif ($MSYSTEM_PREFIX -eq 'clangarm64') { 'mingw-w64-clang-aarch64' } else { 'mingw-w64-clang-x86_64' })).Replace(' \','')
 Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K"
 

build/windows/2_bundle-gimp-uni_base.py

@@ -143,11 +143,9 @@ for lang in lang_array:
     bundle(MSYSTEM_PREFIX, f"share/locale/{lang}/LC_MESSAGES/gtk*.mo")
     # For language list in text tool options
     bundle(MSYSTEM_PREFIX, f"share/locale/{lang}/LC_MESSAGES/iso_639_3.mo")
+
 ### mypaint brushes
-if "32" not in MSYSTEM_PREFIX:
-    bundle(MSYSTEM_PREFIX, "share/mypaint-data/2.0")
-else:
-    bundle(MSYSTEM_PREFIX, "share/mypaint-data/1.0")
+bundle(MSYSTEM_PREFIX, "share/mypaint-data/2.0")
 ### Needed for full CJK and Cyrillic support in file-pdf
 bundle(MSYSTEM_PREFIX, "share/poppler")
 

build/windows/all-deps-uni.txt

@@ -36,6 +36,7 @@ ${MINGW_PACKAGE_PREFIX}-libtiff \
 ${MINGW_PACKAGE_PREFIX}-libwebp \
 ${MINGW_PACKAGE_PREFIX}-libwmf \
 ${MINGW_PACKAGE_PREFIX}-maxflow \
+${MINGW_PACKAGE_PREFIX}-mypaint-brushes2 \
 ${MINGW_PACKAGE_PREFIX}-openexr \
 ${MINGW_PACKAGE_PREFIX}-openjpeg2 \
 ${MINGW_PACKAGE_PREFIX}-pango \

meson.build

@@ -444,11 +444,7 @@ lcms_minver       = '2.8'
 lcms              = dependency('lcms2',              version: '>='+lcms_minver)
 libmypaint_minver = '1.5.0'
 libmypaint        = dependency('libmypaint',         version: '>='+libmypaint_minver)
-mypaint_brushes_n = 'mypaint-brushes-2.0'
-if platform_windows and host_cpu_family == 'x86'
-    mypaint_brushes_n = 'mypaint-brushes-1.0'
-endif
-mypaint_brushes   = dependency(mypaint_brushes_n)
+mypaint_brushes   = dependency('mypaint-brushes-2.0')
 
 if relocatable_bundle
   mypaint_brushes_dir = '${gimp_installation_dir}'\