[gimp/wip/Jehan/incremental-win-installer-improvements] build: drop building aainfo.

[Jehan <jehanp src gnome org>]

commit 9ee6b31ca4ab931f012607c39c418980f0a37d5f
Author: Jehan <jehan girinstud io>
Date:   Sat May 15 22:33:30 2021 +0200

    build: drop building aainfo.

 build/windows/gitlab-ci/build-deps-msys2.sh        |  3 +-
 .../patches/0001-src-do-not-build-aainfo.patch     | 35 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 43a14dc406..2f013a487d 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -91,7 +91,8 @@ 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-sylvie-alexandre.patch
-patch --binary -p1 < ../build/windows/patches/0001-src-link-aainfo-with-libws2_32.patch
+#patch --binary -p1 < ../build/windows/patches/0001-src-link-aainfo-with-libws2_32.patch
+patch --binary -p1 < ../build/windows/patches/0001-src-do-not-build-aainfo.patch
 wget "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"; 
--output-document config.guess
 wget "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"; --output-document 
config.sub
 aclocal
diff --git a/build/windows/patches/0001-src-do-not-build-aainfo.patch 
b/build/windows/patches/0001-src-do-not-build-aainfo.patch
new file mode 100644
index 0000000000..93e4e506aa
--- /dev/null
+++ b/build/windows/patches/0001-src-do-not-build-aainfo.patch
@@ -0,0 +1,35 @@
+From 55913335f3d3737f40186d0334a6b6189fbf5c6e Mon Sep 17 00:00:00 2001
+From: Jehan <jehan girinstud io>
+Date: Sat, 15 May 2021 22:31:12 +0200
+Subject: [PATCH] src: do not build aainfo.
+
+It fails in GIMP CI with:
+> libtool: link: gcc -g -O2 -o .libs/aainfo.exe aainfo.o  -lws2_32 ./.libs/libaa.a
+> C:/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: 
./.libs/libaa.a(aastdin.o): in function `stdin_getchar':
+> C:\_r\_builds\k3_3muaB\0\GNOME\gimp\aalib-1.4.0\_build\src/../../src/aastdin.c:75: undefined reference to 
`__imp_select'
+
+Since we don't need aalib binaries anyway, only the library, let's not
+bother looking too much for a reason and just drop this executable.
+---
+ src/Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad23666..2c36484 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -58,10 +58,8 @@ libaa_la_SOURCES= \
+        aaputpixel.c \
+        aarecfunc.c 
+ libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0
+-bin_PROGRAMS=aainfo aatest aafire aasavefont
++bin_PROGRAMS=aatest aafire aasavefont
+ 
+-aainfo_LDADD= libaa.la
+-aainfo_LDFLAGS= @LDFLAGS@
+ aatest_LDADD= libaa.la
+ aatest_LDFLAGS= @LDFLAGS@
+ aafire_LDADD= libaa.la
+-- 
+2.31.1
+