From 162eb00597c878c2e5a7d922af295af63784a7f4 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:14:38 -0700
Subject: [PATCH] add Fedora 41 to CI. (#1378)

---
 .github/workflows/fedora.yml |  2 ++
 gpsbabel.supp                | 36 +++++++++---------------------------
 tools/Dockerfile_f41         | 24 ++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 tools/Dockerfile_f41

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index f8a2aa553..ca26eda9c 100644
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -22,6 +22,8 @@ jobs:
             CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
           - IMAGE: '40'
             CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
+          - IMAGE: '41'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.IMAGE }}
       env:
diff --git a/gpsbabel.supp b/gpsbabel.supp
index 3cbfa1e70..25af42edc 100644
--- a/gpsbabel.supp
+++ b/gpsbabel.supp
@@ -1,39 +1,21 @@
 {
-   <Fedora 40 vtesto text, qt6-qtbase.x86_64 6.7.2-6.fc40 intermittant>
+   <vtesto text>
+#  Fedora 41 qt6-qtbase.x86_64 6.8.0-4.fc41
+#  Fedora 40 qt6-qtbase.x86_64 6.7.2-6.fc40 intermittant
+#  Ubnutu Jammy libqt6core6/jammy-updates,now 6.2.4+dfsg-2ubuntu1.1 amd64 >
+#  Ubuntu Jammy qtio qhash.cpp 6.2.4
+#  Ubuntu Jammy qtio qhash.cpp 6.7.2 intermittant
    Memcheck:Addr16
-   fun:UnknownInlinedFun
-   fun:aeshash128_lt16
-   fun:_ZL10aeshash128PKhmmm
-   fun:calculateHash<QStringView>
-}
-{
-   <Ubnutu jammy vtesto text, libqt6core6/jammy-updates,now 6.2.4+dfsg-2ubuntu1.1 amd64 >
-   Memcheck:Addr16
-   fun:UnknownInlinedFun
-   fun:_ZL7aeshashPKhmm
+   ...
    fun:calculateHash<QStringView>
 }
 {
-   <Ubuntu noble vtesto text, libqt6core6t64/noble,now 6.4.2+dfsg-21.1build5 amd64>
+   <vesto text 2>
+#  Ubuntu Noble libqt6core6t64/noble,now 6.4.2+dfsg-21.1build5 amd64>
    Memcheck:Addr16
    fun:UnknownInlinedFun
    fun:_ZL15aeshash128_lt16Dv2_xPKhm
 }
-{
-   <Ubuntu Jammy vtesto text, qtio qhash.cpp 6.2.4>
-   Memcheck:Addr16
-   fun:_mm_loadu_si128
-   fun:_ZL7aeshashPKhmm
-   fun:calculateHash<QStringView>
-}
-{
-   <Ubuntu Jammy vtesto text, qtio qhash.cpp 6.7.2 intermittant>
-   Memcheck:Addr16
-   fun:_mm_loadu_si128
-   fun:aeshash128_lt16
-   fun:_ZL10aeshash128PKhmmm
-   fun:calculateHash<QStringView>
-}
 {
    <Fedora18: Qt's use of libuuc leaks.>
    Memcheck:Leak
diff --git a/tools/Dockerfile_f41 b/tools/Dockerfile_f41
new file mode 100644
index 000000000..51d03e6f1
--- /dev/null
+++ b/tools/Dockerfile_f41
@@ -0,0 +1,24 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM fedora:41
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# basic tools to build
+RUN dnf install --assumeyes git make valgrind diffutils findutils langpacks-en ninja-build && \
+    dnf clean all
+# libraries used by gpsbabel.  zlib and shapelib may or may not be used depending qmake options.
+RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
+    dnf clean all
+# Qt used by gpsbabel, gpsbabelfe
+RUN dnf install --assumeyes qt6-qtbase-devel qt6-qtserialport-devel qt6-qtwebengine-devel qt6-linguist qt6-qttranslations qt6-qt5compat-devel qt6-qttools-devel libxkbcommon-devel && \
+    dnf clean all
+# tools to build the docs
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
+    dnf clean all
+# debuginfo for valgrind suppressions (or use DEBUGINFOD server)
+RUN dnf install --assumeyes 'dnf-command(debuginfo-install)' && \
+    dnf debuginfo-install --assumeyes qt6-qtbase && \
+    dnf clean all