From nobody Wed Oct 26 20:30:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MyL5h51Ggz4fxfS; Wed, 26 Oct 2022 20:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MyL5h4THrz43hW; Wed, 26 Oct 2022 20:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666816200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QhFIWHDv/kdCBserkjBNAAAS57ppieVRJv+sujyIRbo=; b=W4NytCv18KNdX6YG47XOiOWkEz8GnwR/j1DCk1IFOBoRWEpi3iefXxB97Z05IOcpjN4uqI 5cxGSB2IDyc1W3mEvk4Tz5C5F1z2OCQA1Fe5sinYThb3zn6dd1euJQ0kO8CD2tIjTgWbX+ v/zw/qgNGcD2WtM4amecj8G/6f34T/9ftdp8vv9aWHekmdf/52wJreVdNnfyUPjBSbRhwL Yb/E+F8bttpsSVKn0nRD3IL1+qeFi6UgzTnMKWK34vxLoAhh7XqLpHTUlVKktyKl8ATogY ljZFNB9UsahQMEMd3qcr+INEebFc05UZZzyzDTOS148fIk48evxrJELHcjWI1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MyL5h3RRXzWkh; Wed, 26 Oct 2022 20:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29QKU0FX096539; Wed, 26 Oct 2022 20:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QKU08i096525; Wed, 26 Oct 2022 20:30:00 GMT (envelope-from git) Date: Wed, 26 Oct 2022 20:30:00 GMT Message-Id: <202210262030.29QKU08i096525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 5471bfa17baf - main - math/saga: Forgotten changes to the files dir List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5471bfa17bafa6a89d21f18d44386779ed1f0ccb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666816200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QhFIWHDv/kdCBserkjBNAAAS57ppieVRJv+sujyIRbo=; b=qu0qU1SGzufHp20yAf3npKe6q5nSHTLyfiElZ2UGc8vTcksxp0geAcEZI5DHAbye9Ggkz8 BG1RPiYAO0Zo8V1e62ab/b7jPzwtTAc6HgLVLyBJzr7XTuVrl+0j5R4J/pOAQVjKojiome QL9P9BV1phkOIcZXAoCwwFkCdFrhpyKiSpg6oO5FuU0l9u36XdUOBZwSu5bHtw67WD5Wth Y+50R7fn62oqsRNJIqVi8NJhYaAI5Ay1KLlIE9uFoZs6m5+gul47RiLCgvFpQk6GIxW+Fw FSC6nckchDf6y4zQdIMrfV3925bvQjgXEtDT7L5QWx+/5CNyIc3yY1gAbyN2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666816200; a=rsa-sha256; cv=none; b=yFeLwF8odDxHb1Q96HiIt4FJG/VL/4KB/wfJLqy1VyS949gztxt89V6Xio8JqzdoczwbzG h2GpwZAbkKj8zA+NOhsAEPDPY1cEk/ZGXo9MOxQPVC7iK0t/l0Psl4c+JCBvqamdo+7oiX 6g2BSlbJkUifCbFZdkZ2CZ2luc8ss1nAvF9u08jg/ffowrmAITeefKfjxSa3ZQI73OkNGU bdCy/3Lrn+wYO5UXwRxP6XqKU5m+F3SzQX0TkCoCsoyoSTlzBUodT/2TXi++YBuf9WSQtb VD2UeJRdU0L4M5Ih3J29Yd+K7qyCWuLRMaoEWpUB9PvBS/6gM67JSSvMPj/Now== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=5471bfa17bafa6a89d21f18d44386779ed1f0ccb commit 5471bfa17bafa6a89d21f18d44386779ed1f0ccb Author: Rainer Hurling AuthorDate: 2022-10-26 20:26:19 +0000 Commit: Rainer Hurling CommitDate: 2022-10-26 20:26:19 +0000 math/saga: Forgotten changes to the files dir In commit 9bdd8719 all changes in files dir are missing, sorry for this. --- math/saga/files/patch-CMakeLists.txt | 12 ++ .../patch-src_saga__core_saga__gui_CMakeLists.txt | 11 ++ .../patch-src_saga__core_saga__gui_dlg__about.cpp | 132 +++------------------ .../patch-src_saga__core_saga__gui_saga__frame.cpp | 14 --- 4 files changed, 37 insertions(+), 132 deletions(-) diff --git a/math/saga/files/patch-CMakeLists.txt b/math/saga/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..deb37033b69a --- /dev/null +++ b/math/saga/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2022-08-28 17:59:56 UTC ++++ CMakeLists.txt +@@ -21,6 +21,9 @@ endif() + set(CMAKE_BUILD_TYPE Release) + endif() + ++set(COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") ++add_definitions(-DCOMPILER="${COMPILER}") ++ + if(MSVC) + set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) + 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 new file mode 100644 index 000000000000..eeacfc3ca8fc --- /dev/null +++ b/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/saga_core/saga_gui/CMakeLists.txt.orig 2022-08-31 16:51:39 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() 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 2d85097d5851..1feeea3cc27a 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,120 +1,16 @@ ---- src/saga_core/saga_gui/dlg_about.cpp.orig 2020-08-25 19:21:15 UTC +--- src/saga_core/saga_gui/dlg_about.cpp.orig 2022-09-14 15:41:47 UTC +++ src/saga_core/saga_gui/dlg_about.cpp -@@ -177,6 +177,7 @@ wxString CDLG_About::_Get_Version(void) - s += "http://www.saga-gis.org\n"; - s += "\n"; - s += "Version: " + wxString(SAGA_VERSION) + "\n"; -+ s += "https://sourceforge.net/p/saga-gis/code/ci/release-PORTVERSION/tree/\n"; +@@ -166,12 +166,7 @@ wxString CDLG_About::_Get_Version(void) + #else + s += " (32 bit)
"; + #endif +- #ifdef GIT_HASH +- if( *GIT_HASH ) +- { +- s += "
Git commit hash
[ #" GIT_HASH " ]
"; +- } +- #endif ++ s += "
Git commit hash
[ #" + wxString("GIT_TAGNAME") + " ]
"; + s += "
"; + s += "saga-gis.org"; - #ifdef _SAGA_MSW - #ifdef _WIN64 -@@ -254,13 +255,107 @@ wxString CDLG_About::_Get_Version(void) - #elif defined(__PGI) - "Portland PGCC/PGCPP" - #elif defined(__clang__) -- "Clang/LLVM" -+ #if (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 11.0.1" -+ #elif (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 11.0.0" -+ #elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 10.0.1" -+ #elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 10.0.0" -+ #elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 9.0.1" -+ #elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 9.0.0" -+ #elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 8.0.1" -+ #elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 8.0.0" -+ #elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 7.0.1" -+ #elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 7.0.0" -+ #elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 1) -+ "Clang/LLVM 6.0.1" -+ #elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 0) -+ "Clang/LLVM 6.0.0" -+ #else -+ "Clang/LLVM" -+ #endif - #elif defined(__MINGW32__) - "MinGW" - #elif defined(__GNUWIN32__) - "Gnu-Win32 compiler" - #elif defined(__GNUG__) -- "Gnu C++" -+ #if wxCHECK_GCC_VERSION(9,4) -+ "Gnu C++ 9.4" -+ #elif wxCHECK_GCC_VERSION(9,3) -+ "Gnu C++ 9.3" -+ #elif wxCHECK_GCC_VERSION(9,2) -+ "Gnu C++ 9.2" -+ #elif wxCHECK_GCC_VERSION(9,1) -+ "Gnu C++ 9.1" -+ #elif wxCHECK_GCC_VERSION(9,0) -+ "Gnu C++ 9.0" -+ #elif wxCHECK_GCC_VERSION(8,3) -+ "Gnu C++ 8.3" -+ #elif wxCHECK_GCC_VERSION(8,2) -+ "Gnu C++ 8.2" -+ #elif wxCHECK_GCC_VERSION(8,1) -+ "Gnu C++ 8.1" -+ #elif wxCHECK_GCC_VERSION(8,0) -+ "Gnu C++ 8.0" -+ #elif wxCHECK_GCC_VERSION(7,4) -+ "Gnu C++ 7.4" -+ #elif wxCHECK_GCC_VERSION(7,3) -+ "Gnu C++ 7.3" -+ #elif wxCHECK_GCC_VERSION(7,2) -+ "Gnu C++ 7.2" -+ #elif wxCHECK_GCC_VERSION(7,1) -+ "Gnu C++ 7.1" -+ #elif wxCHECK_GCC_VERSION(7,0) -+ "Gnu C++ 7.0" -+ #elif wxCHECK_GCC_VERSION(6,4) -+ "Gnu C++ 6.4" -+ #elif wxCHECK_GCC_VERSION(6,3) -+ "Gnu C++ 6.3" -+ #elif wxCHECK_GCC_VERSION(6,2) -+ "Gnu C++ 6.2" -+ #elif wxCHECK_GCC_VERSION(6,1) -+ "Gnu C++ 6.1" -+ #elif wxCHECK_GCC_VERSION(6,0) -+ "Gnu C++ 6.0" -+ #elif wxCHECK_GCC_VERSION(5,9) -+ "Gnu C++ 5.9" -+ #elif wxCHECK_GCC_VERSION(5,8) -+ "Gnu C++ 5.8" -+ #elif wxCHECK_GCC_VERSION(5,7) -+ "Gnu C++ 5.7" -+ #elif wxCHECK_GCC_VERSION(5,6) -+ "Gnu C++ 5.6" -+ #elif wxCHECK_GCC_VERSION(5,5) -+ "Gnu C++ 5.5" -+ #elif wxCHECK_GCC_VERSION(5,4) -+ "Gnu C++ 5.4" -+ #elif wxCHECK_GCC_VERSION(5,3) -+ "Gnu C++ 5.3" -+ #elif wxCHECK_GCC_VERSION(5,2) -+ "Gnu C++ 5.2" -+ #elif wxCHECK_GCC_VERSION(5,1) -+ "Gnu C++ 5.1" -+ #elif wxCHECK_GCC_VERSION(5,0) -+ "Gnu C++ 5.0" -+ #elif wxCHECK_GCC_VERSION(4,9) -+ "Gnu C++ 4.9" -+ #elif wxCHECK_GCC_VERSION(4,8) -+ "Gnu C++ 4.8" -+ #elif wxCHECK_GCC_VERSION(4,7) -+ "Gnu C++ 4.7" -+ #elif wxCHECK_GCC_VERSION(4,6) -+ "Gnu C++ 4.6" -+ #else -+ "Gnu C++" -+ #endif - #elif defined(__VISUALC__) // The value of this macro corresponds to the compiler version: 1020 for 4.2 (the first supported version), 1100 for 5.0, 1200 for 6.0 and so on - #if __VISUALC__ == 1020 - "Microsoft Visual C++ 4.2" diff --git a/math/saga/files/patch-src_saga__core_saga__gui_saga__frame.cpp b/math/saga/files/patch-src_saga__core_saga__gui_saga__frame.cpp deleted file mode 100644 index 7b5a27c0c5c0..000000000000 --- a/math/saga/files/patch-src_saga__core_saga__gui_saga__frame.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/saga_core/saga_gui/saga_frame.cpp.orig 2022-10-15 20:07:34 UTC -+++ src/saga_core/saga_gui/saga_frame.cpp -@@ -1290,9 +1290,9 @@ void CSAGA_Frame::TB_Add(wxToolBarBase *pToolBar, cons - void CSAGA_Frame::TB_Add_Item(wxToolBarBase *pToolBar, bool bCheck, int Cmd_ID) - { - if( bCheck ) -- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID), wxITEM_CHECK); -+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), (wxBitmapBundle)IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID), wxITEM_CHECK); - else -- ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID)); -+ ((wxToolBar *)pToolBar)->AddTool(Cmd_ID, CMD_Get_Name(Cmd_ID), (wxBitmapBundle)IMG_Get_Bitmap(CMD_Get_ImageID(Cmd_ID), pToolBar->GetToolBitmapSize()), CMD_Get_Help(Cmd_ID)); - } - - //---------------------------------------------------------