From nobody Tue Oct 25 05:44:39 2022 X-Original-To: dev-commits-ports-all@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 4MxLVc2TgMz4gl3s; Tue, 25 Oct 2022 05:44:40 +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 4MxLVc0fg7z3qqw; Tue, 25 Oct 2022 05:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676680; 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=JJNKgAlw8dLPAvKG7O8vY3JBsw78xhM2XRifR3NRM5w=; b=V1NyfinD9l8d5NH7AqtFChGUTfoYlYTPMkltmLuee4p9wY4zFP8paIOVfefFY4TtUfkj3q UIHkckpkxKQhJa9rLfl+4zGgDLm4Jh5NskyCy2/vwhbCPhX/TkFirLQMWWlsoWJkoBCNes oamk9wWe/jAqamL4eoM41xImZwuL5jMJh/EU7Y8H21X5s/dWYAump0gXth0mXoKS8Vc3qY sv3U8ZQzTCC73Hui/M+SNPDGbCyQEz+fYO6N+GWCYPcSigc/1RlaaaWZt5UvK6w6VCJZuW tEcZszJC4qWp6GjeRRsgHQYTJOGjfBq/dhvS39M29HoNPhAol7l9hGBiGtM1Qg== 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 4MxLVb6tW7zV5h; Tue, 25 Oct 2022 05:44:39 +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 29P5idHQ047845; Tue, 25 Oct 2022 05:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29P5idkH047844; Tue, 25 Oct 2022 05:44:39 GMT (envelope-from git) Date: Tue, 25 Oct 2022 05:44:39 GMT Message-Id: <202210250544.29P5idkH047844@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: ff9b39f22cda - main - lang/erlang-wx: use wx 3.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: ff9b39f22cda90fbacb312fc5be3fe7d83b04350 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666676680; 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=JJNKgAlw8dLPAvKG7O8vY3JBsw78xhM2XRifR3NRM5w=; b=DEVRACcU75OBLE3m0guJL0N/RF1oPf/qO7JCiMaOw1hMc4S9LYBEEghd9LQW1UUg0GWwWX MwBFXpSO4Olr7KhD2WePqqPcPZCMwTQv9ZI7vI5saeY4I8f5SEUjfzNc07caqkSp8VRlrO Q64j1caaC3FZi4Ng5pfvMsQLS+OTCwiJyZbTTwreSJVMlXeM4jMhPaAw3fv7LNNwv57Ea2 9Qaxg7KY+0DeixRTinK4LRzT6yKNslxO8OecINeiCdioW4mqqvWnurRP6pQzY4WwLeyMWE 86l8JnH2bSCV1sx5Rz/rORxrbqJoP80T41h9OVRv+kmKk7W5hvmGpBtmSnZmkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666676680; a=rsa-sha256; cv=none; b=n8rF06z1GNuASRQugGsIbeDqBPsWhWCFieFP3G3/VJiCO7cybw9IivOteGBWXqCkWI7HF9 QASNc0J7cauq67GKKLh5d+5iYSi/KixOW3FhcM28zma10+U4e40ffq35p0WAb0GGeRCazZ v00fXQFZe3b3d2KAngtxMYpfhsG3BlS1gt/xsaSaSJqH17JL8LE9IpkWWiufYWLlV6jqA0 B9tjkmX5bp3FTHStxXjTPN5pQmKNEfKIsuppzv/RKDjZVi1HeXo7o9HXQP6eDAYga5mSQz mCz56lnqSyK79t7mtC4idB8lTildzYU9Qx59pSpqL6xIAMGrUTiC1HkBSkK9xw== 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=ff9b39f22cda90fbacb312fc5be3fe7d83b04350 commit ff9b39f22cda90fbacb312fc5be3fe7d83b04350 Author: Loïc Bartoletti AuthorDate: 2022-10-15 19:19:48 +0000 Commit: Loïc Bartoletti CommitDate: 2022-10-25 05:44:07 +0000 lang/erlang-wx: use wx 3.2 PR: 265093 --- lang/erlang-wx/Makefile | 6 ++---- .../files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile index ef132e9e472d..5c3972371a3b 100644 --- a/lang/erlang-wx/Makefile +++ b/lang/erlang-wx/Makefile @@ -1,7 +1,7 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- DISTVERSION= 24.3.4.6 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel PKGNAMESUFFIX= -wx @@ -21,9 +21,7 @@ USE_GITHUB= yes GH_PROJECT= otp USE_GL= gl glu USE_PERL5= build -USE_WX= 3.1+ - -WX_COMPS= wx +USE_WX= 3.2+ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-threads \ diff --git a/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp b/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp new file mode 100644 index 000000000000..11f2b1475b49 --- /dev/null +++ b/lang/erlang-wx/files/patch-lib_wx_c__src_gen_wxe__wrapper__7.cpp @@ -0,0 +1,11 @@ +--- lib/wx/c_src/gen/wxe_wrapper_7.cpp.orig 2022-10-15 17:50:46 UTC ++++ lib/wx/c_src/gen/wxe_wrapper_7.cpp +@@ -2339,7 +2339,7 @@ void wxToolBar_AddTool_4(WxeApp *app, wxeMemEnv *memen + } else Badarg("Options"); + }; + if(!This) throw wxe_badarg("This"); +- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(toolId,label,*bitmap,shortHelp,kind); ++ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(toolId,label,(wxBitmapBundle)*bitmap,shortHelp,kind); + wxeReturn rt = wxeReturn(memenv, Ecmd.caller, true); + rt.send( rt.make_ref(app->getRef((void *)Result,memenv), "wx")); +