[gimp/wip/Jehan/incremental-win-installer-improvements] Add a patch for aainfo failing to link.



commit 1d4ad7a910bf52a8396887cd4672b174e4497b5c
Author: Jehan <jehan girinstud io>
Date:   Sat May 15 22:07:24 2021 +0200

    Add a patch for aainfo failing to link.

 build/windows/gitlab-ci/build-deps-msys2.sh        |  1 +
 .../0001-src-link-aainfo-with-libws2_32.patch      | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index c2bf15efa6..43a14dc406 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -91,6 +91,7 @@ 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
 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-link-aainfo-with-libws2_32.patch 
b/build/windows/patches/0001-src-link-aainfo-with-libws2_32.patch
new file mode 100644
index 0000000000..e92c64a9fb
--- /dev/null
+++ b/build/windows/patches/0001-src-link-aainfo-with-libws2_32.patch
@@ -0,0 +1,29 @@
+From c405f751aa729d3fac210a46ec1e7eee269009a7 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan girinstud io>
+Date: Sat, 15 May 2021 22:05:22 +0200
+Subject: [PATCH] src: link aainfo with libws2_32.
+
+Should hopefully fix:
+
+> 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'
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad23666..7011ad2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -61,7 +61,7 @@ libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0
+ bin_PROGRAMS=aainfo aatest aafire aasavefont
+ 
+ aainfo_LDADD= libaa.la
+-aainfo_LDFLAGS= @LDFLAGS@
++aainfo_LDFLAGS= @LDFLAGS@ -lws2_32
+ aatest_LDADD= libaa.la
+ aatest_LDFLAGS= @LDFLAGS@
+ aafire_LDADD= libaa.la
+-- 
+2.31.1
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]