Demo Qt 6 build

.github/workflows/build.yaml

@@ -24,7 +24,7 @@ jobs:
             build_type: RelWithDebInfo
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install GCC
@@ -91,7 +91,7 @@ jobs:
     needs: clang-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install GCC
@@ -129,7 +129,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: msys2/setup-msys2@v2
@@ -177,7 +177,7 @@ jobs:
             build/Windows-x86_64/Freeciv21-*-Windows-x86_64.exe
             build/Windows-x86_64/Freeciv21-*-Windows-x86_64.exe.sha256
       - name: Upload a build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Windows-exe
           path: build/Windows-x86_64/Freeciv21-*.exe
@@ -191,13 +191,13 @@ jobs:
       VCPKG_ROOT: C:/vcpkg
       VCPKG_DEFAULT_BINARY_CACHE: ${{github.workspace}}/vcpkg/bincache
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: lukka/run-vcpkg@v10
+      - uses: lukka/run-vcpkg@v11
         name: Install dependencies
         with:
-          vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00
+          vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
       - name: Configure
@@ -217,7 +217,7 @@ jobs:
     env:
       VCPKG_BUILD_TYPE: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install build tools
@@ -229,13 +229,13 @@ jobs:
             gettext \
             create-dmg
           brew link gettext --force
-      - uses: actions/setup-python@v4  # Workaround for #2069
+      - uses: actions/setup-python@v5  # Workaround for #2069
         with:
           python-version: '3.11'
-      - uses: lukka/run-vcpkg@v10
+      - uses: lukka/run-vcpkg@v11
         name: Install dependencies
         with:
-          vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00
+          vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
       - name: Build
         uses: lukka/run-cmake@v10
         with:
@@ -286,7 +286,7 @@ jobs:
             Freeciv21-*.dmg
             Freeciv21-*.dmg.sha256
       - name: Upload a build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macOS-dmg
           path: Freeciv21-*.dmg
@@ -314,7 +314,7 @@ jobs:
             zlib-devel \
             libunwind-devel \
             elfutils-libs
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Configure
         # Set ALWAYS_ROOT because the container user is root and creating an
         # unpriviledged user would be too much work.
@@ -388,8 +388,8 @@ jobs:
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     steps:
       - name: checkout
-        uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v19
+        uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v22
       - run: nix flake check
       # TODO: We can add the build to a cache for others (see cachix.org)
       # It's free for FOSS.
@@ -403,10 +403,10 @@ jobs:
     env:
       QT_VERSION: v5.15.8-lts-lgpl
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache Qt build
         id: qtcache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/qt
           key: qt-wasm-${{ env.QT_VERSION }}-svg-socket-v2
@@ -419,7 +419,7 @@ jobs:
             clang \
             python3 \
             gettext
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout emsdk
         with:
           repository: emscripten-core/emsdk
@@ -442,7 +442,7 @@ jobs:
           cd lua-5.4.3
           emcmake cmake .
           emmake make install
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: steps.qtcache.outputs.cache-hit != 'true'
         name: Checkout qtbase
         with:
@@ -460,7 +460,7 @@ jobs:
           git cherry-pick 76d12eea2252c5e537dff15b103bdc1f925cf760
           ./configure -xplatform wasm-emscripten -opensource -confirm-license -prefix ~/qt -nomake examples
           make install
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: steps.qtcache.outputs.cache-hit != 'true'
         name: Checkout qtsvg
         with:
@@ -474,7 +474,7 @@ jobs:
           cd qtsvg
           ~/qt/bin/qmake
           make install
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout zstd
         with:
           repository: facebook/zstd
@@ -487,7 +487,7 @@ jobs:
           mkdir bld
           emcmake cmake build/cmake -DZSTD_BUILD_PROGRAMS=0 -DZSTD_BUILD_SHARED=0
           emmake make install
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout extra-cmake-modules
         with:
           repository: KDE/extra-cmake-modules
@@ -498,7 +498,7 @@ jobs:
           cd ecm
           cmake .
           sudo make install
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout karchive
         with:
           repository: KDE/karchive
