From nobody Tue Oct 25 05:44:41 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 4MxLVd2RHGz4gl8D; Tue, 25 Oct 2022 05:44:41 +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 4MxLVd1y78z3qtc; Tue, 25 Oct 2022 05:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676681; 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=MOc+YigML+kJ631b4modzSSmoRAUo57Gm+AwUipd1dI=; b=um00JlcHQ4cmrVtMN1LWWzVNFdWYNkM7yj4q6lJ6ssDe35u3MktxDbMjc1TS3LktUBvykC hYJEmWlhxbwwt0evs1R7mbGmnhoV3vEEmh/jvwK7KPqnlpyvql3Y8F+4fRbhQl7V97Yqpn UW9wJPgU7Hx475+3rOTIj54PP5f7eBJo46aEEpdKI38X1oN68NTE2HsgWTV9FFPtFRGV9P b9MPugx5lh0zUeo4T0LgZiyo1GM0CQFtgOcnwsg2Dyl2B00AKxPKEbbVccBNoGhb8qSwuD l0ElGUQc2sODewGli8FmsE4/zwkqToEYaRXZlyDIgrG9uPU/Hpbs+w00du3fMw== 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 4MxLVd13xszVDY; Tue, 25 Oct 2022 05:44:41 +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 29P5ifOx047875; Tue, 25 Oct 2022 05:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P5ifAA047874; Tue, 25 Oct 2022 05:44:41 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:44:41 GMT Message-Id: <202210250544.29P5ifAA047874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc=20Bartoletti?= Subject: git: 6138ef783f5a - main - math/saga: use wx 3.2 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: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6138ef783f5aaa74b4cc4e680cc85fd773334199 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676681; 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=MOc+YigML+kJ631b4modzSSmoRAUo57Gm+AwUipd1dI=; b=WgNU7OJVsA4cJeRrPVkIPLFhXAoafXJRjyAr+YaDvjU0uaVKoqkPFWfDILJp9RfxvoRUPJ Q0+LF4p/oPQ5ygifOgiSNb6ctljWL5dF3AE5hSxhr85eL/Tc/Ew0eFnmuTtTI/V8Ed49Jh PqndL8SQ0MO+b4wwUmZj/sPK6op7mtqyAh5bs92yFHQzUamiyWQBxr5/ol7k2o1ZPwLAXk q8/sHJob/1hv0DCj30UJYJFeutFcpQrw/5CeKy94JvH2Wad7UJbdi0fF9f5bShppQQuJZj VTjiKpM63SlTaLBaGL9Othq+/Zh+hOm7/oABO0qp2bU9YqDBMN/Ka0IVI/8F5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666676681; a=rsa-sha256; cv=none; b=le/ZJMUptbUirGsWJN387GhbjwMZE3HmpzdU/pi2WOML2znwVScEdwNY3G8Lsx30f/7MO0 qRW0l+kyDlLd8AkSHCRaNLwXNJDbXVmvcnqXdeLFlFt/R9Zciu/77hOhloBs73d6Lc6DAs JUujzb8pjE6g19TArwcGgNoYJGvHCVdhgXt2pbzglphAHvTBNNOoDsUTTdGbzHHc5dRrSe 5J8EuplKmqVpw774HTLhLNifcoiliFTyIeWf2AOsNtiP8Vpa/Ve6PPIQ8zb4qNvy2gaw23 oMmoK9nmTfKkWNRiAmt13QsGBzcOG/5pjHClcnxjJwKU5znNfNAttvHH6y/AcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=6138ef783f5aaa74b4cc4e680cc85fd773334199 commit 6138ef783f5aaa74b4cc4e680cc85fd773334199 Author: Loïc Bartoletti AuthorDate: 2022-10-15 20:22:40 +0000 Commit: Loïc Bartoletti 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)); + } + + //---------------------------------------------------------