[gimp/wip/Jehan/incremental-win-installer-improvements] Test new patch.



commit 26c4eae455a91b83e5d9c2fd7784fd35d0d160ce
Author: Jehan <jehan girinstud io>
Date:   Sun May 16 17:35:20 2021 +0200

    Test new patch.

 build/windows/gitlab-ci/build-deps-msys2.sh        |  1 +
 ...igure-rename-configure.in-to-configure.ac.patch | 64 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 0c674a0614..2b110636b1 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -73,6 +73,7 @@ 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-do-not-build-aainfo.patch
 patch --binary -p1 < ../build/windows/patches/0001-src-do-not-build-bin-executables.patch
+patch --binary -p1 < ../build/windows/patches/0001-configure-rename-configure.in-to-configure.ac.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-configure-rename-configure.in-to-configure.ac.patch 
b/build/windows/patches/0001-configure-rename-configure.in-to-configure.ac.patch
new file mode 100644
index 0000000000..7dc3297464
--- /dev/null
+++ b/build/windows/patches/0001-configure-rename-configure.in-to-configure.ac.patch
@@ -0,0 +1,64 @@
+From 40addd1b367a9ad7778510901d0cb9ad764e5bfa Mon Sep 17 00:00:00 2001
+From: Jehan <jehan girinstud io>
+Date: Sun, 16 May 2021 17:06:56 +0200
+Subject: [PATCH] configure: rename configure.in to configure.ac.
+
+---
+ configure.in    | 8 ++++----
+ src/Makefile.am | 9 ++++++++-
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 78806dc..a60dfaf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -424,18 +424,18 @@ fi
+ if test  "$linux_driver_test" = yes; then
+  if test "x$system" = xLinux; then
+    echo " Linux console"
+-   AC_DEFINE(LINUX_DRIVER)
+-   AC_DEFINE(LINUX_KBDDRIVER)
++   #AC_DEFINE(LINUX_DRIVER)
++   #AC_DEFINE(LINUX_KBDDRIVER)
+  fi
+ fi
+ if test  "$x_driver" = true; then
+   echo " x11"
+   if test  "$x_kbddriver_test" = yes; then
+-     AC_DEFINE(X11_KBDDRIVER)
++     #AC_DEFINE(X11_KBDDRIVER)
+      x_kbddriver=true
+   fi
+   if test  "$x_mousedriver_test" = yes; then
+-     AC_DEFINE(X11_MOUSEDRIVER)
++     #AC_DEFINE(X11_MOUSEDRIVER)
+      x_mousedriver=true
+   fi
+ fi
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c462e8a..442a902 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,9 @@
+ AUTOMAKE_OPTIONS = foreign #include-deps
++
++#if PLATFORM_WIN32
++no_undefined = -no-undefined
++#endif
++
+ EXTRA_DIST = config.dos config.os2 Makefile.dos Makefile.os2 aados.c aadoskbd.c aadosmou.c aaos2.c  
aaos2kbd.c aaos2mou.c  aaint.h aamktabl.h aaxint.h toc.c
+ lib_LTLIBRARIES=libaa.la
+ libaa_la_SOURCES= \
+@@ -57,6 +62,8 @@ libaa_la_SOURCES= \
+        aaattrs.c \
+        aaputpixel.c \
+        aarecfunc.c 
+-libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0
++libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0 \
++       $(no_undefined) \
++         -lws2_32
+ 
+ include_HEADERS=aalib.h
+-- 
+2.31.1
+


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