[gimp] build: install aalib from MSYS2 where it's now made available.

[Jehan <jehanp src gnome org>]

commit a97e437efa9aaa7d809d22920d4b5d773c33400f
Author: Jehan <jehan girinstud io>
Date:   Tue Mar 29 13:34:23 2022 +0200

    build: install aalib from MSYS2 where it's now made available.
    
    https://github.com/msys2/MINGW-packages/issues/11115

 build/windows/gitlab-ci/build-deps-msys2.sh   | 21 ---------------------
 build/windows/gitlab-ci/build-gimp-msys2.sh   |  1 +
 build/windows/gitlab-ci/package-gimp-msys2.sh |  1 +
 3 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 5da73b3720..88bfcb6f01 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -51,27 +51,6 @@ export LD_LIBRARY_PATH="${GIMP_PREFIX}/lib:${LD_LIBRARY_PATH}"
 export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
 export XDG_DATA_DIRS="${GIMP_PREFIX}/share:/mingw64/share/"
 
-## AA-lib (not available in MSYS2) ##
-
-wget https://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz
-echo "9801095c42bba12edebd1902bcf0a990 aalib-1.4rc5.tar.gz" | md5sum -c -
-tar xzf aalib-1.4rc5.tar.gz
-cd aalib-1.4.0
-patch --binary -p1 < ../build/windows/patches/aalib-0001-Apply-patch-for-MSYS2.patch
-patch --binary -p1 < ../build/windows/patches/aalib-0002-configure-src-tweak-Windows-link-flags.patch
-wget "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"; 
--output-document config.guess
-wget "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"; --output-document 
config.sub
-aclocal
-libtoolize --force
-automake --add-missing
-autoconf
-mkdir _build
-cd _build
-../configure --prefix="${GIMP_PREFIX}"
-make
-make install
-cd ../..
-
 ## babl and GEGL (follow master branch) ##
 
 git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 98d72b6096..ad8bdf063b 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -28,6 +28,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-autotools \
     mingw-w64-$MSYS2_ARCH-ccache \
     \
+    mingw-w64-$MSYS2_ARCH-aalib \
     mingw-w64-$MSYS2_ARCH-appstream-glib \
     mingw-w64-$MSYS2_ARCH-atk \
     mingw-w64-$MSYS2_ARCH-brotli \
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 588b868b93..ccbf55cf7c 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -26,6 +26,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-ccache \
     \
+    mingw-w64-$MSYS2_ARCH-aalib \
     mingw-w64-$MSYS2_ARCH-appstream-glib \
     mingw-w64-$MSYS2_ARCH-atk \
     mingw-w64-$MSYS2_ARCH-brotli \