@@ -543,13 +543,13 @@ jobs:
         run: |
           cat common/networking/CMakeFiles/networking.dir/includes_CXX.rsp
           cat CMakeCache.txt
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cmakecache
           path: CMakeCache.txt
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wasm-client
           path: freeciv21-client.*
@@ -558,7 +558,7 @@ jobs:
     name: clang-format Code Formatter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Run clang-format style check for C/C++

.github/workflows/release.yaml

@@ -10,8 +10,9 @@ jobs:
   update-autorevision:
     name: "Update AutoRevision"
     runs-on: ubuntu-22.04
+    if: github.event_name == 'release'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - # Make sure there are no unstaged changes
@@ -29,7 +30,7 @@ jobs:
           echo Target branch is $branch
           echo branch=$branch >> $GITHUB_OUTPUT
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.0.4
+        uses: peter-evans/create-pull-request@v6
         with:
           base: ${{ steps.branch.outputs.branch }}
           commit-message: "Release update of AutoRevision.txt"
@@ -44,8 +45,9 @@ jobs:
   update-archive:
     name: "Update Source Archive"
     runs-on: ubuntu-22.04
+    if: github.event_name == 'release'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: git rev-parse --short=5 HEAD > cmake/AutoRevision.txt
@@ -78,7 +80,7 @@ jobs:
         shell: msys2 {0}
     if: github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: msys2/setup-msys2@v2

AUTHORS

@@ -1,5 +1,6 @@
 Freeciv21 contributors are listed below in alphabetical order:
 
+- blabber (Tobias Rehbein)
 - DobbyK
 - ilkkachu (Ilkka Virta)
 - jwrober (James Robertson)

CMakeLists.txt

@@ -39,28 +39,22 @@ include(AutoRevision)
 # Set some variables from AutoRevision for use here and later
 list(LENGTH FC21_REV_TAG_LIST FC21_REV_TAG_LIST_LENGTH)
 
-# When we tag a stable release we only get 2 of the 4 components populated
-#   So we manually set some of the variables we need for the full version.
-if(${FC21_REV_TAG_LIST_LENGTH} EQUAL 2)
+# When we tag a stable release we only get 3 of the 4 components populated,
+# so we manually set some of the variables we need for the full version.
+if (${FC21_REV_TAG_LIST_LENGTH} EQUAL 3)
   list(GET FC21_REV_TAG_LIST 0 FC21_MAJOR_VERSION)
   list(GET FC21_REV_TAG_LIST 1 FC21_MINOR_VERSION)
-  set(FC21_LABEL_VERSION "Stable")
-  set(FC21_EMER_VERSION "0")
-  set(FC21_PATCH_VERSION "0")
+  list(GET FC21_REV_TAG_LIST 2 FC21_PATCH_VERSION)
+  set(FC21_VERSION_LABEL "stable")
   set(IS_STABLE_VERSION true)
-  set(FREECIV21_VERSION "${FC21_MAJOR_VERSION}.${FC21_MINOR_VERSION}")
+  set(FREECIV21_VERSION "${FC21_MAJOR_VERSION}.${FC21_MINOR_VERSION}.${FC21_PATCH_VERSION}")
 else()
   list(GET FC21_REV_TAG_LIST 0 FC21_MAJOR_VERSION)
   list(GET FC21_REV_TAG_LIST 1 FC21_MINOR_VERSION)
-  list(GET FC21_REV_TAG_LIST 2 FC21_LABEL_VERSION)
-  if (${FC21_REV_TAG_LIST_LENGTH} GREATER 3)
-    list(GET FC21_REV_TAG_LIST 3 FC21_EMER_VERSION)
-  else()
-    set(FC21_EMER_VERSION 0)
-  endif()
-  set(FC21_PATCH_VERSION ${FC21_REV_HEAD_HASH_D})
+  list(GET FC21_REV_TAG_LIST 2 FC21_VERSION_LABEL)
+  list(GET FC21_REV_TAG_LIST 3 FC21_PATCH_VERSION)
   set(IS_STABLE_VERSION false)
-  set(FREECIV21_VERSION "${FC21_MAJOR_VERSION}.${FC21_MINOR_VERSION}.${FC21_PATCH_VERSION}")
+  set(FREECIV21_VERSION "${FC21_MAJOR_VERSION}.${FC21_MINOR_VERSION}")
 endif()
 
 # Set project

