4 files changed, 8 insertions, 53 deletions
diff --git a/games/colobot/files/patch-CMakeLists.txt b/games/colobot/files/patch-CMakeLists.txt
index f0f2a9ddd173..900f19ab98f3 100644
--- a/games/colobot/files/patch-CMakeLists.txt
+++ b/games/colobot/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-08-21 20:57:34 UTC
+--- CMakeLists.txt.orig	2024-12-23 20:22:56 UTC
 +++ CMakeLists.txt
-@@ -115,8 +115,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+@@ -121,8 +121,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
  
      # Platform-dependent implementation of system.h
      # On FreeBSD we can use *_other
@@ -11,36 +11,13 @@
      # To avoid CMake warning
      set(CMAKE_MACOSX_RPATH 1)
  else()
-@@ -155,15 +155,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- 
-     message(STATUS "Detected GCC version 4.7+")
- 
--    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
--    set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-+    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- 
--    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
--        set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wsuggest-override")
--    endif()
--
--    set(RELEASE_CXX_FLAGS "-O2")
--    set(DEBUG_CXX_FLAGS "-g -O0")
-     set(TEST_CXX_FLAGS "-pthread")
-     add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -173,14 +166,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -176,9 +176,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  
      message(STATUS "Detected Clang version 3.1+")
  
 -    if (${PLATFORM_FREEBSD})
 -	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
 -    endif()
--
--    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
--    set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
--    set(RELEASE_CXX_FLAGS "-O2")
--    set(DEBUG_CXX_FLAGS "-g -O0")
-+    set(NORMAL_CXX_FLAGS "-std=c++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
-     set(TEST_CXX_FLAGS "-pthread")
-     add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+ 
+     set(NORMAL_CXX_FLAGS "-Wall -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
+     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
diff --git a/games/colobot/files/patch-data_CMakeLists.txt b/games/colobot/files/patch-data_CMakeLists.txt
deleted file mode 100644
index 456d19b6661f..000000000000
--- a/games/colobot/files/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/CMakeLists.txt.orig	2019-02-23 19:01:32 UTC
-+++ data/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
- option(TRANSLATIONS "Enable translations of help and level files" ON)
- 
- if(TRANSLATIONS)
--    find_package(PythonInterp 2.7 REQUIRED)
-+    find_package(PythonInterp REQUIRED)
- else()
-     message(STATUS "Translations disabled; only English files will be installed")
- endif()
diff --git a/games/colobot/files/patch-src_common_system_system.cpp b/games/colobot/files/patch-src_common_system_system.cpp
index 88d93b0e2ee7..fda36181d426 100644
--- a/games/colobot/files/patch-src_common_system_system.cpp
+++ b/games/colobot/files/patch-src_common_system_system.cpp
@@ -1,4 +1,4 @@
---- src/common/system/system.cpp.orig	2021-08-21 20:57:34 UTC
+--- src/common/system/system.cpp.orig	2024-12-23 20:22:56 UTC
 +++ src/common/system/system.cpp
 @@ -24,7 +24,7 @@
  
@@ -9,7 +9,7 @@
      #include "common/system/system_linux.h"
  #elif defined(PLATFORM_MACOSX)
      #include "common/system/system_macosx.h"
-@@ -43,7 +43,7 @@ std::unique_ptr<CSystemUtils> CSystemUtils::Create()
+@@ -44,7 +44,7 @@ std::unique_ptr<CSystemUtils> CSystemUtils::Create()
      std::unique_ptr<CSystemUtils> instance;
  #if defined(PLATFORM_WINDOWS)
      instance = MakeUnique<CSystemUtilsWindows>();
diff --git a/games/colobot/files/patch-src_common_system_system__linux.cpp b/games/colobot/files/patch-src_common_system_system__linux.cpp
deleted file mode 100644
index f8c50217d45b..000000000000
--- a/games/colobot/files/patch-src_common_system_system__linux.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/system/system_linux.cpp.orig	2021-12-03 22:35:25 UTC
-+++ src/common/system/system_linux.cpp
-@@ -98,7 +98,7 @@ void CSystemUtilsLinux::InterpolateTimeStamp(SystemTim
- 
- void CSystemUtilsLinux::GetCurrentTimeStamp(SystemTimeStamp *stamp)
- {
--    clock_gettime(CLOCK_MONOTONIC_RAW, &stamp->clockTime);
-+    clock_gettime(CLOCK_MONOTONIC, &stamp->clockTime);
- }
- 
- long long CSystemUtilsLinux::TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after)