Merge pull request #3012 from jriwanek-forks/buildsystem

(GHA) Buildsystem updates

.github/workflows/c-cpp.yml

@@ -58,19 +58,21 @@ jobs:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
+          release: false
           update: true
           msystem: ${{ matrix.environment.msystem }}
           install: >-
             make
-            ${{ matrix.environment.prefix }}-gcc
+          pacboy: >-
-            ${{ matrix.environment.prefix }}-pkg-config
+            gcc:p
-            ${{ matrix.environment.prefix }}-freetype
+            pkg-config:p
-            ${{ matrix.environment.prefix }}-SDL2
+            freetype:p
-            ${{ matrix.environment.prefix }}-zlib
+            SDL2:p
-            ${{ matrix.environment.prefix }}-libpng
+            zlib:p
-            ${{ matrix.environment.prefix }}-openal
+            libpng:p
-            ${{ matrix.environment.prefix }}-rtmidi
+            openal:p
-            ${{ matrix.environment.prefix }}-libvncserver
+            rtmidi:p
+            libvncserver:p
       - uses: actions/checkout@v3
       - name: make
         run: >-

.github/workflows/cmake.yml

@@ -76,13 +76,14 @@ jobs:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
+          release: false
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-
             ninja:p
             cmake:p
             gcc:p
-            pkg-config:p
+            pkgconf:p
             freetype:p
             SDL2:p
             zlib:p
@@ -210,7 +211,7 @@ jobs:
           path: build/artifacts/**
 
   linux:
-    name: "Linux GCC 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "Linux GCC 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
     runs-on: ubuntu-22.04
 
@@ -231,6 +232,13 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qtbase5-dev
+              qttools5-dev
 
     steps:
       - name: Install dependencies
@@ -243,10 +251,9 @@ jobs:
           libpng-dev
           libc6-dev
           librtmidi-dev
-          qtbase5-dev
-          qttools5-dev
           libopenal-dev
           libvncserver-dev
+          ${{ matrix.ui.packages }}
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -260,11 +267,11 @@ jobs:
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
+          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
 
   macos11:
-    name: "macOS 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "macOS 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
     runs-on: macos-11
 
@@ -285,6 +292,12 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qt@5
 
     steps:
       - name: Install dependencies
@@ -295,9 +308,9 @@ jobs:
           sdl2
           libpng
           rtmidi
-          qt@5
           openal-soft
           libvncserver
+          ${{ matrix.ui.packages }}
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -314,5 +327,5 @@ jobs:
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
+          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**

src/discord.c

@@ -88,7 +88,7 @@ discord_update_activity(int paused)
         *(paren - 1) = '\0';
 
 #pragma GCC diagnostic push
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined (__clang__)
 #    pragma GCC diagnostic ignored "-Wformat-truncation"
 #endif
     if (strlen(vm_name) < 100) {