README.md

@@ -26,9 +26,9 @@ The documentation is found on our [documentation website](https://longturn.readt
 Installation
 ------------
 
-### Snap and Flathub Editions
+### Snap, Flathub and AUR Editions
 
-<p><a href='https://snapcraft.io/freeciv21'><img width='182' height='56' alt='Get Freeciv21 on Snapcraft' src='https://snapcraft.io/static/images/badges/en/snap-store-white.svg'/></a>&nbsp;<a href='https://flathub.org/apps/net.longturn.freeciv21'><img width='182' height='56' alt='Get Freeciv21 on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-i-en.svg'/></a></p>
+<p><a href='https://snapcraft.io/freeciv21'><img width='182' height='56' alt='Get Freeciv21 on Snapcraft' src='https://snapcraft.io/static/images/badges/en/snap-store-white.svg'/></a>&nbsp;<a href='https://flathub.org/apps/net.longturn.freeciv21'><img width='182' height='56' alt='Get Freeciv21 on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-i-en.svg'/></a>&nbsp;<a href='https://aur.archlinux.org/packages/freeciv21'><img width='182' height'56' alt="AUR version" src="https://img.shields.io/aur/version/freeciv21?style=for-the-badge&logo=archlinux&label=AUR"></p>
 
 ### Windows and macOS
 
@@ -86,3 +86,17 @@ Alternatively, Freeciv21 can be used with Nix. For this, enable Nix flakes and r
 ```sh
 nix run github:longturn/freeciv21#;
 ```
+
+### FreeBSD
+
+Freeciv21 is available in the FreeBSD ports tree. You can install the binary
+package using this command:
+```sh
+pkg install freeciv21
+```
+
+Although it is recommended to use the binary package, you can also build
+Freeciv21 using the ports tree:
+```sh
+make -C /usr/ports/games/freeciv21 install clean
+```

client/CMakeLists.txt

@@ -157,8 +157,13 @@ target_link_libraries(freeciv21-client PRIVATE common)
 target_link_libraries(freeciv21-client PRIVATE cvercmp)
 target_link_libraries(freeciv21-client PRIVATE tolua)
 
-target_link_libraries(freeciv21-client PRIVATE Qt5::Widgets)
-target_link_libraries(freeciv21-client PRIVATE Qt5::Svg)
+target_link_libraries(freeciv21-client PRIVATE Qt6::Widgets)
+target_link_libraries(freeciv21-client PRIVATE Qt6::Svg)
+
+# Workaround for QTBUG-93413
+set_source_files_properties(
+  widgets/city/governor_widget.ui
+  PROPERTIES AUTOUIC_OPTIONS "--connections;string")
 
 if(NOT EMSCRIPTEN)
   target_sources(freeciv21-client PRIVATE servers.cpp)
@@ -178,11 +183,11 @@ if (AUDIO_SDL)
 endif()
 
 if (APPLE)
-  qt5_import_plugins(freeciv21-client INCLUDE Qt5::QCocoaIntegrationPlugin Qt5::QSvgPlugin)
+  qt6_import_plugins(freeciv21-client INCLUDE Qt6::QCocoaIntegrationPlugin Qt6::QSvgPlugin)
 endif()
 
 if(EMSCRIPTEN)
-  qt5_import_plugins(freeciv21-client INCLUDE Qt5::QWasmIntegrationPlugin)
+  qt6_import_plugins(freeciv21-client INCLUDE Qt6::QWasmIntegrationPlugin)
   target_link_options(freeciv21-client PRIVATE
                       -sASSERTIONS=1
                       -sWEBSOCKET_URL=wss://
@@ -200,8 +205,8 @@ if(EMSCRIPTEN)
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/hexemplio@data/hexemplio"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/amplio2.tilespec@data/amplio2.tilespec"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/amplio2@data/amplio2"
-                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/gui-qt/Classic@data/themes/gui-qt/Classic"
-                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/gui-qt/icons@data/themes/gui-qt/icons"
+                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/Classic@data/themes/Classic"
+                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/icons@data/themes/icons"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdmusic.musicspec@data/stdmusic.musicspec"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdmusic@data/stdmusic"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdsounds@data/stdsounds"