From 48c3d350a55f02e6aa09a9527790bc07839d4868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Sat, 25 Jan 2025 17:45:07 +0100
Subject: [PATCH] 2025-01-25 17:45 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * .github/workflows/vm1-ci.yml     * enablkled
 freeimage     * set HB_BUILD_TEST to ${{matrix.strictness}}     * reenabled
 full strict build

---
 .github/workflows/vm1-ci.yml | 11 +++--------
 ChangeLog.txt                |  6 ++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/vm1-ci.yml b/.github/workflows/vm1-ci.yml
index c26de1735b..eafd70f973 100644
--- a/.github/workflows/vm1-ci.yml
+++ b/.github/workflows/vm1-ci.yml
@@ -50,15 +50,13 @@ jobs:
               (gcc) echo ${{matrix.compiler}} ;; esac) \
             libslang2 \
             cairo \
+            freeimage \
             libgd \
             mariadb-connector-c \
             postgresql16-client \
             qt5-buildtools qt5-gui
           EOF
 
-          # Dependencies for disabled contribs:
-          #  freeimage \
-
           tee ~/work/install_netbsd_deps.sh <<EOF
           #!/bin/sh
           set -ex
@@ -102,14 +100,11 @@ jobs:
           HB_USER_LDFLAGS=""
           case ${{matrix.strictness}} in
             normal) ;;
-            strict) case ${{matrix.compiler}} in
-                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
-                      (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
-                    esac ;;
+            strict) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
           esac
           tee ./.bashrc <<EOENV
           # These contribs do not build on any platform
-          export HB_BUILD_CONTRIBS="no hbfimage"  # incompatible with freeimage 3.18+
+          export HB_BUILD_TEST="${{matrix.strictness}}"
 
           export HB_BUILD_VERBOSE="yes"
           export HBMK_WITH_SQLITE3="local"
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 560530037c..2c8bf0e814 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,12 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-25 17:45 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * .github/workflows/vm1-ci.yml
+    * enablkled freeimage
+    * set HB_BUILD_TEST to ${{matrix.strictness}}
+    * reenabled full strict build
+
 2025-01-25 17:14 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbssl/bio.c
   * contrib/hbssl/evpciph.c