From nobody Tue Feb 21 19:25:52 2023 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 4PLq5F1ZqSz3t6vg; Tue, 21 Feb 2023 19:25:53 +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 4PLq5D2xtZz421K; Tue, 21 Feb 2023 19:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677007552; 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=ZB/b+3ilvkXgwONBHpxOngfW0mWLjPy1HwPcRIfzfv8=; b=uZQccqlXnRkK6Jo3gJG9kadfMOUvo5U0Q1zZZ7xr+jx401yZeTqV98nzDOKgqHjWVU99BW VjIvghRo08pepWz4ItSYVhs4Rph1SfxBbCElsK+JIAmaFdDzkqyGRGw/m+GyRPpXk1We60 Vmm94d3JQnVqGECdITcNzbkbwx291ZgBg3V2f0iA0ubmTA47HoD7zpahr+EvxrkaDfoPDI bjNF7jpr0GF60hFcYIr6Hg/6QitcHOq4RbDLnId3zmRy4Lo20V75Y+wdJ2DgVG1W7EMMG+ Y3ctdvJaE2dpInLh3gF1ci/8pWRVpjWqDIJn7EqT0rO7TdRT5stJQqeY64B9ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677007552; 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=ZB/b+3ilvkXgwONBHpxOngfW0mWLjPy1HwPcRIfzfv8=; b=NjIdJv+bavJPXixdvuZ/TOMcV6pPYp5oUpJAu6TncCR38iGdCyvGx5tc9L6RVHGPCx/xnX +1pvtQSL0OYRY73yT6JNzSrJnEmq1GtgirLCCm87riysyYjLswSAHuVRTUVpIWetG0gzF/ DDI9PwH6AvuYZ4kXW+aCdAPxxe84BupC59eeMc642qJ3PaMohuwK9t1wG2oEGCDd3TiseD SdhsijqacxdjHANHLQtmhn0geOtgEC//fBSZeooSPJomKg5FK7Q6PBpSm/BMlccGCNTwOr FEiiYJhg9/BssuCePsOiNXEM4qGi9UXSU+vaFS1ZJ49keNbxNOdZdo8tpF8K+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677007552; a=rsa-sha256; cv=none; b=YXXAKCBZgdOJpnrVBOK54qTyxhJDXGjHQzuMAP9lKHkiUMAprGrHnTc9in0XpZiDY5DCtu v8/BacouhrusoMm70zp1RNy3RaS/xH73CwBsNTtczWmZo9X5EbFRabXgso+6AD8yII+s9Z 6KRTHBGg3nuYxsUFD1SdRGPnmIIMg6aParOK34xpJOVkcEWbIDCEX/snVbBwtdfyCRS+9q 9WOCfklzTk5RVwbLxTe8o+JFTJ/ruj2Dafdo+0PLoWciAiTh32igv8I84APpGcrEGyz3w4 AH2uCn23dhS/pZfv2swwoHdbgZtbY1SIQ7/BaNIZ57ywZA89uHGY4tXZARMfqA== 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 4PLq5D1w3WzXpk; Tue, 21 Feb 2023 19:25:52 +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 31LJPq5R081431; Tue, 21 Feb 2023 19:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LJPqbj081430; Tue, 21 Feb 2023 19:25:52 GMT (envelope-from git) Date: Tue, 21 Feb 2023 19:25:52 GMT Message-Id: <202302211925.31LJPqbj081430@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 7303f13e5f30 - main - graphics/wings: fix build after 5f8fd4b88b0ff05948d2c608c16ac9eb692eae97 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7303f13e5f3098fdcbc114d3790534cd0b8c8d30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7303f13e5f3098fdcbc114d3790534cd0b8c8d30 commit 7303f13e5f3098fdcbc114d3790534cd0b8c8d30 Author: Christoph Moench-Tegeder AuthorDate: 2023-02-21 19:25:04 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-02-21 19:25:04 +0000 graphics/wings: fix build after 5f8fd4b88b0ff05948d2c608c16ac9eb692eae97 by pulling in the appropriate patch from upstream --- graphics/wings/files/patch-src_wings__frame.erl | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/graphics/wings/files/patch-src_wings__frame.erl b/graphics/wings/files/patch-src_wings__frame.erl new file mode 100644 index 000000000000..34e7526a7c99 --- /dev/null +++ b/graphics/wings/files/patch-src_wings__frame.erl @@ -0,0 +1,29 @@ +commit 94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37 +Author: acxz <17132214+acxz@users.noreply.github.com> +Date: Thu Aug 4 20:10:53 2022 -0400 + + ifndef `wxID_OSX_*` for erlang 25.0 + +diff --git src/wings_frame.erl src/wings_frame.erl +index f6c13c71..3ec6bb83 100644 +--- src/wings_frame.erl ++++ src/wings_frame.erl +@@ -37,10 +37,18 @@ + -define(IS_SPLIT(WinProp), (element(1, WinProp) =:= split + orelse element(1, WinProp) =:= split_rev)). + ++-ifndef(wxID_OSX_HIDE). + -define(wxID_OSX_HIDE, 5250). ++-endif. ++-ifndef(wxID_OSX_HIDEOTHERS). + -define(wxID_OSX_HIDEOTHERS, 5251). ++-endif. ++-ifndef(wxID_OSX_SHOWALL). + -define(wxID_OSX_SHOWALL, 5252). ++-endif. ++-ifndef(wxID_OSX_MENU_LAST). + -define(wxID_OSX_MENU_LAST, 5255). ++-endif. + + %% API %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +