From nobody Sun Apr 9 00:55:19 2023
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 4PvDD75HXXz4556R;
Sun, 9 Apr 2023 00:55:19 +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 4PvDD72LG8z3qMT;
Sun, 9 Apr 2023 00:55:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681001719;
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=9MBrTjdk2bVQd6b1M+QZua2SrHFb7SciMsiXifvrXCw=;
b=aMD8/y3NJWiIPJtSz8hs4sOvvqbyTv+xslkat32qQe024sqUuTqkDKKnf9hTKbW6tkR4gp
2NFiSBwrzcfx9PNW8evoBccRXfgoTUF1b9BvAYp5B23e0JwZKQfsBhxXQ+gRWyBdCjhec6
vJ6IBdAYKasZAEBSU9UHgsk43b1JxdvZ0Dbyi8jPtLtfLTYqO+r0cmr3mKylTrjmM0uvac
CaVI6lAF1VRzjP8ZgSK+il2DODEk7ubhHMKXPQX5YFzS5nA+VMPA58tjvKVoyNT+1rD0LQ
iDsK1QKBAKnokl0ARTk2Q9BwjQrqVCAluySqzCG7bX/BzS52ntNcdkCl2pUiag==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681001719;
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=9MBrTjdk2bVQd6b1M+QZua2SrHFb7SciMsiXifvrXCw=;
b=s0tYlqTabi1hB1QDw2TGJBjL9WIyZObjYuGK2Hxn27e6B8BXN0GaQ6xona2TQIluFQGtUo
kh9a/Qr8MgxxjOX8ZH27aFjwa9zweSfBsYPzyPdKNbd4aPSyEljeFmlM49gCRvyhJCHbYR
Cr2WqyX35Yv+WnX7B4W7PfmCMFKb1pB3FWNWPLUscI7WtdO77ElAUH1Tw4zuqAv6gPWRHp
4Bjb41jlSmdXJAeu1XyxXUQaAwQFU6XGx+E8OoIJ9Vh2HP44YNgR9Ilqo2DtUPl8jrEaBE
XL7U0hcSbriRqu+amEWGAPVhp85cnshxf7Y7WKEj+kpSAvfBrxDbBDvZ+y1T/A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681001719; a=rsa-sha256; cv=none;
b=Y+gTSA7J1QkE80rACk5iZXOj7mlV0r2Sx6modhiRC7jBL/js+QsIVkMvjwvmupztWxgDuF
PfO78jqJqAmkMwa2t29GJgfq5x+n1XmJpSnDE1cU0h8V+G8ThbX5dN3uxebeFLDvcj5aJJ
/dOik53peW5TtNgYIs2AbzfzPPHczWJxmaLLHAxnlc39sjo+pDO+g7cpdA5UPoPtMwz8wx
WQzQoSCDNIKlfOxLWBMXBMt7sjdnwXCBIpVwwnlDB0sC93tbSRX1u+JzmWgSMm0QLcgpeD
j1HI61pPP5p3673ondkD+G7uJQSOjpwmAAr2ke1pg50/3W2LbY1NP3cKhkBeNg==
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 4PvDD71GLpzpJ8;
Sun, 9 Apr 2023 00:55:19 +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 3390tJlp027565;
Sun, 9 Apr 2023 00:55:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3390tJG9027564;
Sun, 9 Apr 2023 00:55:19 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 00:55:19 GMT
Message-Id: <202304090055.3390tJG9027564@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Craig Leres
Subject: git: c3c2129c94d5 - main - devel/{p4,p4api}: Unbreak build on arm
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: leres
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: c3c2129c94d55bb857ff2bbb07a81779efc70fd4
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by leres:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c3c2129c94d55bb857ff2bbb07a81779efc70fd4
commit c3c2129c94d55bb857ff2bbb07a81779efc70fd4
Author: Craig Leres
AuthorDate: 2023-04-09 00:54:52 +0000
Commit: Craig Leres
CommitDate: 2023-04-09 00:54:52 +0000
devel/{p4,p4api}: Unbreak build on arm
Also change devel/p4api to use devel/p4 files/patches and distinfo.
PR: 270531
Approved by: antonfb@hesiod.org (maintainer)
---
devel/p4/files/patch-Jamrules | 6 +++---
devel/p4/files/patch-zlib_deflate.c | 11 +++++++++++
devel/p4api/Makefile | 4 ++++
devel/p4api/distinfo | 3 ---
devel/p4api/files/patch-Jamrules | 28 ----------------------------
5 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules
index d89bc59e9d54..c63b4f543364 100644
--- a/devel/p4/files/patch-Jamrules
+++ b/devel/p4/files/patch-Jamrules
@@ -1,6 +1,6 @@
---- Jamrules.orig 2018-02-01 21:40:54 UTC
+--- Jamrules.orig 2023-01-19 09:37:52 UTC
+++ Jamrules
-@@ -449,12 +449,11 @@
+@@ -673,12 +673,11 @@
# P4BIN is set to ../p4-bin (relative to P4)
SubDir AllP4 p4 ; # where we are
@@ -14,7 +14,7 @@
$(BUILD)
$(TYPE:L) ;
-@@ -931,11 +930,6 @@
+@@ -1224,11 +1223,6 @@
OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;
_mflags = ;
diff --git a/devel/p4/files/patch-zlib_deflate.c b/devel/p4/files/patch-zlib_deflate.c
new file mode 100644
index 000000000000..b1c8c81fe1de
--- /dev/null
+++ b/devel/p4/files/patch-zlib_deflate.c
@@ -0,0 +1,11 @@
+--- zlib/deflate.c.orig 2023-04-08 02:21:18 UTC
++++ zlib/deflate.c
+@@ -56,7 +56,7 @@
+ * Perforce change. Disable neon speedup (for now)
+ * on Apple M1 builds.
+ */
+-#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__)
++#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) || defined( OS_FREEBSD ) ) && defined(__aarch64__)
+ #undef __ARM_NEON__
+ #undef __ARM_NEON
+ #endif
diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile
index 3cb2963f3d19..970e1f63335e 100644
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@@ -19,6 +19,10 @@ BUILD_DEPENDS= ${JAM}:devel/jam
USES= tar:tgz
+PATCHDIR= ${.CURDIR}/../p4/files
+
+DISTINFO_FILE= ${.CURDIR}/../p4/distinfo
+
OPTIONS_DEFINE= EXAMPLES
WRKSRC= ${WRKDIR}/p4source-${PORTVERSION}
diff --git a/devel/p4api/distinfo b/devel/p4api/distinfo
deleted file mode 100644
index 895f00dbc4d1..000000000000
--- a/devel/p4api/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1679584778
-SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b
-SIZE (p4source-2407422.tgz) = 6325949
diff --git a/devel/p4api/files/patch-Jamrules b/devel/p4api/files/patch-Jamrules
deleted file mode 100644
index d89bc59e9d54..000000000000
--- a/devel/p4api/files/patch-Jamrules
+++ /dev/null
@@ -1,28 +0,0 @@
---- Jamrules.orig 2018-02-01 21:40:54 UTC
-+++ Jamrules
-@@ -449,12 +449,11 @@
- # P4BIN is set to ../p4-bin (relative to P4)
-
- SubDir AllP4 p4 ; # where we are
-- SubDir AllP4 p4-bin ; # where we want to be
-+ SubDir AllP4 p4 p4-bin ; # where we want to be
- SubDir P4BIN ; # name is that
- SubDir AllP4 p4 ; # back to where we started
-
- EXEC_SUB_TOKENS =
-- $(OS:L)$(OSVER:EL)$(OSPLAT:EL)
- $(BUILD)
- $(TYPE:L) ;
-
-@@ -931,11 +930,6 @@
- OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;
-
- _mflags = ;
-- switch $(OSPLAT:U)
-- {
-- case X86 : _mflags = -m32 ;
-- case X86_64 : _mflags = -m64 ;
-- }
-
- $(GENFLAGS) += $(_mflags) -pipe ;
- LINKFLAGS += $(_mflags) ;
From nobody Sun Apr 9 01:31:47 2023
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 4PvF2C4Rb7z456yd;
Sun, 9 Apr 2023 01:31:47 +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 4PvF2C3qZyz3Hqs;
Sun, 9 Apr 2023 01:31:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681003907;
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=sIl3iDrS//ANSigsS11UIms/DLR02vHkYaZJt2YJFu0=;
b=tuhwxMZ0jprWG6QGxfPm/qeTWhbl0dmK3D2LEU0AQVgXfY/HBf8UdQ+Ne8a5IqHudn2a4F
3FjizGpNHy6CKy/zukIcp7x0MHNEhGpnJgUOo6LVfGWA0EL31i9CEERNE1wtfEbFR9u7SS
anNx8K3dF/PFk8hKAy7ciqmd4SOQmsfBcQChvjerfXKvMgJyok28tDww5Z6+nuCGJrAsu8
mA+rNcF+ja+0MrF4bFMKzVEDiKMK2dcFxDvCnN5sS+tOg6rNC2HjoVp4/3+mQy+dF9b+LJ
iSz44HY2zGQ2Gf4PhJspcDdky+e0ILaU3yBvq9xMsBizJVUTchoUglsavvwleA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681003907;
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=sIl3iDrS//ANSigsS11UIms/DLR02vHkYaZJt2YJFu0=;
b=ILsKq3FrPmpSZhBMEOvnv5jI007i4YUT/2mnxosixpHd/RXN9rYT7ViVaKJudGIDW7HYNg
BhmZv3Th+BiBlZxvax1GYZNfqE4m2s8t/FHzvBgmURY7yPh4XhwJ8ep2XrNbvT58nwekb2
FlNwSgTTVm8YL/73G3JNleJ/r235STBxke0fj39V86hHQX38fmxROXTLop/voRBdM+NCFQ
hysdkz96+OV1OYcv50coN6iE+mwLu/8zf+pcTS2Xi3ghYiLohe3AqBNbvPl6/Ybg1pa9DE
q8p/mmTQ1ufeGaHu9UOoEq2Ep2w0NeRb3SSAE4iYyH6tjoMpoj97r73zxSDcgA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681003907; a=rsa-sha256; cv=none;
b=W9+z0BNos1odFkhpapRdT/wTLyXNt6itNxZtAxK6DPiTdVp02oRDCzJMhtan0xOzYGxmZQ
Es/ybp+SrBKBHXIy8YBxrIbJB0d3zd9uhiiMudrPMCV90F1KJxWNIotouwR21Dl/0ReFYn
+mu2pNzby6HXDqTKmW2wB+P31njPzJnGGoj6Cwd07IKJuV3FB/9EOTuP68eEUxEsFqO96K
/Cv1LqYCl1RS0mJxvI/AoE44wJKv9bjRJaYPFzYt6e2H8d2r8kzqkmHRMQcn6nv4kc0sMw
/FJtm4mQJfkr4tRvYtqBCU7qfvTMujgUIhW6sjzDnp4Ki4ayqjSZV0J76yuu1A==
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 4PvF2C2qMFzpmS;
Sun, 9 Apr 2023 01:31:47 +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 3391Vl2l090059;
Sun, 9 Apr 2023 01:31:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3391VlSO090058;
Sun, 9 Apr 2023 01:31:47 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 01:31:47 GMT
Message-Id: <202304090131.3391VlSO090058@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Craig Leres
Subject: git: 021ceba2e89a - main - devel/py-p4python: Update to 2022.2.2425690
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: leres
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 021ceba2e89a7da47ed25e982713d9a63a4766c6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by leres:
URL: https://cgit.FreeBSD.org/ports/commit/?id=021ceba2e89a7da47ed25e982713d9a63a4766c6
commit 021ceba2e89a7da47ed25e982713d9a63a4766c6
Author: Craig Leres
AuthorDate: 2023-04-09 01:31:00 +0000
Commit: Craig Leres
CommitDate: 2023-04-09 01:31:00 +0000
devel/py-p4python: Update to 2022.2.2425690
Remove BROKEN (this version is 7 years newer). Python 2 no longer
supported.
PR: 270704
Approved by: antonfb@hesiod.org (maintainer)
---
devel/py-p4python/Makefile | 7 +-
devel/py-p4python/distinfo | 6 +-
devel/py-p4python/files/patch-P4PythonDebug.cpp | 10 --
devel/py-p4python/files/patch-setup.py | 126 +++++++++------------
.../py-p4python/files/patch-tools_PlatformInfo.py | 13 +++
5 files changed, 74 insertions(+), 88 deletions(-)
diff --git a/devel/py-p4python/Makefile b/devel/py-p4python/Makefile
index 73f0f3160f54..459b600327d9 100644
--- a/devel/py-p4python/Makefile
+++ b/devel/py-p4python/Makefile
@@ -1,19 +1,16 @@
PORTNAME= p4python
-PORTVERSION= 2016.1.1447008
-PORTREVISION= 2
+PORTVERSION= 2022.2.2425690
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= antonfb@hesiod.org
COMMENT= Python bindings for the Perforce API
-WWW= https://www.perforce.com/perforce/r14.2/manuals/p4script/python.programming.html
+WWW= https://www.perforce.com/manuals/p4python/Content/P4Python/Home-p4python.html
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BROKEN_riscv64= fails to build: TypeError: can only concatenate str (not "NoneType") to str
-
BUILD_DEPENDS+= ${LOCALBASE}/lib/perforce/libclient.a:devel/p4api
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/py-p4python/distinfo b/devel/py-p4python/distinfo
index 80f6846c2293..643ecdb71f90 100644
--- a/devel/py-p4python/distinfo
+++ b/devel/py-p4python/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517419395
-SHA256 (p4python-2016.1.1447008.tar.gz) = 1907f3c7ace54763651c1ccf20b92e6e9e72de58b240c591d6291ebb24ef0f1b
-SIZE (p4python-2016.1.1447008.tar.gz) = 84231
+TIMESTAMP = 1680624240
+SHA256 (p4python-2022.2.2425690.tar.gz) = 3d2a6135b7cc31226d71a056d14abe7b2e120e683e93a6187e651480d2ad64df
+SIZE (p4python-2022.2.2425690.tar.gz) = 83439
diff --git a/devel/py-p4python/files/patch-P4PythonDebug.cpp b/devel/py-p4python/files/patch-P4PythonDebug.cpp
deleted file mode 100644
index 9509bb0aaa24..000000000000
--- a/devel/py-p4python/files/patch-P4PythonDebug.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- P4PythonDebug.cpp.orig 2023-04-01 20:37:16 UTC
-+++ P4PythonDebug.cpp
-@@ -29,6 +29,7 @@ $Id$
- #include
- #include
-
-+#include
- #include
-
- #include "P4PythonDebug.h"
diff --git a/devel/py-p4python/files/patch-setup.py b/devel/py-p4python/files/patch-setup.py
index 5d7c2e3daa40..20229a81115d 100644
--- a/devel/py-p4python/files/patch-setup.py
+++ b/devel/py-p4python/files/patch-setup.py
@@ -1,73 +1,59 @@
---- setup.py.orig 2018-02-02 16:50:17 UTC
+--- setup.py.orig 2023-04-04 23:31:58 UTC
+++ setup.py
-@@ -102,7 +102,12 @@ class P4APIFtp:
-
- elif system == "FreeBSD":
- platform_str += "freebsd"
-- release = uname.release
-+ if sys.version_info.major == 3:
-+ release = uname.release
-+ elif sys.version_info.major == 2:
-+ release = uname[2]
-+ else:
-+ raise Exception("Unknown python version %s" % sys.version)
-
- value = int(''.join(itertools.takewhile(lambda s: s.isdigit(), release)))
-
-@@ -217,6 +222,8 @@ class VersionInfo:
- verFile = os.path.join(p4ApiDir, "sample", "Version")
- if not os.path.exists(verFile):
- verFile = os.path.join(p4ApiDir, "Version")
-+ if not os.path.exists(verFile):
-+ verFile = os.path.join(p4ApiDir, "share", "examples", "p4api", "Version")
- input = open(verFile)
- for line in input:
- for pattern, handler in self.patterns:
-@@ -398,9 +405,16 @@ class PlatformInfo:
- arch = self.architecture(unameOut[4])
- elif unameOut[0] == 'FreeBSD':
- unix = "FREEBSD"
-- release = unameOut[2][0]
-- if release == '5':
-- release += unameOut[2][2]
-+ if sys.version_info.major == 3:
-+ release = unameOut.release.split(".")[0]
-+ if release == '5':
-+ release += unameOut.release.split(".")[1]
-+ elif sys.version_info.major == 2:
-+ release = unameOut[2].split(".")[0]
-+ if release == '5':
-+ release += unameOut[2].split(".")[1]
-+ else:
-+ raise Exception("Unknown python version %s" % sys.version)
-
- arch = self.architecture(unameOut[4])
- elif unameOut[0] == 'CYGWIN_NT-5.1':
-@@ -475,8 +489,16 @@ def do_setup(p4_api_dir, ssl):
- else:
- print ("API Release %s.%s" % (ryear, rversion))
-
-- inc_path = [p4_api_dir, os.path.join(p4_api_dir, "include", "p4")]
-- lib_path = [p4_api_dir, os.path.join(p4_api_dir, "lib")]
-+ inc_dir = os.path.join(p4_api_dir, "include", "p4")
-+ if not os.path.exists(inc_dir):
-+ inc_dir = os.path.join(p4_api_dir, "include", "perforce")
+@@ -243,7 +243,7 @@ class p4build_ext(build_ext_module):
+ pathToFile = os.path.join(p, "openssl")
+ if os.path.exists(pathToFile) and os.access(pathToFile, os.X_OK):
+ entry = subprocess.check_output("ldd {0} | grep libssl".format(pathToFile),
+- executable="/bin/bash", shell="True")
++ executable="/bin/sh", shell="True")
+ if entry is not False:
+ libpath = os.path.dirname(entry.split()[2])
+
+@@ -275,7 +275,7 @@ class p4build_ext(build_ext_module):
+
+ ssl_ver = ""
+ if not p4_ssl_dir:
+- if (not self.ssl) and (sys.platform == "linux" or sys.platform == "linux2"):
++ if (not self.ssl):
+ # check for a version of SSL already installed via 'openssl version'
+ self.ssl, ssl_ver = self.check_installed_ssl() # return libpath or None
+
+@@ -313,7 +313,7 @@ class p4build_ext(build_ext_module):
+ p4_api_dir = self.apidir
+
+ try:
+- apiVersion = VersionInfo(p4_api_dir)
++ apiVersion = VersionInfo(".")
+ releaseVersion = VersionInfo(".")
+ except IOError:
+ print("Cannot find Version file in API dir {0}.".format(p4_api_dir))
+@@ -334,9 +334,18 @@ class p4build_ext(build_ext_module):
+ #spawn._nt_quote_args = monkey_nt_quote_args
+
+ # add the paths for p4 headers and library
+- inc_path = [str(os.path.join(p4_api_dir, "include", "p4"))]
+- lib_path = [str(os.path.join(p4_api_dir, "lib")), str(p4_ssl_dir)]
++ inc_dir = os.path.join(p4_api_dir, "include", "p4")
++ if not os.path.exists(inc_dir):
++ inc_dir = os.path.join(p4_api_dir, "include", "perforce")
+
++ lib_dir = os.path.join(p4_api_dir, "lib", "perforce")
++ if not os.path.exists(lib_dir):
++ lib_dir = os.path.join(p4_api_dir, "lib")
+
-+ lib_dir = os.path.join(p4_api_dir, "lib", "perforce")
-+ if not os.path.exists(lib_dir):
-+ lib_dir = os.path.join(p4_api_dir, "lib")
++ inc_path = [p4_api_dir, inc_dir]
++ lib_path = [p4_api_dir, lib_dir]
+
-+ inc_path = [p4_api_dir, inc_dir]
-+ lib_path = [p4_api_dir, lib_dir]
- if ssl:
- lib_path.append( ssl )
-
-@@ -608,7 +630,7 @@ if __name__ == "__main__":
- if os.path.exists(distdir):
- shutil.rmtree(distdir, False, force_remove_file)
-
-- p4_api_dir = get_api_dir()
-+ p4_api_dir = "%%LOCALBASE%%"
-
- ssl = None
- if '--ssl' in sys.argv:
++
+ # check if the interpreter is mayapy.exe
+ namedir = os.path.dirname(os.path.dirname(sys.executable))
+ if "maya" in namedir.lower():
+@@ -469,7 +478,7 @@ def cleanup_api(api_dir, tarball):
+
+
+ # declare some evil globals
+-p4_api_dir = ""
++p4_api_dir = "%%LOCALBASE%%"
+ p4_ssl_dir = ""
+ p4_ssl_ver = ""
+ ssl_tarball = ""
diff --git a/devel/py-p4python/files/patch-tools_PlatformInfo.py b/devel/py-p4python/files/patch-tools_PlatformInfo.py
new file mode 100644
index 000000000000..874fb6339737
--- /dev/null
+++ b/devel/py-p4python/files/patch-tools_PlatformInfo.py
@@ -0,0 +1,13 @@
+--- tools/PlatformInfo.py.orig 2023-04-05 20:18:00 UTC
++++ tools/PlatformInfo.py
+@@ -131,9 +131,7 @@ class PlatformInfo:
+ arch = self.architecture(unameOut[4])
+ elif unameOut[0] == 'FreeBSD':
+ unix = "FREEBSD"
+- release = unameOut[2][0]
+- if release == '5':
+- release += unameOut[2][2]
++ release = re.match("(\d+.\d)", unameOut[2]).group(1).replace(".","")
+
+ arch = self.architecture(unameOut[4])
+ elif unameOut[0] == 'CYGWIN_NT-5.1':
From nobody Sun Apr 9 05:46:34 2023
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 4PvLhB6SjGz43flL;
Sun, 9 Apr 2023 05:46:34 +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 4PvLhB60cZz3R6C;
Sun, 9 Apr 2023 05:46:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681019194;
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=gfeHFTf1xRMO2FvXbvC05Sa5t32Qgs1Zf/27DmjbwCU=;
b=ue9x+XQSftJ64VzfBd6XiGmVLH+nSBLz7wse8k4rrustfiPHKyWsib/GHVZ4J4yOOyaQI+
Zu8cKc+JJFsD9dKC4A84Is5tuquiSFb4qvHaEpbw/hLUsOMYarpIUfQYlt9NfOdMq9OUyz
nstspuWe2b74vGS2LmAlrAADPmorWIxCEowY9tvYZVjlUdUmcMdRzt4ev0hhwpiETp2lYZ
hg4w5c2I3EAmYnah5AgMlurdMRjhfjf51HCZj9xLSY5FrFK3wzDfaP0x/LEL+U1DpJtXYg
WLdKOu3WPPLT05VNaPB/hMBcAjcCdLDAJpwqlHSUmIkIkwy0eX4gQbARqnf8jQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681019194;
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=gfeHFTf1xRMO2FvXbvC05Sa5t32Qgs1Zf/27DmjbwCU=;
b=rei4V/+cDh+da86YlMU/17PjbGPXAVNRAwLxOARK9UExjf4wrJyLPJxLk4Cx5Y+Cc0oPbR
hfv3AsYrq+/vPG+tMRYbxF5KZbQ0cp9Hb2sUhJc1wJF1MaDfFEImCyCsqpBK3dTTyx2SIE
vhAPyOAgQxQeknS8ChJKQ9AQmvZZgm8UB/j3kPWMmU2LjuevSWWVZK9QkTUEdn976Kyjo8
k/cxtgleO4aovq3Rxl8oFkwjWECTPQe4KrVtfYHdpLP87ko8rpdUoqP3fYuZGXDuhSN/cm
6TnTkiLgDNanAMi8nIXokj1enTZ6mbStQuT3UPO7g9knTzbM7BER1f2fXOVCWw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681019194; a=rsa-sha256; cv=none;
b=pMaLiX/O9qUX+sRvCGnFXrGgnWP5rpIc6x/XvnhqFqamlUmk9ZWw5hHkJgZ10DK+kU4Cbp
SblWQOtlpwbuWog61dBHqWa3feEjXBx2r026zpvZZ/6CD+anDljZPCVAk5D0iyHdmlMezn
QRSKa03/jN7qJ5rqN8t6ypjS6e0ECBS4bjVrvUF/sbNf655YuFCJKdwDHBHoGyqe0qPsd6
6O1UOycYXHqYCQhpXCWNxIcrFcKxlYU/6/A/u2yIXgG5fTVP1qQqBk772geOJCq0dTZVD4
+Iu+GfGrb7Obq7BjdqBYqwa1sfP0mRenP8vgjE0h7nMw+NHj2vbAHxFBS1f/sg==
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 4PvLhB5199zwl5;
Sun, 9 Apr 2023 05:46:34 +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 3395kYmd004414;
Sun, 9 Apr 2023 05:46:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3395kYHf004413;
Sun, 9 Apr 2023 05:46:34 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 05:46:34 GMT
Message-Id: <202304090546.3395kYHf004413@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Dirk Meyer
Subject: git: b5a37bd131cf - main - net/netmap: fix build with new graphviz
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: dinoex
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b5a37bd131cfb135d3ac5e623c04562827928c4b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b5a37bd131cfb135d3ac5e623c04562827928c4b
commit b5a37bd131cfb135d3ac5e623c04562827928c4b
Author: Dirk Meyer
AuthorDate: 2023-04-09 05:46:10 +0000
Commit: Dirk Meyer
CommitDate: 2023-04-09 05:46:10 +0000
net/netmap: fix build with new graphviz
PR: 270710
MFH: 2023Q2
Display is still possible with dot an a viewer
---
net/netmap/Makefile | 6 +++---
net/netmap/files/patch-README | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 2708c2a7b1f5..8cbbf4e6ba75 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -1,16 +1,16 @@
PORTNAME= netmap
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NetMap%20${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
COMMENT= Make a graphical representation of the surrounding network
WWW= http://netmap.sourceforge.net/
LICENSE= GPLv2
-RUN_DEPENDS= dotty:graphics/graphviz
+RUN_DEPENDS= dot:graphics/graphviz
USES= gmake
diff --git a/net/netmap/files/patch-README b/net/netmap/files/patch-README
new file mode 100644
index 000000000000..8f679a18f675
--- /dev/null
+++ b/net/netmap/files/patch-README
@@ -0,0 +1,21 @@
+--- README.orig 2001-12-23 15:42:29 UTC
++++ README
+@@ -54,3 +54,18 @@ Suggestions, comments and bug-reports welcome!
+ Wouter Godefroy
+ wouter@belgoline.com
+
++
++As dotty was removed in 2022,
++you can use "dot" and any suited viewer for the results.
++
++Some Examples:
++
++dot -Tpdf netmap.pdf netmap.dot
++xpdf netmap.pdf
++
++dot -Tsvg netmap.svg netmap.dot
++gqview netmap.svg
++
++dot -Tpng netmap.png netmap.dot
++xv netmap.png
++
From nobody Sun Apr 9 05:48:19 2023
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 4PvLkC4sW2z43fRV;
Sun, 9 Apr 2023 05:48:19 +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 4PvLkC3ysGz3kNg;
Sun, 9 Apr 2023 05:48:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681019299;
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=q+GHhO/l/NHj7+6OS4rNacXvT0J0taOJpdJzp4jaY1E=;
b=ajzCz21gjHkuCl36oEgK5vneIAFGa7+xwbfKW3mk+OAR8I7DhZgDhtx6Rn5+YYYOE7nYQ9
xDGxa60onsSeI9MVsszwrCZhtEyRfwxCOa09gK7jjAz0Dj2giBqgpmdLbkEjNj0K4QoTWy
wj5uv1DojidbJCidsjGTx6h6qUQAV6L5O+vU741t30aeKED05/gxBJiNS4v3As1kH+sB4u
kSIwx3gP+tSa0tlHPBzcwQcB22kY/Clc9FOXafba+CzaAhUS1mwNGnglE5ZLrs5VKbCopz
uoqrKK6VL2YHr/yBqnWnRCYs+3ZuJK0/Ao6Oq6kU23gnNUerTkjV5aYpozAP5A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681019299;
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=q+GHhO/l/NHj7+6OS4rNacXvT0J0taOJpdJzp4jaY1E=;
b=sSE2b4Xh3/oZMwjZ4PoK1nv5Yuv+aMDVabSC/Y7D+MY77QNiaeFdRw8cuiDvmKj1j00Wv5
P4Umctt1LopsPiC73xbCRnO0DuBhDAqi1vwC1TbK0E+7grYBge0nT4aOFHf6B6j+QcPcW1
KJsBWdipXkrnhLc8lMX/hQhkyOb9N+GW6Wnz/9FgpkO6qoD0BpdPIDinVQJ4tZ6geAgstP
XmLzxQKH4gs5tdckGIjOg7nGEdvm7Wj+d84MRV3aO65ji5Bwpb3Y9Wvp50oRaD1vX2qI0U
kx6VBTmxMc0eejTfcCGcr4hYZMNB9vlBedoACBpSU68IB95kS5QGXDR+8g9ZJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681019299; a=rsa-sha256; cv=none;
b=EVjD4wAU2Ja7IrjjDJak3WdoLliHzawY8MCvouhAkPFuaKvop0iPwIvIHfS1C4ReU/RD0H
JsGAwta7T8TsB9wUWzyhzbuKM0TyWq+Uf8HQbOWRuxPLCp1exm/Qa2+naGhsCXJENOrTXB
b/nCT1qb4F1zxKswc/66dAGugCXIveHkts2xEOtfibbjFZVucAV8s7GJDgONtCOwkUs5+b
JiSCJCMLP3AYpbmwp1p0IsxDy0Opo8I7yTpr0ZHvDlJMXul2K372H8XpKHpeDzBpBOnJP2
E1vcG4KbGhULYixwuwH4ec/UOoEXI05ODj36Ek7UZTwnif06ceJ5PRFbkJheOg==
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 4PvLkC31NPzwl6;
Sun, 9 Apr 2023 05:48:19 +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 3395mJ3f004753;
Sun, 9 Apr 2023 05:48:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3395mJcV004752;
Sun, 9 Apr 2023 05:48:19 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 05:48:19 GMT
Message-Id: <202304090548.3395mJcV004752@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-branches@FreeBSD.org
From: Dirk Meyer
Subject: git: 9a5678c61278 - 2023Q2 - net/netmap: fix build with new graphviz
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: dinoex
X-Git-Repository: ports
X-Git-Refname: refs/heads/2023Q2
X-Git-Reftype: branch
X-Git-Commit: 9a5678c612780ccbc881ba63f4558bea816821b7
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch 2023Q2 has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9a5678c612780ccbc881ba63f4558bea816821b7
commit 9a5678c612780ccbc881ba63f4558bea816821b7
Author: Dirk Meyer
AuthorDate: 2023-04-09 05:46:10 +0000
Commit: Dirk Meyer
CommitDate: 2023-04-09 05:48:11 +0000
net/netmap: fix build with new graphviz
PR: 270710
MFH: 2023Q2
Display is still possible with dot an a viewer
(cherry picked from commit b5a37bd131cfb135d3ac5e623c04562827928c4b)
---
net/netmap/Makefile | 6 +++---
net/netmap/files/patch-README | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 2708c2a7b1f5..8cbbf4e6ba75 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -1,16 +1,16 @@
PORTNAME= netmap
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NetMap%20${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
COMMENT= Make a graphical representation of the surrounding network
WWW= http://netmap.sourceforge.net/
LICENSE= GPLv2
-RUN_DEPENDS= dotty:graphics/graphviz
+RUN_DEPENDS= dot:graphics/graphviz
USES= gmake
diff --git a/net/netmap/files/patch-README b/net/netmap/files/patch-README
new file mode 100644
index 000000000000..8f679a18f675
--- /dev/null
+++ b/net/netmap/files/patch-README
@@ -0,0 +1,21 @@
+--- README.orig 2001-12-23 15:42:29 UTC
++++ README
+@@ -54,3 +54,18 @@ Suggestions, comments and bug-reports welcome!
+ Wouter Godefroy
+ wouter@belgoline.com
+
++
++As dotty was removed in 2022,
++you can use "dot" and any suited viewer for the results.
++
++Some Examples:
++
++dot -Tpdf netmap.pdf netmap.dot
++xpdf netmap.pdf
++
++dot -Tsvg netmap.svg netmap.dot
++gqview netmap.svg
++
++dot -Tpng netmap.png netmap.dot
++xv netmap.png
++
From nobody Sun Apr 9 07:09:32 2023
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 4PvNWw5jj0z441KH;
Sun, 9 Apr 2023 07:09:32 +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 4PvNWw5Gdtz4KYX;
Sun, 9 Apr 2023 07:09:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681024172;
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=cuG7eEUq5/GQ0TkEcuLuv4NOMD18jzAk6IgIOHlYPSo=;
b=JnQAbczfcI3yQM+OHBkV8Qf1g2wktSIyJIffR6dKu91umqyVluimNsUuL/00Narln5GZ22
QvilJn/2YeIDft29Zoo5SkRzlchydemxtLhH1C084haIYVq8XvY5VtumMPKHdYudq9NLEx
PkMrb68OkG9snMfMCrHiCXdXhLWvF+K8B55w3GW8idyZntlgWph8b+7Qyfv3q5g60ECxt2
0wUSQwE/AfShf7Tk0YZlEy02lKKyYrcziKtgLln2SR8F3zzQyRyIDmrj3SSOPoUaSDZg58
httBK4PS6st0QPC4sGTS3JyO03t4EIstFTUHs4J8+k8CQfIx+Dx52LkBF528RA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681024172;
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=cuG7eEUq5/GQ0TkEcuLuv4NOMD18jzAk6IgIOHlYPSo=;
b=j3VD6YIR4AtLFeuvhw6mtPbhR2Y+g7hGBGKNWhAKG27a32fTivuRuKE7SutBbVWLFzbVYW
o3DK1cHlFfvfXeocF1APyOXvmAv07bD0QPf+q57lOGdmCiB0KjgwZ9p+zHJxvKYlYMfqbd
5M8G8MTNakjCMV94mkZ8ACBIUh1hN3esu5wAmay1OKQ0N49XwaWZ4Ys57oBuQMO9idpFZW
DI+fNF3///7msXwFh3BL7FErFDlop92ybQvTONRMwDFMkwST0dUlzRNMamIQMRUBl9ghTz
i+kRoT5wLcT+uR7Nko0v6rIshPSqipPgpitQw8L8axtwsz3WFAlkijVAOQT6CQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681024172; a=rsa-sha256; cv=none;
b=yoMdKCNzQfxZD/p/WO/50wp6hdnEcUTW+QIv+VgXcN/Dz+bMSejwUD3CMunthGUSvBPrr8
dCb2wlpHc91YZscUHs8oFzdZxPw/Y0rX+b8RRLbJYV9ivkbWu95YGxODxgrL2fc7rgFCKP
coPmCy0VEEPvyX95/KDqQNRMwA9hmcKTvQV/L0ehXZHcCs9hugptAW1vOLqSP4jK/ir5IR
JzWfLIbsmSNogZw4ebha3HdHuNOD1tuS2YtYR+sCNMkXf62Srm89sAaaH7NtuCPV29gUvD
dsi0h/jqSG0rxZpgSwwSSMVKpPsuqD+Dmu7EJZsiryUVPSnFt8agnZo2j1dBBQ==
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 4PvNWw484zzyq0;
Sun, 9 Apr 2023 07:09:32 +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 33979Wqn036652;
Sun, 9 Apr 2023 07:09:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33979WgH036651;
Sun, 9 Apr 2023 07:09:32 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 07:09:32 GMT
Message-Id: <202304090709.33979WgH036651@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Jochen Neumeister
Subject: git: 4edc41f51151 - main - www/mod_gnutls: Update to 0.12.1
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: joneum
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4edc41f511512a09acbf3176aaab9455c1bd2a03
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4edc41f511512a09acbf3176aaab9455c1bd2a03
commit 4edc41f511512a09acbf3176aaab9455c1bd2a03
Author: Jochen Neumeister
AuthorDate: 2023-04-09 07:07:43 +0000
Commit: Jochen Neumeister
CommitDate: 2023-04-09 07:09:25 +0000
www/mod_gnutls: Update to 0.12.1
Changelog: https://mod.gnutls.org/browser/mod_gnutls/CHANGELOG
Sponsored by: Netzkommune GmbH
---
www/mod_gnutls/Makefile | 2 +-
www/mod_gnutls/distinfo | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 7a7df3a04a43..c6e1e7dd7708 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mod_gnutls
-PORTVERSION= 0.12.0
+PORTVERSION= 0.12.1
CATEGORIES= www security
MASTER_SITES= https://mod.gnutls.org/downloads/
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_gnutls/distinfo b/www/mod_gnutls/distinfo
index a9daa1ff7b24..f76999010676 100644
--- a/www/mod_gnutls/distinfo
+++ b/www/mod_gnutls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661878634
-SHA256 (mod_gnutls-0.12.0.tar.bz2) = d986ff68de94b80e505f8b6bd68bd1ba146bf234b40d1f519695fe15592e995b
-SIZE (mod_gnutls-0.12.0.tar.bz2) = 461643
+TIMESTAMP = 1680856916
+SHA256 (mod_gnutls-0.12.1.tar.bz2) = 5bb97f11edb31a399354027004d3b0e862bd8d85fb6ba86b3b54b340a5e2ed97
+SIZE (mod_gnutls-0.12.1.tar.bz2) = 454861
From nobody Sun Apr 9 07:24:40 2023
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 4PvNsP2CHFz441lQ;
Sun, 9 Apr 2023 07:24: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 4PvNsP0NJvz3jyW;
Sun, 9 Apr 2023 07:24:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681025081;
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=QKdjdMFuBgCH414rfjQCvZ6i1IARCpzmURyyASoH8PY=;
b=psPBUzeEVwSZmtj53UdZWhbINMziqwcMHy7yoNLlTyv+RBGax5JRe9puj0K7SZ7G5FztNS
q19+Qu4zZis8v+JqAoyfIKrshJ9UodsTUyr7tktFCHn3SY+/l8cJLdofFeQy9S6ciMFnkt
8kM/OU3M/crxxqAtmHGcWR4m4rOqvqmxWlC9ifABlrsUbNAh2MlyVZz5gVFdncr11tDWbE
c/nFSvD3Vxh38+zPJUAIN34atxa125nTd0y5W+5hUXRkLhXydxG2Q8gbAZMq/I13hbT87V
2bmm2+c+lbwiebnNsZq/PEV+N88l4bzO2eRZxTc9pATgpKygnZzOuPhoyuFuCw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681025081;
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=QKdjdMFuBgCH414rfjQCvZ6i1IARCpzmURyyASoH8PY=;
b=c1x8/HK4hd0rXCkXJH41It87p0VT2g9WBinz9FNj4h+ZapvpqFnOfNE0HGJCXXdVIA4V/o
g7GaHberF4X0eObsW3Z1CvKQRw2XKBgCYhRNOVdYPDeuQtvbXWSOZWVa7snbn7/KHj+c7v
XrFuDL2u0Wu8gCGRUe9/Zid/IcOmdu9O+ZwAx5KcPyyVo1hE0e28UoCh+mdN2D6f/teCCl
pRhe0dsHInWyj7LN+f/pgXeNGBy1qbqyjL89L26ClobvAYD2QXHp+wSn7c2im0EGyaJp1m
VWMkLkCdBH1zpemESFk+iJ5HQCUsF7ABHNyrNKZiuaOYN0L8xDnvrBpUXIrepQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681025081; a=rsa-sha256; cv=none;
b=ajKYlCeD6LSFmIxWF6WhPbAbl/Uu9uBdv6P9k5uQvt8lVqvKPFJl4mGD+D//hp3sEuZcnm
J2HyahcQm23r6fStxgtYi2j1El3lgJ7OyGUhhvnbv6nxoDH4ryNF8Wzi6IXH83Yxg7UVDZ
HV5oTe+Gye5Fm8yQyVQXo/N35jmISTqNKnJp71d7FFnOYyvn5CqVWwsSgECIaN9KT7a/oz
eALFplrlVkMGjLnG9//vujx7PLoZTB4gWFnUgs4p2fVCjIDULGUC56RiaBGUA5RAoQyBgW
5gLVHIFXHjRTWmw2CHq06wJ3lfEx8rrYDXkjpoIRHrDnfABZ9DJNgdEzgyp/Tw==
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 4PvNsN6TSVzyqt;
Sun, 9 Apr 2023 07:24:40 +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 3397Oe5o068770;
Sun, 9 Apr 2023 07:24:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3397OeKc068769;
Sun, 9 Apr 2023 07:24:40 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 07:24:40 GMT
Message-Id: <202304090724.3397OeKc068769@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: MANTANI Nobutaka
Subject: git: 45dc00cc469c - main - editors/imhex: Update to 1.28.0
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: nobutaka
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 45dc00cc469c3e87bb313378a8f5fb8c870d59aa
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by nobutaka:
URL: https://cgit.FreeBSD.org/ports/commit/?id=45dc00cc469c3e87bb313378a8f5fb8c870d59aa
commit 45dc00cc469c3e87bb313378a8f5fb8c870d59aa
Author: MANTANI Nobutaka
AuthorDate: 2023-04-09 07:23:36 +0000
Commit: MANTANI Nobutaka
CommitDate: 2023-04-09 07:24:09 +0000
editors/imhex: Update to 1.28.0
---
editors/imhex/Makefile | 22 +-
editors/imhex/distinfo | 24 +-
editors/imhex/files/patch-CMakeLists.txt | 4 +-
.../imhex/files/patch-cmake_build__helpers.cmake | 8 +-
...ib_external_libwolv_libs_io_source_io_file.cpp} | 32 +--
...h-lib_external_libwolv_libs_io_source_io_fs.cpp | 11 +
...b_external_pattern__language_lib_CMakeLists.txt | 4 +-
..._language_lib_include_pl_core_ast_ast__node.hpp | 4 +-
...ern__language_lib_include_pl_core_evaluator.hpp | 10 -
...attern__language_lib_include_pl_core_parser.hpp | 38 ++++
...pattern__language_lib_include_pl_core_token.hpp | 242 +--------------------
...n__language_lib_include_pl_patterns_pattern.hpp | 8 +-
...attern__language_lib_source_pl_helpers_file.cpp | 44 ----
...tern__language_lib_source_pl_lib_std_string.cpp | 6 +-
...b_libimhex_include_hex_data__processor_node.hpp | 4 +-
.../patch-lib_libimhex_source_api_imhex__api.cpp | 4 +-
..._libimhex_source_api_project__file__manager.cpp | 4 +-
.../files/patch-lib_libimhex_source_helpers_fs.cpp | 10 +-
.../files/patch-main_source_window_window.cpp | 11 +
...include_content_views_view__pattern__editor.hpp | 8 +-
...n_source_content_command__palette__commands.cpp | 11 +
...gins_builtin_source_content_data__inspector.cpp | 4 +-
...gins_builtin_source_content_pl__visualizers.cpp | 31 +++
...tin_source_content_providers_disk__provider.cpp | 4 +-
...ns_builtin_source_content_settings__entries.cpp | 12 -
...ins_builtin_source_content_views_view__find.cpp | 14 +-
...ltin_source_content_views_view__hex__editor.cpp | 4 +-
..._source_content_views_view__pattern__editor.cpp | 35 +--
...h-plugins_builtin_source_ui_pattern__drawer.cpp | 4 +-
editors/imhex/pkg-plist | 13 +-
30 files changed, 225 insertions(+), 405 deletions(-)
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 285967932bfd..d459c7761590 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -1,7 +1,6 @@
PORTNAME= imhex
-PORTVERSION= 1.27.1
+PORTVERSION= 1.28.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg
DISTFILES= xdg.hpp:xdg
@@ -24,6 +23,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
josuttis-jthread-${GH_TAG_JTHREAD}_GH0${EXTRACT_SUFX} \
VirusTotal-yara-${GH_TAG_YARA}_GH0${EXTRACT_SUFX} \
WerWolv-libromfs-${GH_TAG_LIBROMFS}_GH0${EXTRACT_SUFX} \
+ WerWolv-libwolv-${GH_TAG_LIBWOLV}_GH0${EXTRACT_SUFX} \
WerWolv-ImHex-Patterns-${GH_TAG_IMHEX_PATTERNS}_GH0${EXTRACT_SUFX} \
WerWolv-PatternLanguage-${GH_TAG_PATTERN_LANGUAGE}_GH0${EXTRACT_SUFX}
@@ -39,7 +39,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libmbedtls.so:security/mbedtls \
libtre.so:textproc/libtre
-USES= cmake gl gnome pkgconfig python:3.8+ xorg
+USES= cmake desktop-file-utils gl gnome pkgconfig python:3.8+ xorg
USE_GL= gl glu
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_XORG= x11 xcb xau xdmcp
@@ -55,17 +55,19 @@ GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi
VirusTotal:yara:${GH_TAG_YARA}:yara \
WerWolv:ImHex-Patterns:${GH_TAG_IMHEX_PATTERNS}:imhex_patterns \
WerWolv:PatternLanguage:${GH_TAG_PATTERN_LANGUAGE}:pattern_language \
- WerWolv:libromfs:${GH_TAG_LIBROMFS}:libromfs
+ WerWolv:libromfs:${GH_TAG_LIBROMFS}:libromfs \
+ WerWolv:libwolv:${GH_TAG_LIBWOLV}:libwolv \
GH_TAG_CAPSTONE= d5141c0
GH_TAG_CLI11= faea921
GH_TAG_FMT= a337011
-GH_TAG_IMHEX_PATTERNS= ea4dda0
+GH_TAG_IMHEX_PATTERNS= 2ffa4e0
GH_TAG_JTHREAD= 0fa8d39
GH_TAG_LIBROMFS= 40cd303
-GH_TAG_NATIVEFILEDIALOG= 6efc824
-GH_TAG_PATTERN_LANGUAGE= 0e32a23
-GH_TAG_YARA= ba94b4f
+GH_TAG_LIBWOLV= bcd987c
+GH_TAG_NATIVEFILEDIALOG= 7909f55
+GH_TAG_PATTERN_LANGUAGE= 68210bd
+GH_TAG_YARA= 96790e5
CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON \
-DIMHEX_STRIP_RELEASE=OFF -DIMHEX_PLUGINS_IN_SHARE=ON \
@@ -82,6 +84,7 @@ post-extract:
${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/external/fmt
${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/libimhex/include
${CP} -R ${WRKSRC_libromfs}/* ${WRKSRC}/lib/external/libromfs
+ ${CP} -R ${WRKSRC_libwolv}/* ${WRKSRC}/lib/external/libwolv
${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/lib/external/nativefiledialog
${CP} -R ${WRKSRC_pattern_language}/* ${WRKSRC}/lib/external/pattern_language
${CP} -R ${WRKSRC_cli11}/* ${WRKSRC}/lib/external/pattern_language/external/cli11
@@ -89,6 +92,9 @@ post-extract:
${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src
${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src
+post-patch:
+ ${CP} -R ${WRKSRC}/lib/external/libwolv/* ${WRKSRC}/lib/external/pattern_language/external/libwolv
+
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo
index 82517e4c5c78..dae5dd2ce553 100644
--- a/editors/imhex/distinfo
+++ b/editors/imhex/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1676468817
+TIMESTAMP = 1680967037
SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec
SIZE (imhex/xdg.hpp) = 7674
-SHA256 (imhex/WerWolv-ImHex-v1.27.1_GH0.tar.gz) = c0eaba25b6b01242ad23a6872d815372815d40d22a0f727e0b61da5dc59366a4
-SIZE (imhex/WerWolv-ImHex-v1.27.1_GH0.tar.gz) = 11716724
-SHA256 (imhex/btzy-nativefiledialog-extended-6efc824_GH0.tar.gz) = 9ada1814eaedcdb8aaae1829443747ab385b6f296e3e756a483c34456e15dcbd
-SIZE (imhex/btzy-nativefiledialog-extended-6efc824_GH0.tar.gz) = 412533
+SHA256 (imhex/WerWolv-ImHex-v1.28.0_GH0.tar.gz) = 6d6d716b6fd785bfb11929ec33fdcbfced25e735519c1bf451c64ddd13b3383f
+SIZE (imhex/WerWolv-ImHex-v1.28.0_GH0.tar.gz) = 11741032
+SHA256 (imhex/btzy-nativefiledialog-extended-7909f55_GH0.tar.gz) = eb6c9376ab32dfa1b3f40f197f04d2d3dbe07c8555d57df3945121e843c98a97
+SIZE (imhex/btzy-nativefiledialog-extended-7909f55_GH0.tar.gz) = 412738
SHA256 (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 435d40757928fa73dec19c6d0fbf171bd76341391c8525ce1286927dab44c3e7
SIZE (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 5761632
SHA256 (imhex/CLIUtils-CLI11-faea921_GH0.tar.gz) = 84773ee9577e6b719e5a84ad62cc381cf3027756690e1db839eaa50bcafc6c78
@@ -13,11 +13,13 @@ SHA256 (imhex/fmtlib-fmt-a337011_GH0.tar.gz) = ba190d69d8b7994ef2ceb533c56bc34fe
SIZE (imhex/fmtlib-fmt-a337011_GH0.tar.gz) = 837936
SHA256 (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = ccd9c871dc2da9611e6d0cba5fc859cec9b233541be7501e5cef9eaa367e1280
SIZE (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = 4450456
-SHA256 (imhex/VirusTotal-yara-ba94b4f_GH0.tar.gz) = 4c81120bff451a55deaa23b48155d3eb35955ce11a1d76fbfcbbe2c2e33770b9
-SIZE (imhex/VirusTotal-yara-ba94b4f_GH0.tar.gz) = 1288534
-SHA256 (imhex/WerWolv-ImHex-Patterns-ea4dda0_GH0.tar.gz) = da07b7b99386fba50db7132fcb67a40ac990d298c92a3a3687870d062e9cb5c3
-SIZE (imhex/WerWolv-ImHex-Patterns-ea4dda0_GH0.tar.gz) = 6896993
-SHA256 (imhex/WerWolv-PatternLanguage-0e32a23_GH0.tar.gz) = 596bc2636eb07c7de71de3fd6582d7c18ecdf1ac5bc6f55d593c07e12ce8653e
-SIZE (imhex/WerWolv-PatternLanguage-0e32a23_GH0.tar.gz) = 428847
+SHA256 (imhex/VirusTotal-yara-96790e5_GH0.tar.gz) = f58a3e8e7fa6bec3b5d8631d4bfbd48da801ebf4b5f8e1b26fea4a1115708a1c
+SIZE (imhex/VirusTotal-yara-96790e5_GH0.tar.gz) = 2179144
+SHA256 (imhex/WerWolv-ImHex-Patterns-2ffa4e0_GH0.tar.gz) = 733697f5444c9622f79b47f9b0e83483a1d50e27da93e894ce83402615887038
+SIZE (imhex/WerWolv-ImHex-Patterns-2ffa4e0_GH0.tar.gz) = 3065433
+SHA256 (imhex/WerWolv-PatternLanguage-68210bd_GH0.tar.gz) = dd1404eda3627ed2426cbb50ca68fb5b8af8399b46dabfde8b91dacda975b869
+SIZE (imhex/WerWolv-PatternLanguage-68210bd_GH0.tar.gz) = 223467
SHA256 (imhex/WerWolv-libromfs-40cd303_GH0.tar.gz) = e785499616e1dfc2644be61706cf1fba49a8d8282c6aecf78efee02c6fbbca13
SIZE (imhex/WerWolv-libromfs-40cd303_GH0.tar.gz) = 4301
+SHA256 (imhex/WerWolv-libwolv-bcd987c_GH0.tar.gz) = d170a887ba3d07efabc6180b5b6f077d5b5d261a0144cfe281aa0f04e05f3991
+SIZE (imhex/WerWolv-libwolv-bcd987c_GH0.tar.gz) = 20301
diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt
index 4839db5e37f7..ba76e857d734 100644
--- a/editors/imhex/files/patch-CMakeLists.txt
+++ b/editors/imhex/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2023-02-15 08:39:23 UTC
+--- CMakeLists.txt.orig 2023-04-04 10:04:22 UTC
+++ CMakeLists.txt
-@@ -28,8 +28,6 @@ project(imhex
+@@ -29,8 +29,6 @@ project(imhex
# Make sure project is configured correctly
setDefaultBuiltTypeIfUnset()
diff --git a/editors/imhex/files/patch-cmake_build__helpers.cmake b/editors/imhex/files/patch-cmake_build__helpers.cmake
index 375109f88029..2791ff6dd58b 100644
--- a/editors/imhex/files/patch-cmake_build__helpers.cmake
+++ b/editors/imhex/files/patch-cmake_build__helpers.cmake
@@ -1,6 +1,6 @@
---- cmake/build_helpers.cmake.orig 2023-02-15 13:56:27 UTC
+--- cmake/build_helpers.cmake.orig 2023-04-04 10:04:22 UTC
+++ cmake/build_helpers.cmake
-@@ -370,13 +370,13 @@ function(downloadImHexPatternsFiles dest)
+@@ -378,13 +378,13 @@ function(downloadImHexPatternsFiles dest)
else ()
# Maybe patterns are cloned to a subdirectory
@@ -16,11 +16,11 @@
endforeach ()
endif ()
-@@ -384,7 +384,6 @@ endfunction()
+@@ -392,7 +392,6 @@ endfunction()
macro(setupCompilerWarnings target)
set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
-- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow")
+- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IMHEX_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMHEX_C_FLAGS}")
diff --git a/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp b/editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_file.cpp
similarity index 56%
rename from editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp
rename to editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_file.cpp
index c3e38e800446..45ee30862e05 100644
--- a/editors/imhex/files/patch-lib_libimhex_source_helpers_file.cpp
+++ b/editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_file.cpp
@@ -1,23 +1,23 @@
---- lib/libimhex/source/helpers/file.cpp.orig 2022-10-08 08:03:47 UTC
-+++ lib/libimhex/source/helpers/file.cpp
-@@ -17,12 +17,12 @@ namespace hex::fs {
- this->m_file = _wfopen(path.c_str(), L"w+b");
+--- lib/external/libwolv/libs/io/source/io/file.cpp.orig 2023-04-08 15:55:46 UTC
++++ lib/external/libwolv/libs/io/source/io/file.cpp
+@@ -21,12 +21,12 @@ namespace wolv::io {
#else
+
if (mode == File::Mode::Read)
-- this->m_file = fopen64(hex::toUTF8String(path).c_str(), "rb");
-+ this->m_file = fopen(hex::toUTF8String(path).c_str(), "rb");
+- this->m_file = fopen64(util::toUTF8String(path).c_str(), "rb");
++ this->m_file = fopen(util::toUTF8String(path).c_str(), "rb");
else if (mode == File::Mode::Write)
-- this->m_file = fopen64(hex::toUTF8String(path).c_str(), "r+b");
-+ this->m_file = fopen(hex::toUTF8String(path).c_str(), "r+b");
+- this->m_file = fopen64(util::toUTF8String(path).c_str(), "r+b");
++ this->m_file = fopen(util::toUTF8String(path).c_str(), "r+b");
if (mode == File::Mode::Create || (mode == File::Mode::Write && this->m_file == nullptr))
-- this->m_file = fopen64(hex::toUTF8String(path).c_str(), "w+b");
-+ this->m_file = fopen(hex::toUTF8String(path).c_str(), "w+b");
+- this->m_file = fopen64(util::toUTF8String(path).c_str(), "w+b");
++ this->m_file = fopen(util::toUTF8String(path).c_str(), "w+b");
+
#endif
}
-
-@@ -50,7 +50,7 @@ namespace hex::fs {
-
+@@ -63,7 +63,7 @@ namespace wolv::io {
+ }
void File::seek(u64 offset) {
- fseeko64(this->m_file, offset, SEEK_SET);
@@ -25,7 +25,7 @@
}
void File::close() {
-@@ -135,10 +135,10 @@ namespace hex::fs {
+@@ -148,10 +148,10 @@ namespace wolv::io {
size_t File::getSize() const {
if (!isValid()) return 0;
@@ -40,12 +40,12 @@
if (size < 0)
return 0;
-@@ -149,7 +149,7 @@ namespace hex::fs {
+@@ -162,7 +162,7 @@ namespace wolv::io {
void File::setSize(u64 size) {
if (!isValid()) return;
- auto result = ftruncate64(fileno(this->m_file), size);
+ auto result = ftruncate(fileno(this->m_file), size);
- hex::unused(result);
+ util::unused(result);
}
diff --git a/editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_fs.cpp b/editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_fs.cpp
new file mode 100644
index 000000000000..e153e92150a1
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_libwolv_libs_io_source_io_fs.cpp
@@ -0,0 +1,11 @@
+--- lib/external/libwolv/libs/io/source/io/fs.cpp.orig 2023-04-08 15:52:49 UTC
++++ lib/external/libwolv/libs/io/source/io/fs.cpp
+@@ -15,7 +15,7 @@
+ #elif defined(OS_LINUX)
+
+ #include
+- #include
++ #include
+
+ #endif
+
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_CMakeLists.txt b/editors/imhex/files/patch-lib_external_pattern__language_lib_CMakeLists.txt
index a02d6868d77d..21819240ed2f 100644
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_CMakeLists.txt
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_CMakeLists.txt
@@ -1,7 +1,7 @@
---- lib/external/pattern_language/lib/CMakeLists.txt.orig 2023-02-12 13:35:48 UTC
+--- lib/external/pattern_language/lib/CMakeLists.txt.orig 2023-04-08 15:28:11 UTC
+++ lib/external/pattern_language/lib/CMakeLists.txt
@@ -34,7 +34,7 @@ add_library(libpl ${LIBRARY_TYPE}
- source/pl/lib/std/hash.cpp
+ source/pl/lib/std/random.cpp
)
-target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas)
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_ast_ast__node.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_ast_ast__node.hpp
index 388fdd493069..89b9ea1731aa 100644
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_ast_ast__node.hpp
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_ast_ast__node.hpp
@@ -1,6 +1,6 @@
---- lib/external/pattern_language/lib/include/pl/core/ast/ast_node.hpp.orig 2023-01-05 15:11:08 UTC
+--- lib/external/pattern_language/lib/include/pl/core/ast/ast_node.hpp.orig 2023-04-08 15:28:11 UTC
+++ lib/external/pattern_language/lib/include/pl/core/ast/ast_node.hpp
-@@ -15,11 +15,11 @@ namespace pl::core::ast {
+@@ -16,11 +16,11 @@ namespace pl::core::ast {
class ASTNode : public Cloneable {
public:
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_evaluator.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_evaluator.hpp
deleted file mode 100644
index a5a32aa8d084..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_evaluator.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/external/pattern_language/lib/include/pl/core/evaluator.hpp.orig 2023-01-05 14:44:51 UTC
-+++ lib/external/pattern_language/lib/include/pl/core/evaluator.hpp
-@@ -7,6 +7,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_parser.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_parser.hpp
new file mode 100644
index 000000000000..4881cecc95c8
--- /dev/null
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_parser.hpp
@@ -0,0 +1,38 @@
+--- lib/external/pattern_language/lib/include/pl/core/parser.hpp.orig 2023-04-08 16:22:09 UTC
++++ lib/external/pattern_language/lib/include/pl/core/parser.hpp
+@@ -233,7 +233,7 @@ namespace pl::core {
+ else if constexpr (S == Not)
+ return false;
+ else
+- std::unreachable();
++ __builtin_unreachable();
+ }
+
+ template
+@@ -264,7 +264,7 @@ namespace pl::core {
+ partReset();
+ return false;
+ } else
+- std::unreachable();
++ __builtin_unreachable();
+ }
+
+ template
+@@ -279,7 +279,7 @@ namespace pl::core {
+ else if constexpr (S == Not)
+ return true;
+ else
+- std::unreachable();
++ __builtin_unreachable();
+ }
+
+ template
+@@ -289,7 +289,7 @@ namespace pl::core {
+ else if constexpr (S == Not)
+ return sequenceImpl(token) && oneOfImpl(args...);
+ else
+- std::unreachable();
++ __builtin_unreachable();
+ }
+
+ template
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp
index d33644543603..515b59369fe1 100644
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_core_token.hpp
@@ -1,6 +1,6 @@
---- lib/external/pattern_language/lib/include/pl/core/token.hpp.orig 2023-02-13 14:23:14 UTC
+--- lib/external/pattern_language/lib/include/pl/core/token.hpp.orig 2023-04-08 15:28:11 UTC
+++ lib/external/pattern_language/lib/include/pl/core/token.hpp
-@@ -155,7 +155,7 @@ namespace pl::core {
+@@ -157,7 +157,7 @@ namespace pl::core {
bool global;
std::string comment;
@@ -9,7 +9,7 @@
};
struct Literal : public std::variant {
-@@ -183,7 +183,7 @@ namespace pl::core {
+@@ -185,7 +185,7 @@ namespace pl::core {
using ValueTypes = std::variant;
@@ -18,239 +18,3 @@
[[nodiscard]] constexpr static inline bool isInteger(const ValueType &type) {
return isUnsigned(type) || isSigned(type);
-@@ -220,136 +220,136 @@ namespace pl::core {
-
- namespace tkn {
-
-- constexpr inline Token createToken(const core::Token::Type type, const core::Token::ValueTypes &value) {
-+ inline Token createToken(const core::Token::Type type, const core::Token::ValueTypes &value) {
- return { type, value, 1, 1 };
- }
-
- namespace Keyword {
-
-- constexpr auto If = createToken(core::Token::Type::Keyword, Token::Keyword::If);
-- constexpr auto Else = createToken(core::Token::Type::Keyword, Token::Keyword::Else);
-- constexpr auto While = createToken(core::Token::Type::Keyword, Token::Keyword::While);
-- constexpr auto For = createToken(core::Token::Type::Keyword, Token::Keyword::For);
-- constexpr auto Return = createToken(core::Token::Type::Keyword, Token::Keyword::Return);
-- constexpr auto Break = createToken(core::Token::Type::Keyword, Token::Keyword::Break);
-- constexpr auto Continue = createToken(core::Token::Type::Keyword, Token::Keyword::Continue);
-- constexpr auto Struct = createToken(core::Token::Type::Keyword, Token::Keyword::Struct);
-- constexpr auto Enum = createToken(core::Token::Type::Keyword, Token::Keyword::Enum);
-- constexpr auto Union = createToken(core::Token::Type::Keyword, Token::Keyword::Union);
-- constexpr auto Function = createToken(core::Token::Type::Keyword, Token::Keyword::Function);
-- constexpr auto Bitfield = createToken(core::Token::Type::Keyword, Token::Keyword::Bitfield);
-- constexpr auto LittleEndian = createToken(core::Token::Type::Keyword, Token::Keyword::LittleEndian);
-- constexpr auto BigEndian = createToken(core::Token::Type::Keyword, Token::Keyword::BigEndian);
-- constexpr auto Parent = createToken(core::Token::Type::Keyword, Token::Keyword::Parent);
-- constexpr auto Namespace = createToken(core::Token::Type::Keyword, Token::Keyword::Namespace);
-- constexpr auto Using = createToken(core::Token::Type::Keyword, Token::Keyword::Using);
-- constexpr auto This = createToken(core::Token::Type::Keyword, Token::Keyword::This);
-- constexpr auto In = createToken(core::Token::Type::Keyword, Token::Keyword::In);
-- constexpr auto Out = createToken(core::Token::Type::Keyword, Token::Keyword::Out);
-- constexpr auto Reference = createToken(core::Token::Type::Keyword, Token::Keyword::Reference);
-- constexpr auto Null = createToken(core::Token::Type::Keyword, Token::Keyword::Null);
-- constexpr auto Const = createToken(core::Token::Type::Keyword, Token::Keyword::Const);
-+ inline auto If = createToken(core::Token::Type::Keyword, Token::Keyword::If);
-+ inline auto Else = createToken(core::Token::Type::Keyword, Token::Keyword::Else);
-+ inline auto While = createToken(core::Token::Type::Keyword, Token::Keyword::While);
-+ inline auto For = createToken(core::Token::Type::Keyword, Token::Keyword::For);
-+ inline auto Return = createToken(core::Token::Type::Keyword, Token::Keyword::Return);
-+ inline auto Break = createToken(core::Token::Type::Keyword, Token::Keyword::Break);
-+ inline auto Continue = createToken(core::Token::Type::Keyword, Token::Keyword::Continue);
-+ inline auto Struct = createToken(core::Token::Type::Keyword, Token::Keyword::Struct);
-+ inline auto Enum = createToken(core::Token::Type::Keyword, Token::Keyword::Enum);
-+ inline auto Union = createToken(core::Token::Type::Keyword, Token::Keyword::Union);
-+ inline auto Function = createToken(core::Token::Type::Keyword, Token::Keyword::Function);
-+ inline auto Bitfield = createToken(core::Token::Type::Keyword, Token::Keyword::Bitfield);
-+ inline auto LittleEndian = createToken(core::Token::Type::Keyword, Token::Keyword::LittleEndian);
-+ inline auto BigEndian = createToken(core::Token::Type::Keyword, Token::Keyword::BigEndian);
-+ inline auto Parent = createToken(core::Token::Type::Keyword, Token::Keyword::Parent);
-+ inline auto Namespace = createToken(core::Token::Type::Keyword, Token::Keyword::Namespace);
-+ inline auto Using = createToken(core::Token::Type::Keyword, Token::Keyword::Using);
-+ inline auto This = createToken(core::Token::Type::Keyword, Token::Keyword::This);
-+ inline auto In = createToken(core::Token::Type::Keyword, Token::Keyword::In);
-+ inline auto Out = createToken(core::Token::Type::Keyword, Token::Keyword::Out);
-+ inline auto Reference = createToken(core::Token::Type::Keyword, Token::Keyword::Reference);
-+ inline auto Null = createToken(core::Token::Type::Keyword, Token::Keyword::Null);
-+ inline auto Const = createToken(core::Token::Type::Keyword, Token::Keyword::Const);
-
- }
-
- namespace Literal {
-
-- constexpr auto IdentifierValue = [](const std::string &name = { }) -> Token { return createToken(core::Token::Type::Identifier, Token::Identifier(name)); };
-- constexpr auto NumericValue = [](const Token::Literal &value = { }) -> Token { return createToken(core::Token::Type::Integer, value); };
-- constexpr auto StringValue = [](const std::string &value = { }) -> Token { return createToken(core::Token::Type::String, Token::Literal(value)); };
-- constexpr auto DocComment = [](bool global, const std::string &value) -> Token { return { core::Token::Type::DocComment, Token::DocComment { global, value }, 1, 1 }; };
-+ inline auto IdentifierValue = [](const std::string &name = { }) -> Token { return createToken(core::Token::Type::Identifier, Token::Identifier(name)); };
-+ inline auto NumericValue = [](const Token::Literal &value = { }) -> Token { return createToken(core::Token::Type::Integer, value); };
-+ inline auto StringValue = [](const std::string &value = { }) -> Token { return createToken(core::Token::Type::String, Token::Literal(value)); };
-+ inline auto DocComment = [](bool global, const std::string &value) -> Token { return { core::Token::Type::DocComment, Token::DocComment { global, value }, 1, 1 }; };
-
-- constexpr auto Identifier = createToken(core::Token::Type::Identifier, { });
-- constexpr auto Numeric = createToken(core::Token::Type::Integer, { });
-- constexpr auto String = createToken(core::Token::Type::String, { });
-+ inline auto Identifier = createToken(core::Token::Type::Identifier, { });
-+ inline auto Numeric = createToken(core::Token::Type::Integer, { });
-+ inline auto String = createToken(core::Token::Type::String, { });
-
- }
-
- namespace Operator {
-
-- constexpr auto Plus = createToken(core::Token::Type::Operator, Token::Operator::Plus);
-- constexpr auto Minus = createToken(core::Token::Type::Operator, Token::Operator::Minus);
-- constexpr auto Star = createToken(core::Token::Type::Operator, Token::Operator::Star);
-- constexpr auto Slash = createToken(core::Token::Type::Operator, Token::Operator::Slash);
-- constexpr auto Percent = createToken(core::Token::Type::Operator, Token::Operator::Percent);
-- constexpr auto LeftShift = createToken(core::Token::Type::Operator, Token::Operator::LeftShift);
-- constexpr auto RightShift = createToken(core::Token::Type::Operator, Token::Operator::RightShift);
-- constexpr auto BitAnd = createToken(core::Token::Type::Operator, Token::Operator::BitAnd);
-- constexpr auto BitOr = createToken(core::Token::Type::Operator, Token::Operator::BitOr);
-- constexpr auto BitXor = createToken(core::Token::Type::Operator, Token::Operator::BitXor);
-- constexpr auto BitNot = createToken(core::Token::Type::Operator, Token::Operator::BitNot);
-- constexpr auto BoolEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolEqual);
-- constexpr auto BoolNotEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolNotEqual);
-- constexpr auto BoolLessThan = createToken(core::Token::Type::Operator, Token::Operator::BoolLessThan);
-- constexpr auto BoolGreaterThan = createToken(core::Token::Type::Operator, Token::Operator::BoolGreaterThan);
-- constexpr auto BoolLessThanOrEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolLessThanOrEqual);
-- constexpr auto BoolGreaterThanOrEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolGreaterThanOrEqual);
-- constexpr auto BoolAnd = createToken(core::Token::Type::Operator, Token::Operator::BoolAnd);
-- constexpr auto BoolOr = createToken(core::Token::Type::Operator, Token::Operator::BoolOr);
-- constexpr auto BoolNot = createToken(core::Token::Type::Operator, Token::Operator::BoolNot);
-- constexpr auto BoolXor = createToken(core::Token::Type::Operator, Token::Operator::BoolXor);
-- constexpr auto Dollar = createToken(core::Token::Type::Operator, Token::Operator::Dollar);
-- constexpr auto Colon = createToken(core::Token::Type::Operator, Token::Operator::Colon);
-- constexpr auto ScopeResolution = createToken(core::Token::Type::Operator, Token::Operator::ScopeResolution);
-- constexpr auto TernaryConditional = createToken(core::Token::Type::Operator, Token::Operator::TernaryConditional);
-- constexpr auto AddressOf = createToken(core::Token::Type::Operator, Token::Operator::AddressOf);
-- constexpr auto SizeOf = createToken(core::Token::Type::Operator, Token::Operator::SizeOf);
-- constexpr auto At = createToken(core::Token::Type::Operator, Token::Operator::At);
-- constexpr auto Assign = createToken(core::Token::Type::Operator, Token::Operator::Assign);
-+ inline auto Plus = createToken(core::Token::Type::Operator, Token::Operator::Plus);
-+ inline auto Minus = createToken(core::Token::Type::Operator, Token::Operator::Minus);
-+ inline auto Star = createToken(core::Token::Type::Operator, Token::Operator::Star);
-+ inline auto Slash = createToken(core::Token::Type::Operator, Token::Operator::Slash);
-+ inline auto Percent = createToken(core::Token::Type::Operator, Token::Operator::Percent);
-+ inline auto LeftShift = createToken(core::Token::Type::Operator, Token::Operator::LeftShift);
-+ inline auto RightShift = createToken(core::Token::Type::Operator, Token::Operator::RightShift);
-+ inline auto BitAnd = createToken(core::Token::Type::Operator, Token::Operator::BitAnd);
-+ inline auto BitOr = createToken(core::Token::Type::Operator, Token::Operator::BitOr);
-+ inline auto BitXor = createToken(core::Token::Type::Operator, Token::Operator::BitXor);
-+ inline auto BitNot = createToken(core::Token::Type::Operator, Token::Operator::BitNot);
-+ inline auto BoolEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolEqual);
-+ inline auto BoolNotEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolNotEqual);
-+ inline auto BoolLessThan = createToken(core::Token::Type::Operator, Token::Operator::BoolLessThan);
-+ inline auto BoolGreaterThan = createToken(core::Token::Type::Operator, Token::Operator::BoolGreaterThan);
-+ inline auto BoolLessThanOrEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolLessThanOrEqual);
-+ inline auto BoolGreaterThanOrEqual = createToken(core::Token::Type::Operator, Token::Operator::BoolGreaterThanOrEqual);
-+ inline auto BoolAnd = createToken(core::Token::Type::Operator, Token::Operator::BoolAnd);
-+ inline auto BoolOr = createToken(core::Token::Type::Operator, Token::Operator::BoolOr);
-+ inline auto BoolNot = createToken(core::Token::Type::Operator, Token::Operator::BoolNot);
-+ inline auto BoolXor = createToken(core::Token::Type::Operator, Token::Operator::BoolXor);
-+ inline auto Dollar = createToken(core::Token::Type::Operator, Token::Operator::Dollar);
-+ inline auto Colon = createToken(core::Token::Type::Operator, Token::Operator::Colon);
-+ inline auto ScopeResolution = createToken(core::Token::Type::Operator, Token::Operator::ScopeResolution);
-+ inline auto TernaryConditional = createToken(core::Token::Type::Operator, Token::Operator::TernaryConditional);
-+ inline auto AddressOf = createToken(core::Token::Type::Operator, Token::Operator::AddressOf);
-+ inline auto SizeOf = createToken(core::Token::Type::Operator, Token::Operator::SizeOf);
-+ inline auto At = createToken(core::Token::Type::Operator, Token::Operator::At);
-+ inline auto Assign = createToken(core::Token::Type::Operator, Token::Operator::Assign);
-
- }
-
- namespace ValueType {
-
-- constexpr auto CustomType = createToken(core::Token::Type::ValueType, Token::ValueType::CustomType);
-- constexpr auto Padding = createToken(core::Token::Type::ValueType, Token::ValueType::Padding);
-- constexpr auto Unsigned = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned);
-- constexpr auto Signed = createToken(core::Token::Type::ValueType, Token::ValueType::Signed);
-- constexpr auto FloatingPoint = createToken(core::Token::Type::ValueType, Token::ValueType::FloatingPoint);
-- constexpr auto Auto = createToken(core::Token::Type::ValueType, Token::ValueType::Auto);
-- constexpr auto Any = createToken(core::Token::Type::ValueType, Token::ValueType::Any);
-+ inline auto CustomType = createToken(core::Token::Type::ValueType, Token::ValueType::CustomType);
-+ inline auto Padding = createToken(core::Token::Type::ValueType, Token::ValueType::Padding);
-+ inline auto Unsigned = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned);
-+ inline auto Signed = createToken(core::Token::Type::ValueType, Token::ValueType::Signed);
-+ inline auto FloatingPoint = createToken(core::Token::Type::ValueType, Token::ValueType::FloatingPoint);
-+ inline auto Auto = createToken(core::Token::Type::ValueType, Token::ValueType::Auto);
-+ inline auto Any = createToken(core::Token::Type::ValueType, Token::ValueType::Any);
-
-- constexpr auto Unsigned8Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned8Bit);
-- constexpr auto Unsigned16Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned16Bit);
-- constexpr auto Unsigned24Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned24Bit);
-- constexpr auto Unsigned32Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned32Bit);
-- constexpr auto Unsigned48Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned48Bit);
-- constexpr auto Unsigned64Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned64Bit);
-- constexpr auto Unsigned96Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned96Bit);
-- constexpr auto Unsigned128Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned128Bit);
-+ inline auto Unsigned8Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned8Bit);
-+ inline auto Unsigned16Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned16Bit);
-+ inline auto Unsigned24Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned24Bit);
-+ inline auto Unsigned32Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned32Bit);
-+ inline auto Unsigned48Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned48Bit);
-+ inline auto Unsigned64Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned64Bit);
-+ inline auto Unsigned96Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned96Bit);
-+ inline auto Unsigned128Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Unsigned128Bit);
-
-- constexpr auto Signed8Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed8Bit);
-- constexpr auto Signed16Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed16Bit);
-- constexpr auto Signed24Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed24Bit);
-- constexpr auto Signed32Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed32Bit);
-- constexpr auto Signed48Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed48Bit);
-- constexpr auto Signed64Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed64Bit);
-- constexpr auto Signed96Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed96Bit);
-- constexpr auto Signed128Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed128Bit);
-+ inline auto Signed8Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed8Bit);
-+ inline auto Signed16Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed16Bit);
-+ inline auto Signed24Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed24Bit);
-+ inline auto Signed32Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed32Bit);
-+ inline auto Signed48Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed48Bit);
-+ inline auto Signed64Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed64Bit);
-+ inline auto Signed96Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed96Bit);
-+ inline auto Signed128Bit = createToken(core::Token::Type::ValueType, Token::ValueType::Signed128Bit);
-
-- constexpr auto Float = createToken(core::Token::Type::ValueType, Token::ValueType::Float);
-- constexpr auto Double = createToken(core::Token::Type::ValueType, Token::ValueType::Double);
-+ inline auto Float = createToken(core::Token::Type::ValueType, Token::ValueType::Float);
-+ inline auto Double = createToken(core::Token::Type::ValueType, Token::ValueType::Double);
-
-- constexpr auto Boolean = createToken(core::Token::Type::ValueType, Token::ValueType::Boolean);
-+ inline auto Boolean = createToken(core::Token::Type::ValueType, Token::ValueType::Boolean);
-
-- constexpr auto Character = createToken(core::Token::Type::ValueType, Token::ValueType::Character);
-- constexpr auto Character16 = createToken(core::Token::Type::ValueType, Token::ValueType::Character16);
-- constexpr auto String = createToken(core::Token::Type::ValueType, Token::ValueType::String);
-+ inline auto Character = createToken(core::Token::Type::ValueType, Token::ValueType::Character);
-+ inline auto Character16 = createToken(core::Token::Type::ValueType, Token::ValueType::Character16);
-+ inline auto String = createToken(core::Token::Type::ValueType, Token::ValueType::String);
-
- }
-
- namespace Separator {
-
-- constexpr auto Comma = createToken(core::Token::Type::Separator, Token::Separator::Comma);
-- constexpr auto LeftParenthesis = createToken(core::Token::Type::Separator, Token::Separator::LeftParenthesis);
-- constexpr auto RightParenthesis = createToken(core::Token::Type::Separator, Token::Separator::RightParenthesis);
-- constexpr auto LeftBracket = createToken(core::Token::Type::Separator, Token::Separator::LeftBracket);
-- constexpr auto RightBracket = createToken(core::Token::Type::Separator, Token::Separator::RightBracket);
-- constexpr auto LeftBrace = createToken(core::Token::Type::Separator, Token::Separator::LeftBrace);
-- constexpr auto RightBrace = createToken(core::Token::Type::Separator, Token::Separator::RightBrace);
-- constexpr auto Dot = createToken(core::Token::Type::Separator, Token::Separator::Dot);
-- constexpr auto Semicolon = createToken(core::Token::Type::Separator, Token::Separator::Semicolon);
-- constexpr auto EndOfProgram = createToken(core::Token::Type::Separator, Token::Separator::EndOfProgram);
-+ inline auto Comma = createToken(core::Token::Type::Separator, Token::Separator::Comma);
-+ inline auto LeftParenthesis = createToken(core::Token::Type::Separator, Token::Separator::LeftParenthesis);
-+ inline auto RightParenthesis = createToken(core::Token::Type::Separator, Token::Separator::RightParenthesis);
-+ inline auto LeftBracket = createToken(core::Token::Type::Separator, Token::Separator::LeftBracket);
-+ inline auto RightBracket = createToken(core::Token::Type::Separator, Token::Separator::RightBracket);
-+ inline auto LeftBrace = createToken(core::Token::Type::Separator, Token::Separator::LeftBrace);
-+ inline auto RightBrace = createToken(core::Token::Type::Separator, Token::Separator::RightBrace);
-+ inline auto Dot = createToken(core::Token::Type::Separator, Token::Separator::Dot);
-+ inline auto Semicolon = createToken(core::Token::Type::Separator, Token::Separator::Semicolon);
-+ inline auto EndOfProgram = createToken(core::Token::Type::Separator, Token::Separator::EndOfProgram);
-
- }
-
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern.hpp
index 04b38f4f4b6c..604dfcad4a70 100644
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern.hpp
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern.hpp
@@ -1,11 +1,11 @@
---- lib/external/pattern_language/lib/include/pl/patterns/pattern.hpp.orig 2023-02-15 14:19:06 UTC
+--- lib/external/pattern_language/lib/include/pl/patterns/pattern.hpp.orig 2023-04-08 16:10:41 UTC
+++ lib/external/pattern_language/lib/include/pl/patterns/pattern.hpp
-@@ -317,7 +317,7 @@ namespace pl::ptrn {
+@@ -336,7 +336,7 @@ namespace pl::ptrn {
auto startOffset = child->getOffset();
child->setOffset(offset);
-- PL_ON_SCOPE_EXIT { child->setOffset(startOffset); };
-+ [[maybe_unused]] auto PL_ANONYMOUS_VARIABLE(SCOPE_EXIT_) = ::pl::scope_guard::ScopeGuardOnExit() + [&, child=child]() { child->setOffset(startOffset); };
+- ON_SCOPE_EXIT { child->setOffset(startOffset); };
++ [[maybe_unused]] auto WOLV_ANONYMOUS_VARIABLE(SCOPE_EXIT_) = ::wolv::util::scope_guard::ScopeGuardOnExit() + [&, child=child]() { child->setOffset(startOffset); };
auto bytes = child->getBytes();
std::copy(bytes.begin(), bytes.end(), std::back_inserter(result));
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp
deleted file mode 100644
index a0e9d7509c14..000000000000
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_helpers_file.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- lib/external/pattern_language/lib/source/pl/helpers/file.cpp.orig 2022-11-16 14:22:38 UTC
-+++ lib/external/pattern_language/lib/source/pl/helpers/file.cpp
-@@ -8,7 +8,7 @@
-
- namespace pl::hlp::fs {
-
--#if defined(OS_MACOS)
-+#if defined(OS_MACOS) || defined(__FreeBSD__)
- #define fopen64 fopen
- #define ftruncate64 ftruncate
- #endif
-@@ -57,7 +57,7 @@ namespace pl::hlp::fs {
-
-
- void File::seek(u64 offset) {
-- fseeko64(this->m_file, offset, SEEK_SET);
-+ fseeko(this->m_file, offset, SEEK_SET);
- }
-
- void File::close() {
-@@ -142,10 +142,10 @@ namespace pl::hlp::fs {
- size_t File::getSize() const {
- if (!isValid()) return 0;
-
-- auto startPos = ftello64(this->m_file);
-- fseeko64(this->m_file, 0, SEEK_END);
-- auto size = ftello64(this->m_file);
-- fseeko64(this->m_file, startPos, SEEK_SET);
-+ auto startPos = ftello(this->m_file);
-+ fseeko(this->m_file, 0, SEEK_END);
-+ auto size = ftello(this->m_file);
-+ fseeko(this->m_file, startPos, SEEK_SET);
-
- if (size < 0)
- return 0;
-@@ -156,7 +156,7 @@ namespace pl::hlp::fs {
- void File::setSize(u64 size) {
- if (!isValid()) return;
-
-- auto result = ftruncate64(fileno(this->m_file), size);
-+ auto result = ftruncate(fileno(this->m_file), size);
- hlp::unused(result);
- }
-
diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_lib_std_string.cpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_lib_std_string.cpp
index 9c419ffccee2..79b7826ce37d 100644
--- a/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_lib_std_string.cpp
+++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_source_pl_lib_std_string.cpp
@@ -1,11 +1,11 @@
---- lib/external/pattern_language/lib/source/pl/lib/std/string.cpp.orig 2022-08-14 15:35:34 UTC
+--- lib/external/pattern_language/lib/source/pl/lib/std/string.cpp.orig 2023-04-08 15:36:28 UTC
+++ lib/external/pattern_language/lib/source/pl/lib/std/string.cpp
@@ -35,7 +35,7 @@ namespace pl::lib::libstd::string {
const auto signIndex = index >> (sizeof(index) * 8 - 1);
const auto absIndex = (index ^ signIndex) - signIndex;
- #else
+ #else
- const auto absIndex = std::abs(index);
+ const auto absIndex = (unsigned long)std::abs((long)index);
- #endif
+ #endif
if (absIndex > string.length())
diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_data__processor_node.hpp b/editors/imhex/files/patch-lib_libimhex_include_hex_data__processor_node.hpp
index 75f1f09572bf..fd9c6ef492b3 100644
--- a/editors/imhex/files/patch-lib_libimhex_include_hex_data__processor_node.hpp
+++ b/editors/imhex/files/patch-lib_libimhex_include_hex_data__processor_node.hpp
@@ -1,6 +1,6 @@
---- lib/libimhex/include/hex/data_processor/node.hpp.orig 2023-02-12 18:24:04 UTC
+--- lib/libimhex/include/hex/data_processor/node.hpp.orig 2023-04-04 10:04:22 UTC
+++ lib/libimhex/include/hex/data_processor/node.hpp
-@@ -49,6 +49,7 @@ namespace hex::dp {
+@@ -50,6 +50,7 @@ namespace hex::dp {
struct NodeError {
Node *node;
std::string message;
diff --git a/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp b/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp
index 0bea605d4827..483fdddc1daf 100644
--- a/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp
+++ b/editors/imhex/files/patch-lib_libimhex_source_api_imhex__api.cpp
@@ -1,4 +1,4 @@
---- lib/libimhex/source/api/imhex_api.cpp.orig 2022-11-14 09:07:21 UTC
+--- lib/libimhex/source/api/imhex_api.cpp.orig 2023-04-04 10:04:22 UTC
+++ lib/libimhex/source/api/imhex_api.cpp
@@ -4,6 +4,7 @@
#include
@@ -8,7 +8,7 @@
#include
#include
-@@ -272,7 +273,7 @@ namespace hex {
+@@ -259,7 +260,7 @@ namespace hex {
}
bool isDirty() {
diff --git a/editors/imhex/files/patch-lib_libimhex_source_api_project__file__manager.cpp b/editors/imhex/files/patch-lib_libimhex_source_api_project__file__manager.cpp
index f8ed1e496d67..b5600b88cdf8 100644
--- a/editors/imhex/files/patch-lib_libimhex_source_api_project__file__manager.cpp
+++ b/editors/imhex/files/patch-lib_libimhex_source_api_project__file__manager.cpp
@@ -1,6 +1,6 @@
---- lib/libimhex/source/api/project_file_manager.cpp.orig 2023-02-13 15:22:20 UTC
+--- lib/libimhex/source/api/project_file_manager.cpp.orig 2023-04-04 10:04:22 UTC
+++ lib/libimhex/source/api/project_file_manager.cpp
-@@ -43,7 +43,7 @@ namespace hex {
+@@ -46,7 +46,7 @@ namespace hex {
return false;
}
diff --git a/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp b/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
index ca035f5b4856..71a5ad974e02 100644
--- a/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
+++ b/editors/imhex/files/patch-lib_libimhex_source_helpers_fs.cpp
@@ -1,6 +1,6 @@
---- lib/libimhex/source/helpers/fs.cpp.orig 2023-02-12 18:24:04 UTC
+--- lib/libimhex/source/helpers/fs.cpp.orig 2023-04-04 10:04:22 UTC
+++ lib/libimhex/source/helpers/fs.cpp
-@@ -15,10 +15,15 @@
+@@ -11,10 +11,15 @@
#include
#elif defined(OS_LINUX)
#include
@@ -15,13 +15,13 @@
+#include
#include
- namespace hex::fs {
-@@ -101,7 +106,7 @@ namespace hex::fs {
+ #include
+@@ -54,7 +59,7 @@ namespace hex::fs {
result = NFD::PickFolder(outPath, defaultPath.empty() ? nullptr : defaultPath.c_str());
break;
default:
- std::unreachable();
-+ pl::hlp::unreachable();
++ __builtin_unreachable();
}
if (result == NFD_OKAY){
diff --git a/editors/imhex/files/patch-main_source_window_window.cpp b/editors/imhex/files/patch-main_source_window_window.cpp
new file mode 100644
index 000000000000..986dbccce8f7
--- /dev/null
+++ b/editors/imhex/files/patch-main_source_window_window.cpp
@@ -0,0 +1,11 @@
+--- main/source/window/window.cpp.orig 2023-04-09 06:24:47 UTC
++++ main/source/window/window.cpp
+@@ -272,7 +272,7 @@ namespace hex {
+ }
+ }
+
+- static void createNestedMenu(std::span menuItems, const Shortcut &shortcut, const std::function &callback, const std::function &enabledCallback) {
++ static void createNestedMenu(const std::vector &menuItems, const Shortcut &shortcut, const std::function &callback, const std::function &enabledCallback) {
+ const auto &name = menuItems.front();
+
+ if (name == ContentRegistry::Interface::impl::SeparatorValue) {
diff --git a/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp b/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp
index 1ea8e959ef00..ccb254965155 100644
--- a/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp
+++ b/editors/imhex/files/patch-plugins_builtin_include_content_views_view__pattern__editor.hpp
@@ -1,4 +1,4 @@
---- plugins/builtin/include/content/views/view_pattern_editor.hpp.orig 2022-11-14 09:07:21 UTC
+--- plugins/builtin/include/content/views/view_pattern_editor.hpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/include/content/views/view_pattern_editor.hpp
@@ -16,6 +16,7 @@
#include
@@ -14,6 +14,6 @@
- std::map> m_sectionWindowDrawer;
+ std::map> m_sectionWindowDrawer;
- private:
- void drawConsole(ImVec2 size, const std::vector> &console);
- void drawEnvVars(ImVec2 size, std::list &envVars);
+
+ ui::HexEditor m_sectionHexEditor;
+
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_command__palette__commands.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_command__palette__commands.cpp
new file mode 100644
index 000000000000..6718550d195e
--- /dev/null
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_command__palette__commands.cpp
@@ -0,0 +1,11 @@
+--- plugins/builtin/source/content/command_palette_commands.cpp.orig 2023-04-08 16:49:33 UTC
++++ plugins/builtin/source/content/command_palette_commands.cpp
+@@ -69,7 +69,7 @@ namespace hex::plugin::builtin {
+ if (auto combined = wolv::util::combineStrings(names, " -> "); hex::containsIgnoreCase(combined, input) && !combined.contains(ContentRegistry::Interface::impl::SeparatorValue) && !combined.contains(ContentRegistry::Interface::impl::SubMenuValue)) {
+ result.emplace_back(ContentRegistry::CommandPaletteCommands::impl::QueryResult {
+ std::move(combined),
+- [entry](const auto&) { entry.callback(); }
++ [entry=entry](const auto&) { entry.callback(); }
+ });
+ }
+ }
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp
index f5bcbad9ec53..1e41fa40cd56 100644
--- a/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_data__inspector.cpp
@@ -1,4 +1,4 @@
---- plugins/builtin/source/content/data_inspector.cpp.orig 2022-09-03 22:05:27 UTC
+--- plugins/builtin/source/content/data_inspector.cpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/source/content/data_inspector.cpp
@@ -105,7 +105,7 @@ namespace hex::plugin::builtin {
@@ -9,7 +9,7 @@
}
template
-@@ -285,7 +285,7 @@ namespace hex::plugin::builtin {
+@@ -277,7 +277,7 @@ namespace hex::plugin::builtin {
auto number = hex::crypt::decodeSleb128(buffer);
bool negative = number < 0;
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_pl__visualizers.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_pl__visualizers.cpp
new file mode 100644
index 000000000000..5639a0159ade
--- /dev/null
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_pl__visualizers.cpp
@@ -0,0 +1,31 @@
+--- plugins/builtin/source/content/pl_visualizers.cpp.orig 2023-04-08 16:59:02 UTC
++++ plugins/builtin/source/content/pl_visualizers.cpp
+@@ -303,11 +303,11 @@ namespace hex::plugin::builtin {
+
+ ImGui::TableNextColumn();
+ ImGui::TextUnformatted("hex.builtin.pl_visualizer.3d.rotation"_lang);
+- ImGui::VSliderFloat("##X", ImVec2(18_scaled, textureSize.y), &rotation.data()[0], 0, std::numbers::pi * 2, "", ImGuiSliderFlags_AlwaysClamp);
++ ImGui::VSliderFloat("##X", ImVec2(18_scaled, textureSize.y), &rotation.data()[0], 0, 3.141592653589793238462643383279502884L * 2, "", ImGuiSliderFlags_AlwaysClamp);
+ ImGui::SameLine();
+- ImGui::VSliderFloat("##Y", ImVec2(18_scaled, textureSize.y), &rotation.data()[1], 0, std::numbers::pi * 2, "", ImGuiSliderFlags_AlwaysClamp);
++ ImGui::VSliderFloat("##Y", ImVec2(18_scaled, textureSize.y), &rotation.data()[1], 0, 3.141592653589793238462643383279502884L * 2, "", ImGuiSliderFlags_AlwaysClamp);
+ ImGui::SameLine();
+- ImGui::VSliderFloat("##Z", ImVec2(18_scaled, textureSize.y), &rotation.data()[2], 0, std::numbers::pi * 2, "", ImGuiSliderFlags_AlwaysClamp);
++ ImGui::VSliderFloat("##Z", ImVec2(18_scaled, textureSize.y), &rotation.data()[2], 0, 3.141592653589793238462643383279502884L * 2, "", ImGuiSliderFlags_AlwaysClamp);
+
+ ImGui::TableNextRow();
+ ImGui::TableNextColumn();
+@@ -319,10 +319,10 @@ namespace hex::plugin::builtin {
+ ImGui::PopItemWidth();
+
+ for (u8 i = 0; i < 3; i++) {
+- while (rotation.data()[i] > std::numbers::pi * 2)
+- rotation.data()[i] -= std::numbers::pi * 2;
++ while (rotation.data()[i] > 3.141592653589793238462643383279502884L * 2)
++ rotation.data()[i] -= 3.141592653589793238462643383279502884L * 2;
+ while (rotation.data()[i] < 0)
+- rotation.data()[i] += std::numbers::pi * 2;
++ rotation.data()[i] += 3.141592653589793238462643383279502884L * 2;
+ }
+
+ ImGui::TableNextColumn();
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp
index 6f842aea0d2a..b66b5990b311 100644
--- a/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp
@@ -1,6 +1,6 @@
---- plugins/builtin/source/content/providers/disk_provider.cpp.orig 2022-10-08 08:03:47 UTC
+--- plugins/builtin/source/content/providers/disk_provider.cpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/source/content/providers/disk_provider.cpp
-@@ -20,7 +20,7 @@
+@@ -24,7 +24,7 @@
#include
#endif
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp
deleted file mode 100644
index 554360faa23e..000000000000
--- a/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/builtin/source/content/settings_entries.cpp.orig 2023-02-12 18:24:04 UTC
-+++ plugins/builtin/source/content/settings_entries.cpp
-@@ -24,8 +24,7 @@ namespace {
- userFolders.clear();
- std::vector paths = setting;
- for (const auto &path : paths) {
-- // JSON reads char8_t as array, char8_t is not supported as of now
-- std::u8string_view uString(reinterpret_cast(&path.front()), reinterpret_cast(std::next(&path.back())));
-+ std::string_view uString(&path.front()); // This is necessary for Clang13
- userFolders.emplace_back(uString);
- }
- }
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp
index 10e2dd5a7c40..94b040b8b8f5 100644
--- a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__find.cpp
@@ -1,17 +1,17 @@
---- plugins/builtin/source/content/views/view_find.cpp.orig 2023-02-12 18:24:04 UTC
+--- plugins/builtin/source/content/views/view_find.cpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/source/content/views/view_find.cpp
-@@ -305,7 +305,7 @@ namespace hex::plugin::builtin {
-
- auto occurrence = reader.begin();
+@@ -314,7 +314,7 @@ namespace hex::plugin::builtin {
while (true) {
+ task.update(progress);
+
- occurrence = std::search(reader.begin(), reader.end(), std::boyer_moore_horspool_searcher(bytes.begin(), bytes.end()));
+ occurrence = std::search(reader.begin(), reader.end(), bytes.begin(), bytes.end());
if (occurrence == reader.end())
break;
-@@ -407,7 +407,7 @@ namespace hex::plugin::builtin {
- if (validBytes == size) {
- bytes &= hex::bitmask(size * 8);
+@@ -423,7 +423,7 @@ namespace hex::plugin::builtin {
+
+ task.update(address);
- auto result = std::visit([&](auto tag) {
+ auto result = std::visit([&, min=min, max=max](auto tag) {
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp
index d2e69f0e0684..ec2e8357c7dc 100644
--- a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp
@@ -1,6 +1,6 @@
---- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2023-02-12 18:24:04 UTC
+--- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/source/content/views/view_hex_editor.cpp
-@@ -297,7 +297,7 @@ namespace hex::plugin::builtin {
+@@ -298,7 +298,7 @@ namespace hex::plugin::builtin {
reader.seek(this->m_searchPosition.value_or(provider->getBaseAddress()));
constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd, const auto &needleBegin, const auto &needleEnd) {
diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp
index fe12e229b4fb..e6d2be7ebd87 100644
--- a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp
+++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__pattern__editor.cpp
@@ -1,29 +1,32 @@
---- plugins/builtin/source/content/views/view_pattern_editor.cpp.orig 2023-02-15 08:39:23 UTC
+--- plugins/builtin/source/content/views/view_pattern_editor.cpp.orig 2023-04-04 10:04:22 UTC
+++ plugins/builtin/source/content/views/view_pattern_editor.cpp
-@@ -437,7 +437,7 @@ namespace hex::plugin::builtin {
*** 137 LINES SKIPPED ***
From nobody Sun Apr 9 08:01:25 2023
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 4PvPgq0RcTz4443m;
Sun, 9 Apr 2023 08:01:27 +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 4PvPgp13rFz3LFj;
Sun, 9 Apr 2023 08:01:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681027286;
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=i8x7YMXRXRwHRCQIJz91LQeDb4yT1gkriYk974fnqCQ=;
b=x+NPrxBjEiF+zrmGyDeDoiH7pjw/chchAEgm2g1MrDtwZ4IsO03gEvbSErCtLTLztFgEXQ
OGUvIhvP9ScEfv7BqpQMQKX/f0QIheG/vX5TLgV3y70a2YQrUYsypbkWiONEFm0r7yoVNC
dL2F7V/64fT4VJut7u7+19ykn6pzNffjy7J+YFue2Fe7oU9ZO2r3O1wR/n6uwIpZ7EXYBc
ZaQCkRbH99ZrtcDHW6x0eecxVZ9sTxeBWodLEeUfVRyD7PdfNAgc22XhXjBqPuEWx7QO86
+zdSmF3v5xDFN7pX3JFIZWnPODOGKXiwIegNZ+JXDTKxnjSgEGNpMzP6Jc4SCA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681027286;
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=i8x7YMXRXRwHRCQIJz91LQeDb4yT1gkriYk974fnqCQ=;
b=vnROntfa9jHGU1EYahxxUOtakEzU07V1sBH2brjwXKtgW/GGTqLM4lxb74216Y9Lmb8bj7
IUqj6M5TpZ/F8d0DcAuVDosM0g+GsDLnp/4prN5WH5Do9DqqFjYID5EIh4NtEGeHHAKr26
5zbJSbrDeLhjSjywssyUg1AkkWDvwdnLJsZ369qPyDdfBzYVwNbVWpRymE1KqcaBLWUNak
A63YVRC7io1FfeYXpoClApLQratXKeQT7hegEJnjysi0y+zvh510/5roUh0HmAB2a7D/4w
JSkmciLOLerEsnVJilleWYdB61uRO3t1NM7E5JbTw0BXJ0EJoZW+ZZjQUC0nmA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681027286; a=rsa-sha256; cv=none;
b=nf8Zo/3a9zg3FrubbMUmVsOMSZVvfYqH/Vgg66hFkodxedzWyEvZCzrQ1N1RMDhzIzy0RI
XJJeZWeUcwSVQz2stjuD8loST35wySb2kUiURVVi5Yl3ANjZLHyvZBjZLrsHjnhu4M0AOm
sM4mh0YQ8dSnHncU1JEF6t1i4wMO/w0jrijlNO6THG8QPWJucLEDad6Do3HGlylMTsiI36
oiohxowtRiE7uBKdJWg+2nFkng3Bds6YGMupYAG0dyzS9sspLDxbIi9jTcnxmVl9MIQhuE
7qav8z2vwfJOAsysmw1xmKlf8pieVj6tb5UlvzELOK/NAuGCvsHk0Ush3MpPGQ==
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 4PvPgp08ysz10wq;
Sun, 9 Apr 2023 08:01:26 +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 33981PUo028788;
Sun, 9 Apr 2023 08:01:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33981PWt028773;
Sun, 9 Apr 2023 08:01:25 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 08:01:25 GMT
Message-Id: <202304090801.33981PWt028773@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Hiroki Tagato
Subject: git: 7bf327888c90 - main - editors/vscode: switch from VS Market Place to Open VSX Registry
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: tagattie
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 7bf327888c9057ba0e884ca50ad467d70a4fbbdc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7bf327888c9057ba0e884ca50ad467d70a4fbbdc
commit 7bf327888c9057ba0e884ca50ad467d70a4fbbdc
Author: Hiroki Tagato
AuthorDate: 2023-04-09 07:58:27 +0000
Commit: Hiroki Tagato
CommitDate: 2023-04-09 08:01:17 +0000
editors/vscode: switch from VS Market Place to Open VSX Registry
According to Microsoft Visual Studio Marketplace Terms of Use[1],
"Marketplace Offerings are intended for use only with In-Scope
Products and Services and you may install and use Marketplace
Offerings only with In-Scope Products and Services."
In-Scope Products and Services are "Microsoft Visual Studio, Visual
Studio for Mac, Visual Studio Code, GitHub Codespaces, Azure DevOps,
Azure DevOps Server, and successor products and services" and does not
include Code - OSS.
So switch to Open VSX Registry, a community driven, fully open
platform for publishing and consuming VS Code extensions.
While here, add option for building remote extension host (off by
default).
[1] https://aka.ms/vsmarketplace-ToU
---
editors/vscode/Makefile | 41 ++++++++++++++++------
.../vscode/files/patch-build_npm_postinstall.js | 12 ++++---
editors/vscode/files/patch-product.json | 9 +++--
3 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 1ddd526fb9d0..8738380a38a1 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,10 +1,9 @@
PORTNAME= vscode
DISTVERSION= 1.77.1
+PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \
- https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
-DISTFILES= node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \
- yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
+DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
DIST_SUBDIR= ${PORTNAME}
@@ -58,8 +57,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
bash:shells/bash
-USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \
- python:build shebangfix xorg
+USES= desktop-file-utils gl gmake gnome iconv jpeg localbase:ldflags \
+ pkgconfig python:build shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= microsoft
@@ -75,8 +74,8 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
-# See ${WRKSRC}/remote/.yarnrc for NODE_VER
-NODE_VER= 16.14.2
+# Keep NODE_VER in sync with www/node16 DISTVERSION
+NODE_VER= 16.20.0
NODE_VER_MAJOR= ${NODE_VER:C/\..*$//}
# See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD
ESBUILD_VER_BUILD= 0.15.5
@@ -99,6 +98,10 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
# This is a workaround to avoid filesystem violations during poudriere build
MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1
+OPTIONS_DEFINE= REH
+OPTIONS_DEFAULT=# none
+REH_DESC= Build remote extension host
+
ELECTRON_DIR= ${.CURDIR}/../../devel/electron19
.include "${ELECTRON_DIR}/Makefile.version"
@@ -118,14 +121,19 @@ post-patch:
# force use of electron version matching port one
${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \
${WRKSRC}/.yarnrc
+ # force use of node version matching port one
+ ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${NODE_VER}\2|' \
+ ${WRKSRC}/remote/.yarnrc
# setup yarnrc for using local node headers
${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \
${WRKSRC}/.yarnrc
- ${ECHO_CMD} 'nodedir "${WRKDIR}/node-v${NODE_VER}"' >> \
+ ${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> \
${WRKSRC}/remote/.yarnrc
# setup yarnrc for offline node_modules installation
${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \
${WRKSRC}/.yarnrc
+ ${ECHO_CMD} 'yarn-offline-mirror "../../yarn-offline-cache"' >> \
+ ${WRKSRC}/remote/.yarnrc
(cd ${WRKSRC} && \
${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
@@ -182,11 +190,22 @@ do-build:
# build and package vscode
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
- # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
- # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min
# copy marketplace extensions
${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-x64/resources/app/extensions
+do-build-REH-on:
+ # setup download cache for node
+ ${MKDIR} ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64
+ ${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODE_VER}/linux-x64
+ # build vscode remote extension host
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
+ ${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
+ cd ${WRKDIR}/vscode-reh-linux-x64 && ${TAR} -cf - . | \
+ ${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
+ cd ${WRKDIR}/vscode-reh && \
+ ${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz .
+ # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min
+
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 523afaa94179..81e9a96dc775 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,17 +1,21 @@
---- build/npm/postinstall.js.orig 2022-07-05 18:15:23 UTC
+--- build/npm/postinstall.js.orig 2023-04-04 22:49:54 UTC
+++ build/npm/postinstall.js
-@@ -20,7 +20,9 @@ function yarnInstall(location, opts) {
+@@ -20,7 +20,13 @@ function yarnInstall(location, opts) {
const raw = process.env['npm_config_argv'] || '{}';
const argv = JSON.parse(raw);
const original = argv.original || [];
- const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files');
+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose'];
+ const args = original.filter(arg => passargs.includes(arg));
-+ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc');
++ if (opts.cwd === 'remote') {
++ args.push('--use-yarnrc=' + process.env.PWD + '/' + opts.cwd + '/.yarnrc');
++ } else {
++ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc');
++ }
if (opts.ignoreEngines) {
args.push('--ignore-engines');
delete opts.ignoreEngines;
-@@ -73,5 +75,5 @@ for (let dir of dirs) {
+@@ -73,5 +79,5 @@ for (let dir of dirs) {
yarnInstall(dir, opts);
}
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index 6f4ab95bdcc7..e2637d0cf164 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,14 +1,13 @@
---- product.json.orig 2022-11-09 00:04:34 UTC
+--- product.json.orig 2023-04-04 22:49:54 UTC
+++ product.json
-@@ -29,6 +29,17 @@
+@@ -29,6 +29,16 @@
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
"urlProtocol": "code-oss",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
+ "extensionsGallery": {
-+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
-+ "itemUrl": "https://marketplace.visualstudio.com/items"
++ "serviceUrl": "https://open-vsx.org/vscode/gallery",
++ "itemUrl": "https://open-vsx.org/vscode/item"
+ },
+ "introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146",
+ "keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
From nobody Sun Apr 9 08:12:46 2023
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 4PvPwt53Zmz444wf;
Sun, 9 Apr 2023 08:12:46 +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 4PvPwt4czlz3qVr;
Sun, 9 Apr 2023 08:12:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681027966;
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=ixe+pOCWXliUxBcWR7rgvVB3iYWibyp4lGw0uHcgom4=;
b=Xk/CTi4Z2drGYVnKOY4xd0yAYsoE8rrkoxTI1TtdeBYsan+KPEtyZcO7hnrSQ6yCJNDn4r
prZbk/1eg5EfnATZ1Hp5iZxUx9jNfCzzXf9x0wt4BaZH2Y1+PPBDg3A0SgIJHHayuPzAHx
kzelGJLaE6v4lcg887otHAg/2yUd7k3yuf/EO5PXMkw4S0qUj2Ic5aQUehmqVZhFmf/Ea2
g3aCj1S0oDq3GoFHzmhn7EIuRMzYoCdPAoLYWIfgUarJ9J9E+3Ei+IMex/+BuoYzdOt6je
hTvFErbrSyxkDZUGmal2O9Xl6N/es64JDb3dhDCrsglIDGDqmCSUtDvL+D7GdQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681027966;
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=ixe+pOCWXliUxBcWR7rgvVB3iYWibyp4lGw0uHcgom4=;
b=VIg7G2XGb18BDuRxIbyUMO31zNDNtHCWQiDcFZjiyuIFKp/4MPS5Jk2+vSHflwmLYJ/NIX
Ql93MQtfQK5SC2CBOZB4PgId/tG0eNZMPQhfDIG+tgCnITfupb/ybR4s6+QEfsmWmOFltB
0JGqA9q4vGlJeb9X1/jajI9HeiziVq/jcb8uB/6RBcNPHweEdbUt2X4c1lFusNLpDmp2Hr
61+JC0WL03WrV1kzpV9PNt9oDu0BCP5JfMzkU/kzZqj5p9ohKEsf3L5AE15EgZyQAPKw/x
WEaVHJDVSlEuWGtwv/IRc255JTuf2RVMeEqdluRrnjnG5TqwQXJhWR+wBUEIgA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681027966; a=rsa-sha256; cv=none;
b=thmL60kTsFggEfrvJt6E7pBnrjqIEMTVtp/beCKaH3wgdVAG1eT+sh30Rov7kCTCkyGpJl
myOIQK4kRe9atwjegaXyUH3ooBn7QtoPnfJRLcQVoA22pvju0PHt6iy7R3i27HUJ0fEDpd
iB8OpwuzzVby1SsFKNyZU8OjuggXEonr9soWzc9aT9vFezZrXc4jiUYVICpli54CZR2TFa
NozTFHli0l0LYtzL8b6tm0Wytr1TMHnul4OWtroJRRK6dWu5eJrO9Td6lwoOLaLWuHsu0G
gFWlXWLFbtHF4BWJsUE5NxlYINPUCW2ry9j5SeeSNBwlQHwcgLb1qAwR2Y8ghQ==
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 4PvPwt3kxGz119w;
Sun, 9 Apr 2023 08:12:46 +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 3398Ck4v050462;
Sun, 9 Apr 2023 08:12:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3398CkgI050461;
Sun, 9 Apr 2023 08:12:46 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 08:12:46 GMT
Message-Id: <202304090812.3398CkgI050461@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Guido Falsi
Subject: git: e5a1ccaa5588 - main - net/rustdesk-server: Mark broken on aarch64.
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: madpilot
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e5a1ccaa55885168b2f201f7abc943b6ab89220d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e5a1ccaa55885168b2f201f7abc943b6ab89220d
commit e5a1ccaa55885168b2f201f7abc943b6ab89220d
Author: Guido Falsi
AuthorDate: 2023-04-09 08:12:21 +0000
Commit: Guido Falsi
CommitDate: 2023-04-09 08:12:21 +0000
net/rustdesk-server: Mark broken on aarch64.
---
net/rustdesk-server/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/rustdesk-server/Makefile b/net/rustdesk-server/Makefile
index ed7ab5bbdb7e..134c3d883776 100644
--- a/net/rustdesk-server/Makefile
+++ b/net/rustdesk-server/Makefile
@@ -9,6 +9,8 @@ WWW= https://rustdesk.com/server/
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
+BROKEN_aarch64= fails to build
+
USES= cargo
GROUPS= rustdesk
USERS= rustdesk
From nobody Sun Apr 9 08:16:43 2023
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 4PvQ1R6SQ2z4452R;
Sun, 9 Apr 2023 08:16:43 +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 4PvQ1R6355z3xc8;
Sun, 9 Apr 2023 08:16:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681028203;
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=KCc7hv7tXDnqqXzsIl6wUr95jBmMvdT+eHbWX1UBLuA=;
b=dS26zuXA+TF5YFy/z6fq+ObFakCooQ+Uj+PuNuSBfEFU5SEkTlZHEX5MrJIFG7D4cjdkww
rX+rbY/MrUBr1mQWZphJIYGjUg4CD/Lc9zAU7OXQgBNwbYm0LYo5ydtc83QzNS6dy74XWF
bnFreOfirTZb4DNg99RdQ013XbaVIqJq/m3ilFDHtM8Z4tryQN+ak6FDw2nb3PcUhFj4lO
R35Mhcy17n4+kE0ELorGc8neyNx47LyhwIJSZ3ujVywV4+e4D4SE51yeasN/Q69eLRY3C7
huqM2MSAUyllYME/vNa6Q+Au+Z/VvP+CrJb5QtPIqwNWhzJmUoxhINbZXJ7jFw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681028203;
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=KCc7hv7tXDnqqXzsIl6wUr95jBmMvdT+eHbWX1UBLuA=;
b=ptH91gjP1NGdt+Ew0bHKmoN7VFDcfLfsetC00AuablqetrPUIZ7z4QAj1QeCAt5l4nW6q7
Lk9T7E53MDgHSOBhzDZpr+EYz0ICljyyeTWFP4dp41/3RwNUcB+c2cx0xMSFbKLHKslc2t
gQvT+UXVG+IBZK2CNce4J/agdGLcfmFv9ldOQ+wZpeugmnzT7uZe2vkbNdCQ8TFhe+Hfa3
M/1Jc0cm/45INVfxH/rlTeh0AHqJb1xykIUuPpcy+2X2Zim33m4B2ubynpUqkjrxT7YneK
tS1mB54QZ2nozneBcLG+ZvHjot7dpEdbPH5bk5UADRijNeaYUoOEuTO6ulHX+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681028203; a=rsa-sha256; cv=none;
b=letmN3I/4sqmKj+MCu74/tZV2FKM3OJxYyagBSX7NoEo6g+BnUrdoyvCzw/WEx9yD3U3cF
9xboXJ8hjXo3Bcj6YT95mEzn/hnVTo9gZGeResFmGTmZBMPP6o1z+ZW1C9N4YsRL0zn1kV
pqASVwDhInu82I41E5oZaFeHkWOZPFWdn0YpYzsNINhHtXygzYcy5lRTQLQLdyXtfBFJzt
hbZhObwk2LoHmOgICdwE8bhgcET9+/UsNBVscqhWOAQVCpGgtASd7vCFH1F5/FnRjN03GM
8+kfSMgjonMF0SHFAYFjMfEeqc+YH6N4PLmCc6YwLteo+6UP36KSvFuxofeJ7g==
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 4PvQ1R58fWz119x;
Sun, 9 Apr 2023 08:16:43 +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 3398GhoI051068;
Sun, 9 Apr 2023 08:16:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3398Gh8j051067;
Sun, 9 Apr 2023 08:16:43 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 08:16:43 GMT
Message-Id: <202304090816.3398Gh8j051067@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-branches@FreeBSD.org
From: Guido Falsi
Subject: git: 7a502fa143f3 - 2023Q2 - net/rustdesk-server: Mark broken on aarch64.
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: madpilot
X-Git-Repository: ports
X-Git-Refname: refs/heads/2023Q2
X-Git-Reftype: branch
X-Git-Commit: 7a502fa143f318fbfa5b4c9a3be1397f6572fc5f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch 2023Q2 has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7a502fa143f318fbfa5b4c9a3be1397f6572fc5f
commit 7a502fa143f318fbfa5b4c9a3be1397f6572fc5f
Author: Guido Falsi
AuthorDate: 2023-04-09 08:12:21 +0000
Commit: Guido Falsi
CommitDate: 2023-04-09 08:16:34 +0000
net/rustdesk-server: Mark broken on aarch64.
(cherry picked from commit e5a1ccaa55885168b2f201f7abc943b6ab89220d)
---
net/rustdesk-server/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/rustdesk-server/Makefile b/net/rustdesk-server/Makefile
index 5c7d591a0547..37c736eed0c5 100644
--- a/net/rustdesk-server/Makefile
+++ b/net/rustdesk-server/Makefile
@@ -10,6 +10,8 @@ WWW= https://rustdesk.com/server/
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
+BROKEN_aarch64= fails to build
+
USES= cargo
GROUPS= rustdesk
USERS= rustdesk
From nobody Sun Apr 9 08:18:11 2023
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 4PvQ374XqKz4458l;
Sun, 9 Apr 2023 08:18:11 +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 4PvQ3747P7z41qT;
Sun, 9 Apr 2023 08:18:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681028291;
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=lSx3hqHpRqYfiGzZkCMnO0lj1ZprTiLkzhxmTgCNtQc=;
b=Cic0HMkGaoPgEU3LXhqcTcUR4X7O7m5ykWfo7fK1nGvlhHAIdEEJM7pYpfFZ/CW070PXHz
WigzSnJX5FBnVrBI6w4v9uB0oYq2agysdt2dPVagRF/WIQaPhNCv6yFdIwcz9bi4E1P3oP
By6VXe7IgbTW2u5mkm5uxYEOrFxs2mlJAMRfWCqbaCtUL1Jh8LPgUpwemsWAPZHHdrjoba
J4ZBJyfTI/6cOwOq/78QAZODgVWQ75ZR03YYTJnWF2ZOUijlqUU0Zu9u/aFFgmU5+wTPsT
vTMRUbAPLtQupIsIiqhAQ7iGuorFFtljOSZCaV6rs/SbGc6raxKau+4NRzAUag==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681028291;
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=lSx3hqHpRqYfiGzZkCMnO0lj1ZprTiLkzhxmTgCNtQc=;
b=QY2jPXVC0MCUXYbG3aFvG33WskFc/N9BLz9vcvg9BR8eoFwPaKejKL/9K9uxoYAZh9SDPR
mjFbyjqhecZvYTeV36bB+BCctR3HO7INBtdvn99R9+t4ekiSK6uPuZPda77GFVoEZM4Y3C
x9gBZRb1i2DgpPnwUSrY85csvYkhUJUTDHIfHRFPo1Wr5BbFGcFQR/5W0fFVLMS6se7l4e
SWaAQSr404WXsPnkYLZ06tLB706F6xQmNM79GSaRbyghE5Msanjz6yTZfXABx2deQUq8yn
RwJTVrAXR2LpEX+ZdCbyj4SoNzWeAHCSENdmJCX/g8MNztMgyoCyK9wZzKZ2sQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681028291; a=rsa-sha256; cv=none;
b=LwiptbKJtzMHt/cgUqw31L/uj8qL/kH435S3EXbSZ7h2SVLQ5SedONvBHYGhfxtJwGttnT
rO5DUvQ4I4r2+lHJ/VRU84q4SaSybxM6jxvuZWCEIo3vwaJA14/SEqvJAOhnhvsWSQPt3P
K850k0lE7DxVlQDCUtlwenqO8DjMWp1WWzd//b7jIvZuv3ZVMYfL9IbXfhQfzkKcTDTHM0
NeWUUnJYIAeNIki/5I02zuutie3jDw01vcpHrazVk4CKBZT4xqbTE6Bxl5kuAZCNSokwZ1
AcQIIUcPkND4UGOKESl0gxoBZn4MgtGG3wPzRwavnox9lUw8CBNVuTYN/78l6A==
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 4PvQ373DcJz11fp;
Sun, 9 Apr 2023 08:18:11 +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 3398IBiD051350;
Sun, 9 Apr 2023 08:18:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3398IBp2051349;
Sun, 9 Apr 2023 08:18:11 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 08:18:11 GMT
Message-Id: <202304090818.3398IBp2051349@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Rene Ladan
Subject: git: 2f42218cc66b - main - multimedia/pHash/: Remove expired port:
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: rene
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 2f42218cc66b50c45d5b5828ad0cc8369745c59c
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2f42218cc66b50c45d5b5828ad0cc8369745c59c
commit 2f42218cc66b50c45d5b5828ad0cc8369745c59c
Author: Rene Ladan
AuthorDate: 2023-04-09 08:17:38 +0000
Commit: Rene Ladan
CommitDate: 2023-04-09 08:17:59 +0000
multimedia/pHash/: Remove expired port:
2023-04-09 multimedia/pHash: No users left in tree and fails to build with FFmpeg 6.0
---
MOVED | 1 +
multimedia/Makefile | 1 -
multimedia/pHash/Makefile | 62 -------------
multimedia/pHash/distinfo | 2 -
multimedia/pHash/files/patch-configure | 20 -----
multimedia/pHash/files/patch-ffmpeg30 | 139 -----------------------------
multimedia/pHash/files/patch-src_pHash.cpp | 22 -----
multimedia/pHash/pkg-descr | 3 -
multimedia/pHash/pkg-plist | 9 --
9 files changed, 1 insertion(+), 258 deletions(-)
diff --git a/MOVED b/MOVED
index d58e79fd6d76..54104ca11e51 100644
--- a/MOVED
+++ b/MOVED
@@ -17889,3 +17889,4 @@ multimedia/transcode||2023-03-31|Has expired: abandoned by upstream and does not
security/teleport5|security/teleport|2023-03-31|More recent version than expired teleport port
www/anyterm||2023-04-01|Has expired: upstream is dead
audio/mousai-devel|audio/mousai|2023-04-06|Updated to the latest stable version
+multimedia/pHash||2023-04-09|Has expired: No users left in tree and fails to build with FFmpeg 6.0
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 253b592033c1..0c97c4c5ee9f 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -282,7 +282,6 @@
SUBDIR += p5-MP4-Info
SUBDIR += p5-Net-UPnP
SUBDIR += p5-Subtitles
- SUBDIR += pHash
SUBDIR += peek
SUBDIR += phonon
SUBDIR += phonon-designerplugin
diff --git a/multimedia/pHash/Makefile b/multimedia/pHash/Makefile
deleted file mode 100644
index 83f16bb404f1..000000000000
--- a/multimedia/pHash/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-PORTNAME= pHash
-PORTVERSION= 0.9.6
-PORTREVISION= 16
-CATEGORIES= multimedia devel
-MASTER_SITES= http://phash.org/releases/ \
- http://www.cyberbotx.com/pHash/
-
-MAINTAINER= cyberbotx@cyberbotx.com
-COMMENT= Open source perceptual hash library
-WWW= https://phash.org/
-
-LICENSE= GPLv3+
-
-DEPRECATED= No users left in tree and fails to build with FFmpeg 6.0
-EXPIRATION_DATE=2023-04-09
-
-USES= compiler:c11 gmake libtool pathfix
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= PTHREAD_LIBS="-lpthread"
-INSTALL_TARGET= install-strip
-USE_LDCONFIG= yes
-
-OPTIONS_DEFINE= DEBUG FFTW JPEG OPENMP PNG
-OPTIONS_MULTI= HASHING
-OPTIONS_MULTI_HASHING= AUDIO IMAGE VIDEO
-OPTIONS_DEFAULT= FFTW JPEG PNG AUDIO IMAGE VIDEO
-AUDIO_DESC= Enable audio hashing
-IMAGE_DESC= Enable image hashing
-VIDEO_DESC= Enable video hashing
-
-DEBUG_CONFIGURE_ENABLE= debug
-
-FFTW_CONFIGURE_WITH= fftw
-FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3
-
-JPEG_CONFIGURE_WITH= libjpeg
-JPEG_USES= jpeg
-
-OPENMP_CONFIGURE_ENABLE=openmp
-
-PNG_CONFIGURE_WITH= libpng
-PNG_LIB_DEPENDS= libpng.so:graphics/png
-
-AUDIO_CONFIGURE_ENABLE= audio-hash
-AUDIO_LIB_DEPENDS= libsndfile.so:audio/libsndfile \
- libsamplerate.so:audio/libsamplerate \
- libmpg123.so:audio/mpg123
-
-IMAGE_CONFIGURE_ENABLE= image-hash
-IMAGE_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg
-IMAGE_RUN_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg
-
-VIDEO_CONFIGURE_ENABLE= video-hash
-VIDEO_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg
-VIDEO_RUN_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg
-VIDEO_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-
-post-patch:
-# Avoid USES=autoreconf while keeping configure.ac patch for reference
- @${TOUCH} -r ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure.ac
-
-.include
diff --git a/multimedia/pHash/distinfo b/multimedia/pHash/distinfo
deleted file mode 100644
index ccda48e78c3e..000000000000
--- a/multimedia/pHash/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pHash-0.9.6.tar.gz) = 3c8258a014f9c2491fb1153010984606805638a45d00498864968a9a30102935
-SIZE (pHash-0.9.6.tar.gz) = 1315965
diff --git a/multimedia/pHash/files/patch-configure b/multimedia/pHash/files/patch-configure
deleted file mode 100644
index 9d869267f69c..000000000000
--- a/multimedia/pHash/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2013-04-23 18:48:24 UTC
-+++ configure
-@@ -16584,7 +16584,7 @@ if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d+:} false; th
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfftw3 $LIBS"
-+LIBS="-lfftw3 -lfftw3_threads $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -16615,7 +16615,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" >&5
- $as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" >&6; }
- if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" = xyes; then :
-- CPPFLAGS="$CPPFLAGS -Dcimg_use_fftw3" LIBS="$LIBS -lfftw3"
-+ CPPFLAGS="$CPPFLAGS -Dcimg_use_fftw3" LIBS="$LIBS -lfftw3 -lfftw3_threads"
- else
- if test "x$with_fftw" = "xyes"; then :
- as_fn_error $? "FFTW support requested but library not found" "$LINENO" 5
diff --git a/multimedia/pHash/files/patch-ffmpeg30 b/multimedia/pHash/files/patch-ffmpeg30
deleted file mode 100644
index d2e1ba48908b..000000000000
--- a/multimedia/pHash/files/patch-ffmpeg30
+++ /dev/null
@@ -1,139 +0,0 @@
---- configure.orig 2013-04-23 18:48:24 UTC
-+++ configure
-@@ -16009,9 +16009,9 @@ if test "x$enable_video_hash" != "xno";
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FFmpeg is present" >&5
- $as_echo_n "checking whether FFmpeg is present... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5
--$as_echo_n "checking for avcodec_alloc_frame in -lavcodec... " >&6; }
--if ${ac_cv_lib_avcodec_avcodec_alloc_frame+:} false; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_decode_video2 in -lavcodec" >&5
-+$as_echo_n "checking for avcodec_decode_video2 in -lavcodec... " >&6; }
-+if ${ac_cv_lib_avcodec_avcodec_decode_video2+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -16025,27 +16025,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char avcodec_alloc_frame ();
-+char avcodec_decode_video2 ();
- int
- main ()
- {
--return avcodec_alloc_frame ();
-+return avcodec_decode_video2 ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
-- ac_cv_lib_avcodec_avcodec_alloc_frame=yes
-+ ac_cv_lib_avcodec_avcodec_decode_video2=yes
- else
-- ac_cv_lib_avcodec_avcodec_alloc_frame=no
-+ ac_cv_lib_avcodec_avcodec_decode_video2=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_alloc_frame" >&5
--$as_echo "$ac_cv_lib_avcodec_avcodec_alloc_frame" >&6; }
--if test "x$ac_cv_lib_avcodec_avcodec_alloc_frame" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_decode_video2" >&5
-+$as_echo "$ac_cv_lib_avcodec_avcodec_decode_video2" >&6; }
-+if test "x$ac_cv_lib_avcodec_avcodec_decode_video2" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBAVCODEC 1
- _ACEOF
---- configure.ac.orig 2013-04-23 18:47:49 UTC
-+++ configure.ac
-@@ -122,7 +122,7 @@ fi])
- AC_DEFUN([AC_CHECK_FFMPEG],
- [
- AC_MSG_CHECKING([whether FFmpeg is present])
--AC_CHECK_LIB([avcodec], [avcodec_alloc_frame], [], [AC_MSG_ERROR([
-+AC_CHECK_LIB([avcodec], [avcodec_decode_video2], [], [AC_MSG_ERROR([
-
- *** libavcodec not found.
- You need FFmpeg. Get it at ])])
---- src/cimgffmpeg.cpp.orig 2012-11-23 20:58:01 UTC
-+++ src/cimgffmpeg.cpp
-@@ -39,11 +39,11 @@ void vfinfo_close(VFInfo *vfinfo){
- int ReadFrames(VFInfo *st_info, CImgList *pFrameList, unsigned int low_index, unsigned int hi_index)
- {
- //target pixel format
-- PixelFormat ffmpeg_pixfmt;
-+ AVPixelFormat ffmpeg_pixfmt;
- if (st_info->pixelformat == 0)
-- ffmpeg_pixfmt = PIX_FMT_GRAY8;
-+ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8;
- else
-- ffmpeg_pixfmt = PIX_FMT_RGB24;
-+ ffmpeg_pixfmt = AV_PIX_FMT_RGB24;
-
- st_info->next_index = low_index;
-
-@@ -100,12 +100,12 @@ int ReadFrames(VFInfo *st_info, CImgList
- AVFrame *pFrame;
-
- // Allocate video frame
-- pFrame=avcodec_alloc_frame();
-+ pFrame=av_frame_alloc();
- if (pFrame==NULL)
- return -1;
-
- // Allocate an AVFrame structure
-- AVFrame *pConvertedFrame = avcodec_alloc_frame();
-+ AVFrame *pConvertedFrame = av_frame_alloc();
- if(pConvertedFrame==NULL)
- return -1;
-
-@@ -123,7 +123,7 @@ int ReadFrames(VFInfo *st_info, CImgList
- int size = 0;
-
-
-- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3;
-+ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3;
-
- AVPacket packet;
- int result = 1;
-@@ -189,11 +189,11 @@ int ReadFrames(VFInfo *st_info, CImgList
-
- int NextFrames(VFInfo *st_info, CImgList *pFrameList)
- {
-- PixelFormat ffmpeg_pixfmt;
-+ AVPixelFormat ffmpeg_pixfmt;
- if (st_info->pixelformat == 0)
-- ffmpeg_pixfmt = PIX_FMT_GRAY8;
-+ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8;
- else
-- ffmpeg_pixfmt = PIX_FMT_RGB24;
-+ ffmpeg_pixfmt = AV_PIX_FMT_RGB24;
-
- if (st_info->pFormatCtx == NULL)
- {
-@@ -254,10 +254,10 @@ int NextFrames(VFInfo *st_info, CImgList
- AVFrame *pFrame;
-
- // Allocate video frame
-- pFrame=avcodec_alloc_frame();
-+ pFrame=av_frame_alloc();
-
- // Allocate an AVFrame structure
-- AVFrame *pConvertedFrame = avcodec_alloc_frame();
-+ AVFrame *pConvertedFrame = av_frame_alloc();
- if(pConvertedFrame==NULL){
- return -1;
- }
-@@ -287,7 +287,7 @@ int NextFrames(VFInfo *st_info, CImgList
- break;
- if(packet.stream_index == st_info->videoStream) {
-
-- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3;
-+ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3;
- AVPacket avpkt;
- av_init_packet(&avpkt);
- avpkt.data = packet.data;
diff --git a/multimedia/pHash/files/patch-src_pHash.cpp b/multimedia/pHash/files/patch-src_pHash.cpp
deleted file mode 100644
index 5528ff0e505f..000000000000
--- a/multimedia/pHash/files/patch-src_pHash.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/pHash.cpp.orig 2013-04-13 17:23:12 UTC
-+++ src/pHash.cpp
-@@ -34,14 +34,18 @@
- int ph_num_threads()
- {
- int numCPU = 1;
--#ifdef __GLIBC__
-+#ifdef _SC_NPROCESSORS_ONLN
- numCPU = sysconf( _SC_NPROCESSORS_ONLN );
- #else
- int mib[2];
- size_t len;
-
- mib[0] = CTL_HW;
-+#ifdef HW_AVAILCPU
- mib[1] = HW_AVAILCPU;
-+#else
-+ mib[1] = HW_NCPU;
-+#endif
-
- sysctl(mib, 2, &numCPU, &len, NULL, 0);
-
diff --git a/multimedia/pHash/pkg-descr b/multimedia/pHash/pkg-descr
deleted file mode 100644
index 92e4e2ee71df..000000000000
--- a/multimedia/pHash/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-pHash is an open source software library released under the GPLv3 license that
-implements several perceptual hashing algorithms, and provides a C-like API to
-use those functions in your own programs. pHash itself is written in C++.
diff --git a/multimedia/pHash/pkg-plist b/multimedia/pHash/pkg-plist
deleted file mode 100644
index 13814d437c3a..000000000000
--- a/multimedia/pHash/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-include/audiophash.h
-include/pHash-config.h
-include/pHash.h
-include/ph_fft.h
-lib/libpHash.a
-lib/libpHash.so
-lib/libpHash.so.0
-lib/libpHash.so.0.0.0
-libdata/pkgconfig/pHash.pc
From nobody Sun Apr 9 08:54:15 2023
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 4PvQrm0nngz4476t;
Sun, 9 Apr 2023 08:54:16 +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 4PvQrm0Bw9z45Jx;
Sun, 9 Apr 2023 08:54:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681030456;
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=N9Xgi50ngb+PDzTQozoHpbeLHGG+zefdP9cUMmB2GiI=;
b=uhSN7TRgJtv9GZsjaxdVgEqbU5GK4xH1YMBtw+RdJnP+jAN45Fsov7pGNod4WjWoONe4bx
k8JBSDvh6rz6pyrxAh+zASetO2VBMvxU4gLeGN68IFf9yPZFm2xxu2OBYbE5x7FYLEKIeX
PfX9YQezbPaGArF0+nIpuj2SdfcOtXu/nE4o2m6Vwkte3zTm1/gCes3uKvdXAYJPjIM5Z3
dIG1XezgOIlm9sj8/saw0uoCPjxW/Al3PYE8NCL7khSSx7IgTweZgNQ/krTNQyBGfXzKbL
fqnRxtJrtUkoOm+e45jRMKCaHCJnkUzK7Ks0qJ+HguiOl6DE6cdXZmL0ddZIpg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681030456;
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=N9Xgi50ngb+PDzTQozoHpbeLHGG+zefdP9cUMmB2GiI=;
b=F9z7CIiD6JoHQpI6hAkM/p1VubtA/WHnDa2uiVACYI2/urjMRFb9Q3L2obEdlLdaqb1VYw
zQVyqg3Sy7dcZErCN3yH+4KoFIQz7gFjqTLtV6kfSxVyNYokVdrSopZKZTkXFUC7n+7fxh
0BJGvT9B+szcvg0pT1nGY/ZHv4CLj89ArdDKE2xFkfkfnkfRs3ifRvqdLw1I9mlR0AYO4g
hIW9TwMwjBOk2S9LqbUsfudGhkMbBMsvWdiyBFATezrVUsWi7ejUJmSA+r0ZhGNe+mJD0Q
gAQji58mZFizFMBRdl6/QKJqKNvcPEeUJGMidkJ/MESyAUgosu38eqszYqbLmw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681030456; a=rsa-sha256; cv=none;
b=iURYg4zJ4Jv08k9lNzwQ5d5q7UhUOGRi/TI+NqRzptHKWvh/eSfimIq1XFfKnBBm5z0mS0
42CcoNWhjEI8GAruvLkw4QGsf4Deykd/aMdsL/iR5qzsuRD3Bbi9ZAjT5lde5c2Z1zsOb6
hM7lEttBMqQXQOEM47/u2QCemSIVCqYr4afXP4/JWbvgCUb2xGeHMWTRhvfNo+3GOnmARo
KUFDree81fKfO1c3TR+lesvedqryDvMVHU71DorvwpX2i8y1oFZqMkPX5NO8Okqk+s3mW+
dFvzYCxNbfnV0XvisflL7zIxQXwlV6XLQPx+PcwM9E7DxfUHVlqsAs9AvnOqvQ==
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 4PvQrl66DTz11mk;
Sun, 9 Apr 2023 08:54:15 +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 3398sF2g015541;
Sun, 9 Apr 2023 08:54:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3398sFkb015540;
Sun, 9 Apr 2023 08:54:15 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 08:54:15 GMT
Message-Id: <202304090854.3398sFkb015540@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Ashish SHUKLA
Subject: git: 9fa63aec6112 - main - textproc/ugrep: Update to 3.11.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: ashish
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9fa63aec6112f8129bb1e2e027f574fa2495f488
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9fa63aec6112f8129bb1e2e027f574fa2495f488
commit 9fa63aec6112f8129bb1e2e027f574fa2495f488
Author: Ashish SHUKLA
AuthorDate: 2023-04-09 08:40:46 +0000
Commit: Ashish SHUKLA
CommitDate: 2023-04-09 08:43:55 +0000
textproc/ugrep: Update to 3.11.2
---
textproc/ugrep/Makefile | 2 +-
textproc/ugrep/distinfo | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/textproc/ugrep/Makefile b/textproc/ugrep/Makefile
index e26a98c9b95a..ca9de11f95f5 100644
--- a/textproc/ugrep/Makefile
+++ b/textproc/ugrep/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ugrep
DISTVERSIONPREFIX= v
-DISTVERSION= 3.11.1
+DISTVERSION= 3.11.2
CATEGORIES= textproc
MAINTAINER= ashish@FreeBSD.org
diff --git a/textproc/ugrep/distinfo b/textproc/ugrep/distinfo
index 3f706c21f3eb..0b7570ed84cb 100644
--- a/textproc/ugrep/distinfo
+++ b/textproc/ugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680464108
-SHA256 (Genivia-ugrep-v3.11.1_GH0.tar.gz) = 0a36d7bb62c49262b433eb301d8de6b90233a23446a71484738cd35650cc5c91
-SIZE (Genivia-ugrep-v3.11.1_GH0.tar.gz) = 4463407
+TIMESTAMP = 1681029515
+SHA256 (Genivia-ugrep-v3.11.2_GH0.tar.gz) = a314cc6fe149eef9bc0f0d69c6b331d9d4491a100677c1b3fbb2159806cca2dd
+SIZE (Genivia-ugrep-v3.11.2_GH0.tar.gz) = 4465613
From nobody Sun Apr 9 09:56:08 2023
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 4PvSD8356kz44BrW;
Sun, 9 Apr 2023 09:56:08 +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 4PvSD82GS2z3NDb;
Sun, 9 Apr 2023 09:56:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681034168;
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=UAhJ5xKxUKFpCkhpulQo/9lLnPl/DFWJaf+AatxRdy0=;
b=QTlu3YnTeNa85cmWfaHhnWCkYVjPZ4kATY024xBo52eGjL1uNCbXAhVhPW2ELW84uFeUrT
Ub5/w71xxrJVTRrW6bL+sHIOynhKKgqM9uzBEqKrk0FS6+4v0hFOTSGwrTMoHHrWhYZQjJ
1wjEZko+svJO6Kq6uKjTrTdNCDWJunPJ3uYCNDuz/O0Me0IGIvVic5uTl8qtr78m5e6SDF
BRbxNY7sKd4ilRMRmrCjzayIu+3Ykv9yvmBvi2LmPmaHHuoyTFbxyUhfQ0G951f7N8cRO4
A+AdQ4AfRDTlN65LE9J0FhvpzT4nw+/Jw5hxk2D7rhhdIsxdJWfYW/qUzB72pA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681034168;
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=UAhJ5xKxUKFpCkhpulQo/9lLnPl/DFWJaf+AatxRdy0=;
b=jchdznFhqCzRXpSYj00BCqw0/ky+eWgKcGuZOQWwOdydd0yHl2cUDKJCxE5s9nM0OqjiGU
JhA7S1HhIfb8ukMJ0WDplLxE1+j19OlElYOuCQL2UonUVQlNa7QCWsGzkt5kWvMBgPwX1T
PGQ5hSbytY7iXUm2dK9aT38xBcHcWSo8zXk9e/KLHGZDgu/J9zAzO/k8EOigJ+NV+17krV
+o3L9xwZwD6lrpNHwXjoC6E9+7zh/qRPFJep1Gi6X+NpX3hNbM0D1DTeahEqMSSD87GbeK
on7cvlGyaErGnL6WCBBVgLfNKC464MnrI+Ecu4ElJEk155slmpMJed+SGVwkuw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681034168; a=rsa-sha256; cv=none;
b=YStlZ4uN6hMgw3uf+ZNv1JNont1CuGog0eqnQavgjWtHLoOVHoJ1wbBU1obnaq9mkoSYKu
Aw5UBrup0SHCZ/67AZTFJDfTKqCwbV/gfjT1YDCnVga15UcoqZRz1tzn/hwlqN7YalsH5t
Ti78vxWb0yRTCmpNKT7WBGArYbys0Y1dZMHsJ8PGzydEpjk2o+jcPBh+NYx3nYpOto7mWr
F5n24X7RpptNrtwsg0kskGIS2fvac5LnlAM79GOtWBns1zsKY/Iy/yYlkVr4IRZ711tJIX
AZs7o58j2DVCGVnmOlhanfO/hup0WXagoVFSEnm7C/eKXXx954uR0XkWVYNROA==
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 4PvSD81MTLz13wZ;
Sun, 9 Apr 2023 09:56:08 +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 3399u8sm014668;
Sun, 9 Apr 2023 09:56:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3399u8Y2014667;
Sun, 9 Apr 2023 09:56:08 GMT
(envelope-from git)
Date: Sun, 9 Apr 2023 09:56:08 GMT
Message-Id: <202304090956.3399u8Y2014667@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Rene Ladan
Subject: git: 42579eaa9f2d - main - security/vuxml: fix whitespace error
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: rene
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 42579eaa9f2d7aee57dbe0868190b2e3fec62032
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=42579eaa9f2d7aee57dbe0868190b2e3fec62032
commit 42579eaa9f2d7aee57dbe0868190b2e3fec62032
Author: Rene Ladan
AuthorDate: 2023-04-09 09:55:33 +0000
Commit: Rene Ladan
CommitDate: 2023-04-09 09:56:01 +0000
security/vuxml: fix whitespace error
Reported by: `make validate`
---
security/vuxml/vuln/2023.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/vuxml/vuln/2023.xml b/security/vuxml/vuln/2023.xml
index a9dac90cff5b..13c4ea5fec0f 100644
--- a/security/vuxml/vuln/2023.xml
+++ b/security/vuxml/vuln/2023.xml
@@ -141,7 +141,7 @@
LDAP filters was insufficient and an attacker may be
able to obtain confidential BitLocker recovery keys
from a Samba AD DC.
- Installations with such secrets in their Samba AD
+
Installations with such secrets in their Samba AD
should assume they have been obtained and need replacing.