Date: Fri, 17 Apr 2026 04:54:29 +0000 From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 28d6130a78f6 - main - math/saga: Fix patch phase Message-ID: <69e1bd05.334fb.26098844@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=28d6130a78f65fac126c6b53fcbd8f192d375f76 commit 28d6130a78f65fac126c6b53fcbd8f192d375f76 Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2026-04-17 04:48:03 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2026-04-17 04:53:53 +0000 math/saga: Fix patch phase Forgot to commit updated patches, sorry for the breakage. Reported by: pkg-fallout --- math/saga/files/patch-CMakeLists.txt | 13 +++++++++ .../patch-src_saga__core_saga__cmd_saga__cmd.cpp | 34 +++++++++++----------- .../patch-src_saga__core_saga__gui_CMakeLists.txt | 20 ++++++------- .../patch-src_saga__core_saga__gui_dlg__about.cpp | 30 +++++++++---------- ...c_tools_imagery_imagery__svm_MLB__Interface.cpp | 18 ++++++------ ...tch-src_tools_imagery_imagery__svm_svm__grids.h | 18 ++++++------ 6 files changed, 73 insertions(+), 60 deletions(-) diff --git a/math/saga/files/patch-CMakeLists.txt b/math/saga/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cdf09f9cf8b6 --- /dev/null +++ b/math/saga/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2026-04-10 09:39:33 UTC ++++ CMakeLists.txt +@@ -25,6 +25,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C + set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to be used") + set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C++ standard is required") + ++# Get Compiler info for about dialog ++set(COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") ++add_definitions(-DCOMPILER="${COMPILER}") ++ + # Platform dependent compiler requirements and options + if(MSVC) + set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) diff --git a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp index a72556a8534e..b69af21541ad 100644 --- a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp +++ b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp @@ -1,19 +1,19 @@ ---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2024-07-29 13:42:28 UTC +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2026-04-10 09:39:33 UTC +++ src/saga_core/saga_cmd/saga_cmd.cpp @@ -51,6 +51,7 @@ - #include <wx/app.h> - #include <wx/utils.h> - #include <wx/filename.h> -+#include <clocale> - - #include "config.h" - #include "callback.h" -@@ -165,7 +166,7 @@ bool Run(int argc, char *argv[]) - //--------------------------------------------------------- - bool Run(int argc, char *argv[]) - { -- setlocale(LC_NUMERIC, "C"); -+ std::setlocale(LC_NUMERIC, "C"); - - SG_Set_UI_Callback(CMD_Get_Callback()); - + #include <wx/app.h> + #include <wx/utils.h> + #include <wx/filename.h> ++#include <clocale> + + #include "config.h" + #include "callback.h" +@@ -186,7 +187,7 @@ bool Run(int argc, char *argv[]) + //--------------------------------------------------------- + bool Run(int argc, char *argv[]) + { +- setlocale(LC_NUMERIC, "C"); ++ std::setlocale(LC_NUMERIC, "C"); + + SG_Set_UI_Callback(CMD_Get_Callback()); + diff --git a/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt b/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt index 2c580f5ba3f2..54c6be85067b 100644 --- a/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt +++ b/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/saga_core/saga_gui/CMakeLists.txt.orig 2022-08-31 16:51:39 UTC +--- src/saga_core/saga_gui/CMakeLists.txt.orig 2026-04-10 09:39:33 UTC +++ src/saga_core/saga_gui/CMakeLists.txt -@@ -241,7 +241,7 @@ if(GIT_FOUND) - OUTPUT_VARIABLE GIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -- message("git hash: ${GIT_HASH} to ${PROJECT_SOURCE_DIR}/git_hash.h") -+ message("git hash: https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME to ${PROJECT_SOURCE_DIR}/git_hash.h") - else() - message("not a git repository, git hash not found") - endif() +@@ -241,7 +241,7 @@ if(GIT_FOUND) + OUTPUT_VARIABLE GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +- message("git hash: ${GIT_HASH} to ${PROJECT_SOURCE_DIR}/git_hash.h") ++ message("git hash: https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME to ${PROJECT_SOURCE_DIR}/git_hash.h") + else() + message("not a git repository, git hash not found") + endif() diff --git a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp index c8756506992b..50600dba59ee 100644 --- a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp +++ b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp @@ -1,16 +1,16 @@ ---- src/saga_core/saga_gui/dlg_about.cpp.orig 2023-11-14 07:03:55 UTC +--- src/saga_core/saga_gui/dlg_about.cpp.orig 2026-04-10 09:39:33 UTC +++ src/saga_core/saga_gui/dlg_about.cpp -@@ -165,12 +165,7 @@ wxString CDLG_About::_Get_Version(void) - #else - s += " (32 bit)</b><br>"; - #endif -- #ifdef GIT_HASH -- if( *GIT_HASH ) -- { -- s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/" GIT_HASH "\">#" GIT_HASH "</a> ]<br>"; -- } -- #endif -+ s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME \">#" + wxString("GIT_TAGNAME") + "</a> ]<br>"; - s += "<br>"; - s += "<a href=\"https://saga-gis.sourceforge.io/\">saga-gis.org</a>"; - +@@ -165,12 +165,7 @@ wxString CDLG_About::_Get_Version(void) + #else + s += " (32 bit)</b><br>"; + #endif +- #ifdef GIT_HASH +- if( *GIT_HASH ) +- { +- s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/" GIT_HASH "\">#" GIT_HASH "</a> ]<br>"; +- } +- #endif ++ s += "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME \">#" + wxString("GIT_TAGNAME") + "</a> ]<br>"; + s += "<br>"; + s += "<a href=\"https://saga-gis.sourceforge.io/\">saga-gis.org</a>"; + diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp index f7a1fb91b4d2..d6576a8c4c16 100644 --- a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp +++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp @@ -1,11 +1,11 @@ ---- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2018-11-22 07:53:06 UTC +--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2026-04-10 09:39:35 UTC +++ src/tools/imagery/imagery_svm/MLB_Interface.cpp @@ -61,7 +61,7 @@ - #include "MLB_Interface.h" - - #if defined(SYSTEM_SVM) --#include <libsvm/svm.h> -+#include <svm.h> - #else - #include "svm/svm.h" - #endif + #include "MLB_Interface.h" + + #if defined(SYSTEM_SVM) +-#include <libsvm/svm.h> ++#include <svm.h> + #else + #include "svm/svm.h" + #endif diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h index 6e45c563cb6a..263c5d7be303 100644 --- a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h +++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h @@ -1,11 +1,11 @@ ---- src/tools/imagery/imagery_svm/svm_grids.h.orig 2020-08-07 13:46:39 UTC +--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2026-04-10 09:39:35 UTC +++ src/tools/imagery/imagery_svm/svm_grids.h @@ -61,7 +61,7 @@ - - //--------------------------------------------------------- - #if defined(SYSTEM_SVM) -- #include <libsvm/svm.h> -+ #include <svm.h> - #else - #include "svm/svm.h" - #endif + + //--------------------------------------------------------- + #if defined(SYSTEM_SVM) +- #include <libsvm/svm.h> ++ #include <svm.h> + #else + #include "svm/svm.h" + #endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e1bd05.334fb.26098844>