Various dependency updates

.ci/flatpak/net.wz2100.wz2100.yaml.in

@@ -177,7 +177,7 @@ modules:
       - -DWZ_SENTRY_PREDOWNLOADED_SENTRY_ARCHIVE=/app/prestaged-dl/sentry-native.zip
       - -DWZ_DOWNLOAD_PREBUILT_PACKAGES_ASSET_DIR=/app/prestaged-dl
       # Crashpad/breakpad works in the Flatpak sandbox *if* --allow=devel is set above. Otherwise, this must be: inproc
-      - -DSENTRY_BACKEND=breakpad
+      - -DSENTRY_BACKEND=crashpad
       @WZ_CMAKE_CROSS_CONFIG_OPTIONS@
     secret-opts:
       - -DWZ_DISTRIBUTOR:STRING=$WZ_DISTRIBUTOR

.github/workflows/CI_ubuntu.yml

@@ -28,36 +28,21 @@ jobs:
       matrix:
         include:
           # Builds with GCC (uploaded as artifacts, and published as release DEBs)
-          - name: "Ubuntu 18.04 [GCC]"
-            docker: "ubuntu-18.04"
-            arch: "amd64"
-            output-suffix: "ubuntu18.04"
-            compiler: gcc
-            publish_artifact: true
-            deploy_release: true
           - name: "Ubuntu 20.04 [GCC]"
             docker: "ubuntu-20.04"
             arch: "amd64"
             compiler: gcc
             output-suffix: "ubuntu20.04"
             publish_artifact: true
             deploy_release: true
-          # Newer builds with GCC (not currently uploaded)
           - name: "Ubuntu 22.04 [GCC]"
             docker: "ubuntu-22.04"
             arch: "amd64"
             output-suffix: "ubuntu22.04"
             compiler: gcc
-            publish_artifact: false
-            deploy_release: false
+            publish_artifact: true
+            deploy_release: true
           # Builds with Clang (not uploaded)
-          - name: "Ubuntu 18.04 [Clang]"
-            docker: "ubuntu-18.04"
-            arch: "amd64"
-            output-suffix: "ubuntu18.04"
-            compiler: clang
-            publish_artifact: false
-            deploy_release: false
           - name: "Ubuntu 20.04 [Clang]"
             docker: "ubuntu-20.04"
             arch: "amd64"
@@ -100,10 +85,6 @@ jobs:
     - name: Init Git Submodules
       working-directory: '${{ github.workspace }}/src'
       run: git submodule update --init --recursive
-    - name: Pull latest base image
-      if: success() && (matrix.docker == 'ubuntu-18.04')
-      run: |
-        docker pull ubuntu:18.04
     - name: Build the Docker image
       working-directory: '${{ github.workspace }}/src'
       run: |

.sentrynative

@@ -1,2 +1,2 @@
-URL=https://github.com/getsentry/sentry-native/releases/download/0.6.0/sentry-native.zip
-SHA512=e41d3661679ba7ba1cc58059ce86f6fb1a93fb580d2f8e77d6f2a09988fe62f18f3636e13e324a643f736aa891aa2312100740ace043c2e542d4e6b546b61014
+URL=https://github.com/getsentry/sentry-native/releases/download/0.6.6/sentry-native.zip
+SHA512=0fa548b70e3fbb87614521d797a577ffa185991f0942cf20dd965f8c068414512a63f5d715672ecf243aa31d18fdcda6ce355ad8614ede7b988d0a103cda7244

3rdparty/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.24)
 
 SET(UTF8PROC_INSTALL OFF CACHE BOOL "Enable installation of utf8proc" FORCE)
 add_subdirectory(utf8proc)
@@ -29,7 +29,6 @@ endif()
 
 find_package(SQLite3 3.14 REQUIRED)
 set(SQLITECPP_USE_STATIC_RUNTIME OFF CACHE BOOL "Use static runtime" FORCE)
-set(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "Enable Column::getColumnOriginName(). Require support from sqlite3 library." FORCE)
 set(SQLITE_HAS_CODEC OFF CACHE BOOL "Enable database encryption API. Not available in the public release of SQLite." FORCE)
 if(SQLite3_VERSION VERSION_LESS 3.19)
 	set(SQLITE_USE_LEGACY_STRUCT ON CACHE BOOL "Fallback to forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)" FORCE)

3rdparty/json/CMakeLists.txt

@@ -1,6 +1,6 @@
 # A simplified version of: https://github.com/nlohmann/json/blob/b21c34517900c46a943c804d9af3a20cd0c77062/CMakeLists.txt
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.14)
 
 project(nlohmann_json LANGUAGES CXX)
 

CMakeLists.txt

@@ -686,8 +686,6 @@ macro(CONFIGURE_WZ_COMPILER_WARNINGS)
 	endif()
 endmacro(CONFIGURE_WZ_COMPILER_WARNINGS)
 
