Date: Tue, 25 Oct 2022 05:44:41 GMT From: =?utf-8?Q?Lo=C3=AFc=20Bartoletti?= <lbartoletti@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6138ef783f5a - main - math/saga: use wx 3.2 Message-ID: <202210250544.29P5ifAA047874@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=6138ef783f5aaa74b4cc4e680cc85fd773334199 commit 6138ef783f5aaa74b4cc4e680cc85fd773334199 Author: Loïc Bartoletti <lbartoletti@FreeBSD.org> AuthorDate: 2022-10-15 20:22:40 +0000 Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org> CommitDate: 2022-10-25 05:44:07 +0000 math/saga: use wx 3.2 PR: 265093 --- math/saga/Makefile | 4 ++-- .../files/patch-src_saga__core_saga__gui_saga__frame.cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/math/saga/Makefile b/math/saga/Makefile index a6786d759d2a..56a7f7342eb2 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,6 +1,6 @@ PORTNAME= saga PORTVERSION= 8.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -37,7 +37,7 @@ USES= cmake compiler:c++11-lib dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes -USE_WX= 3.1+ +USE_WX= 3.2+ CMAKE_ARGS+= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h CMAKE_ON= WITH_DEV_TOOLS WITH_EXCERCISES WITH_MRMR WITH_SYSTEM_SVM 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 new file mode 100644 index 000000000000..7b5a27c0c5c0 --- /dev/null +++ b/math/saga/files/patch-src_saga__core_saga__gui_saga__frame.cpp @@ -0,0 +1,14 @@ +--- 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)); + } + + //---------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210250544.29P5ifAA047874>