d/patches: Rebase for new upstream

diff --git a/debian/patches/01_hardcode_git_hash.patch b/debian/patches/01_hardcode_git_hash.patch
index 08baf164bcfc529891c1a3d639dce5369f87921c..c77890e908cae075fefc987b9c9c1bb33d6e38ee 100644 (file)
--- a/debian/patches/01_hardcode_git_hash.patch
+++ b/debian/patches/01_hardcode_git_hash.patch
@@ -12,10 +12,10 @@ Last-Update: 2022-06-30
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 399e2ca..0446e1b 100644
+index 11adeb5..bddb6e2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -34,9 +34,9 @@ endif()
+@@ -36,9 +36,9 @@ endif()
  # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
  # can come from a variety of sources. If you are mirroring the sources or otherwise build when
  # the .git directory is not present, please comment the following line:

diff --git a/debian/patches/03_use_system_threejs.patch b/debian/patches/03_use_system_threejs.patch
index 7efb308d155f573a6f1905cb3a3abb7a9885607d..6ef7e4246a4c07a9a16c0831d5e56420e7b42f3c 100644 (file)
--- a/debian/patches/03_use_system_threejs.patch
+++ b/debian/patches/03_use_system_threejs.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
-index 7303c6f..78d2bd2 100644
+index 7e1b2db..30b577c 100644
 --- a/res/CMakeLists.txt
 +++ b/res/CMakeLists.txt
-@@ -295,7 +295,6 @@ add_resources(
+@@ -313,7 +313,6 @@ add_resources(
      shaders/edge.frag
      shaders/edge.vert
      shaders/outline.vert
@@ -21,10 +21,10 @@ index 7303c6f..78d2bd2 100644
      threejs/SolveSpaceControls.js)
  
 diff --git a/src/export.cpp b/src/export.cpp
-index f1c331f..d3a47b4 100644
+index 5e6ad07..aeadcd4 100644
 --- a/src/export.cpp
 +++ b/src/export.cpp
-@@ -953,7 +953,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
+@@ -955,7 +955,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
      STriangle *tr;
      Vector bndl, bndh;
  
@@ -33,7 +33,7 @@ index f1c331f..d3a47b4 100644
      const std::string HAMMER_FN("hammer-2.0.8.js");
      const std::string CONTROLS_FN("SolveSpaceControls.js");
  
-@@ -1016,7 +1016,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
+@@ -1018,7 +1018,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
      if(filename.HasExtension("html")) {
          fprintf(f, htmlbegin,
                  THREE_FN.c_str(),

diff --git a/debian/patches/04_use_system_unifont.patch b/debian/patches/04_use_system_unifont.patch
index d9438651a8561e0ee2f517c60368010dfeaafaf3..d2154313bdd193be27f076145a470e6f5954c619 100644 (file)
--- a/debian/patches/04_use_system_unifont.patch
+++ b/debian/patches/04_use_system_unifont.patch
@@ -9,19 +9,19 @@ Forwarded: not-needed
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
-index 78d2bd2..64fc439 100644
+index 30b577c..19650cb 100644
 --- a/res/CMakeLists.txt
 +++ b/res/CMakeLists.txt
-@@ -270,7 +270,6 @@ add_resources(
-     locales/tr_TR.po
+@@ -288,7 +288,6 @@ add_resources(
      locales/ru_RU.po
      locales/zh_CN.po
+     locales/ja_JP.po
 -    fonts/unifont.hex.gz
      fonts/private/0-check-false.png
      fonts/private/1-check-true.png
      fonts/private/2-radio-false.png
 diff --git a/src/resource.cpp b/src/resource.cpp
-index d3fa4ca..f687894 100644
+index 8921d7a..497ef38 100644
 --- a/src/resource.cpp
 +++ b/src/resource.cpp
 @@ -669,7 +669,7 @@ size_t BitmapFont::GetWidth(const std::string &str) {

diff --git a/debian/patches/10_increase_min_cmake.patch b/debian/patches/10_increase_min_cmake.patch
deleted file mode 100644 (file)
index 6998552..0000000
--- a/debian/patches/10_increase_min_cmake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Increase minimal cmake version.
-Author: Anton Gladky <gladk@debian.org>
-Bug-Debian: https://bugs.debian.org/1113526
-Last-Update: 2025-10-11
-
---- solvespace-3.1+ds1.orig/extlib/mimalloc/CMakeLists.txt
-+++ solvespace-3.1+ds1/extlib/mimalloc/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.0)
-+cmake_minimum_required(VERSION 3.10)
- project(libmimalloc C CXX)
- 
- set(CMAKE_C_STANDARD 11)
---- solvespace-3.1+ds1.orig/extlib/mimalloc/test/CMakeLists.txt
-+++ solvespace-3.1+ds1/extlib/mimalloc/test/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.0)
-+cmake_minimum_required(VERSION 3.10)
- project(mimalloc-test C CXX)
- 
- set(CMAKE_C_STANDARD 11)

diff --git a/debian/patches/series b/debian/patches/series
index 9646fb0e4a0b79abf1f68850e801c988d69d16aa..4745fc7da062a2f378b335e49efe85528876fff7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_add_debian_pkg_version.patch
 03_use_system_threejs.patch
 04_use_system_unifont.patch
-10_increase_min_cmake.patch