-add_definitions("-DHAVE_CONFIG_H")
-
 # CMAKE_CURRENT_BINARY_DIR should come before the current source directory
 # so that any build products are preferentially included over in-source build
 # products that might have been generated by a different compilation method / run
@@ -794,7 +792,7 @@ function(CHECK_IS_ABSOLUTE_PATH _var _output)
 endfunction()
 CHECK_IS_ABSOLUTE_PATH(WZ_DATADIR WZ_DATADIR_ISABSOLUTE)
 CHECK_IS_ABSOLUTE_PATH(WZ_LOCALEDIR WZ_LOCALEDIR_ISABSOLUTE)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/wz2100-generated-config.h)
 
 # Attempt to find Miniupnpc (minimum supported API version = 9)
 # NOTE: This is not available on every platform / distro

lib/framework/types.h

@@ -31,10 +31,9 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#if defined(HAVE_CONFIG_H)
-#  undef _XOPEN_SOURCE
-#  include "config.h"
-#endif
+// Always include generated config.h
+#undef _XOPEN_SOURCE
+#include "wz2100-generated-config.h"
 
 #include <stddef.h> // for size_t
 

lib/framework/wzglobal.h

@@ -34,15 +34,9 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#if defined(HAVE_CONFIG_H)
-#  undef _XOPEN_SOURCE
-#  include "config.h"
-#elif !defined(HAVE_CONFIG_H)
-#  define PACKAGE "warzone2100"
-#  define PACKAGE_BUGREPORT "http://wz2100.net/"
-#  define PACKAGE_NAME "Warzone 2100"
-#  define PACKAGE_TARNAME "warzone2100"
-#endif
+// Always include generated config.h
+#undef _XOPEN_SOURCE
+#include "wz2100-generated-config.h"
 
 
 /* ---- Platform detection ---- */

src/CMakeLists.txt

@@ -411,6 +411,17 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 		XCODE_ATTRIBUTE_DEPLOYMENT_POSTPROCESSING[variant=Release] YES
 	)
 
+	# Bundle the crashpad_handler (if enabled)
+	if(TARGET crashpad_handler)
+		message(FATAL_ERROR "crashpad_handler is not supported for macOS builds (it does not support sandboxed apps)")
+		# But if we *could* use it, we'd bundle it as follows:
+		# Use a post-build step to copy it to the executables folder in the app bundle
+		#add_custom_command(TARGET warzone2100 POST_BUILD
+		#	COMMAND ${CMAKE_COMMAND} -E copy_if_different
+		#	$<TARGET_FILE:crashpad_handler> $<TARGET_FILE_DIR:warzone2100>
+		#)
+	endif()
+
 	if(WZ_ENABLE_BACKEND_VULKAN)
 		# Vulkan / MoltenVK
 		find_package(Vulkan)
@@ -622,13 +633,12 @@ endif()
 
 # Support crashpad sentry backend - requires installation of helper binary to handle crashes
 if(TARGET crashpad_handler)
-	if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-		message(FATAL_ERROR "crashpad_handler is not currently supported for macOS builds")
-	endif()
-	install(TARGETS crashpad_handler COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
-	if(WIN32 AND TARGET crashpad_wer)
-		# On Windows, also install the crashpad_wer.dll (if built with support)
-		install(TARGETS crashpad_wer RUNTIME COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
+	if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+		install(TARGETS crashpad_handler COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
+		if(WIN32 AND TARGET crashpad_wer)
+			# On Windows, also install the crashpad_wer.dll (if built with support)
+			install(TARGETS crashpad_wer RUNTIME COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}")
+		endif()
 	endif()
 endif()
 

src/input/manager.cpp

@@ -27,7 +27,6 @@
 
 #include "manager.h"
 #include "context.h"
-#include "config.h"
 #include "mapping.h"
 
 #include "../keybind.h"

src/multistat.cpp

@@ -952,7 +952,7 @@ class KnownPlayersDB {
 		// Begin transaction
 		SQLite::Transaction transaction(*db);
 
-		auto mutedTimeValue = mutedTime.has_value() ? mutedTime.value().time_since_epoch().count() : 0;
+		int64_t mutedTimeValue = static_cast<int64_t>(mutedTime.has_value() ? mutedTime.value().time_since_epoch().count() : 0);
 
 		query_insertNewPlayerOptions->bind(1, publicKeyb64);
 		query_insertNewPlayerOptions->bind(2, name);

vcpkg.json

@@ -53,9 +53,6 @@
 			"host": true
 		}
 	],
-	"overrides": [
-		{ "name": "sqlite3", "version": "3.40.1" }
-	],
 	"default-features": [
 		"vulkan"
 	],