Re: New: games/serioussam

2023-12-03 Thread Александр Павлов
Thanks for the quick reply.

Thanks @Stefan for the archive with fixed files.
I will add all the fixes from Stefan to the pull request at
https://github.com/jasperla/openbsd-wip/pull/170

There is a known problem on the aarch64 architecture in Serious Sam The
Second Encounter. Game freezes on the splash screen when you select New
Game in the menu. The solution is to edit or create a new
SamTSE/Scripts/Game_startup.ini file with the line sam_strFirstLevel =
"Levels\\LevelsMP\\1_1_Palenque.wld;]

Serious Sam's code is portable, so adding supported architectures is not
difficult. Need to add the architecture definition here:
https://github.com/tx00100xt/SeriousSamClassic/blob/70b3d5eb58be32501fd7c1c3fd2a11e911f69db4/SamTFE/Sources/Engine/Base/Types.h#L79
And add compiler flags here:
https://github.com/tx00100xt/SeriousSamClassic/blob/70b3d5eb58be32501fd7c1c3fd2a11e911f69db4/SamTFE/Sources/CMakeLists.txt#L355
For such an extraordinary architecture as e2k, it was enough to specify the
definition in Engine/Base/Types.h and the game started.

If you need any more fixes please write.
Best Regards,
Alexander.

пн, 4 дек. 2023 г. в 00:59, Kirill Bychkov :

> On Sun, December 3, 2023 17:53, Александр Павлов wrote:
> > Hello!
> > This is my first ever port for OpenBSD. It's the open source Serious Sam
> > Classic engine.
> >
> > Tested on amd64 and i386 architectures. Works just as well as on Linux or
> > FreeBSD.
> >
> > I wish to get this added to the official ports tree, so please leave
> > any feedback or suggestions on what can be improved. Thank you!
> >
> > Source on Github:
> > https://github.com/tx00100xt/SeriousSamClassic
> >
> Damn... My school-days... Will take a look in a few days.
>
>


Re: Add devel/rust-analyzer

2023-12-03 Thread Benjamin Stürz

On 04.12.23 02:22, Greg Steuck wrote:

Greg Steuck  writes:


I verified that this works well enough in emacs with eglot. Maybe others
will find it useful enough to OK? If so, I'd apprecite a bit of extra
diligence as this is my first rust port.

It works for me.


rust-src seems important for this port, maybe it should be in RUN_DEPENDS?

Yes, rust-analyzer is AFAIK unusable without the source code of Rust.


As reminded by mbhul@, tgz is easier for the initial imports.


Thanks for your port.



security/p5-CryptX: Update to 0.080

2023-12-03 Thread wen heping
Hi, ports@:

Here is a simple patch for security/p5-CryptX to
update to 0.080.
It build well and pass all tests on amd64-current system.

7 ports depend on security/p5-CryptX, all build well and
pass all tests.



Cheers !
wenIndex: Makefile
===
RCS file: /cvs/ports/security/p5-CryptX/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile7 May 2023 11:19:34 -   1.11
+++ Makefile4 Dec 2023 03:04:10 -
@@ -1,6 +1,6 @@
 COMMENT =  cryptographic toolkit for Perl
 
-DISTNAME = CryptX-0.078
+DISTNAME = CryptX-0.080
 CPAN_AUTHOR =  MIK
 
 CATEGORIES =   security
Index: distinfo
===
RCS file: /cvs/ports/security/p5-CryptX/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo7 May 2023 11:19:34 -   1.8
+++ distinfo4 Dec 2023 03:04:10 -
@@ -1,2 +1,2 @@
-SHA256 (CryptX-0.078.tar.gz) = kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0=
-SIZE (CryptX-0.078.tar.gz) = 1647544
+SHA256 (CryptX-0.080.tar.gz) = tFe3khlKbJwT8G/goLXqFYllwygvOFypPh8AorM+fok=
+SIZE (CryptX-0.080.tar.gz) = 1651772


回复: misc/p5-Finance-Quote: Update to 1.57

2023-12-03 Thread wen heping
ping ...


发件人: owner-po...@openbsd.org  代表 wen heping 

发送时间: 2023年12月1日 15:10
收件人: ports@openbsd.org
主题: 回复: misc/p5-Finance-Quote: Update to 1.57

Here is the revised patch for misc/p5-Finance-Quote to
update to 1.58.

5 new and needed new port had been imported to
portstree now.

Regards,
wen


发件人: wen heping 
发送时间: 2023年7月9日 17:34
收件人: ports@openbsd.org
主题: misc/p5-Finance-Quote: Update to 1.57

Hi, ports@:

   Here is a patch for misc/p5-Finance-Quote:
   i) Update to 1.57
   ii) Update RUN_DEPENDS
   iii) Add some TEST_DEPENDS

   It build and run well on amd64-current system. Without ONLINE_TEST it passed
all tests.

   Five new ports should be imported before commit this patch.




Regards,
wen


Re: Add devel/rust-analyzer

2023-12-03 Thread Greg Steuck
Greg Steuck  writes:

> I verified that this works well enough in emacs with eglot. Maybe others
> will find it useful enough to OK? If so, I'd apprecite a bit of extra
> diligence as this is my first rust port.
>
> rust-src seems important for this port, maybe it should be in RUN_DEPENDS?

As reminded by mbhul@, tgz is easier for the initial imports.



rust-analyzer.tgz
Description: Binary data


Add devel/rust-analyzer

2023-12-03 Thread Greg Steuck
I verified that this works well enough in emacs with eglot. Maybe others
will find it useful enough to OK? If so, I'd apprecite a bit of extra
diligence as this is my first rust port.

rust-src seems important for this port, maybe it should be in RUN_DEPENDS?

>From 66e7595456552f8b76a602eff92e4136b7b97441 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 3 Dec 2023 13:06:02 -0800
Subject: [PATCH] Added devel/rust-analyzer

---
 devel/rust-analyzer/Makefile   |  31 +++
 devel/rust-analyzer/crates.inc | 191 
 devel/rust-analyzer/distinfo   | 384 +
 devel/rust-analyzer/pkg/DESCR  |   4 +
 devel/rust-analyzer/pkg/PLIST  |   1 +
 5 files changed, 611 insertions(+)
 create mode 100644 devel/rust-analyzer/Makefile
 create mode 100644 devel/rust-analyzer/crates.inc
 create mode 100644 devel/rust-analyzer/distinfo
 create mode 100644 devel/rust-analyzer/pkg/DESCR
 create mode 100644 devel/rust-analyzer/pkg/PLIST

diff --git a/devel/rust-analyzer/Makefile b/devel/rust-analyzer/Makefile
new file mode 100644
index 000..ef1f143ef60
--- /dev/null
+++ b/devel/rust-analyzer/Makefile
@@ -0,0 +1,31 @@
+COMMENT =  modular compiler frontend for the Rust language
+CATEGORIES =   devel
+
+GH_ACCOUNT =   rust-lang
+GH_PROJECT =   rust-analyzer
+GH_TAGNAME =   2023-11-27
+
+DISTNAME = ${GH_PROJECT}-${GH_TAGNAME:S/-//g}
+
+HOMEPAGE = https://rust-analyzer.github.io/
+
+# Apache 2.0
+PERMIT_PACKAGE =   Yes
+
+WANTLIB += c c++abi m pthread util
+
+MODULES =  devel/cargo
+
+MODCARGO_CRATES_UPDATE =   cc libc
+MODCARGO_RUSTFLAGS += -L${PREFIX}/lib
+
+MAKE_ENV = ${MODCARGO_ENV}
+
+CONFIGURE_STYLE =  cargo
+
+do-install:
+   ${INSTALL_PROGRAM} ${MODCARGO_TARGET_DIR}/release/rust-analyzer 
${PREFIX}/bin/
+
+.include "crates.inc"
+
+.include 
diff --git a/devel/rust-analyzer/crates.inc b/devel/rust-analyzer/crates.inc
new file mode 100644
index 000..f57f80d9bb0
--- /dev/null
+++ b/devel/rust-analyzer/crates.inc
@@ -0,0 +1,191 @@
+MODCARGO_CRATES += addr2line   0.19.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += always-assert   0.1.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += anyhow  1.0.75  # MIT OR Apache-2.0
+MODCARGO_CRATES += arbitrary   1.3.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += arrayvec0.7.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += backtrace   0.3.67  # MIT OR Apache-2.0
+MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
+MODCARGO_CRATES += bitflags2.4.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += byteorder   1.4.3   # Unlicense OR MIT
+MODCARGO_CRATES += camino  1.1.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += cargo-platform  0.1.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += cargo_metadata  0.18.1  # MIT
+MODCARGO_CRATES += cc  1.0.79  # MIT OR Apache-2.0
+MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
+MODCARGO_CRATES += chalk-derive0.95.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += chalk-ir0.95.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += chalk-recursive 0.95.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += chalk-solve 0.95.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += command-group   2.1.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += countme 3.0.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += cov-mark2.0.0-pre.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += crc32fast   1.3.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-channel   0.5.8   # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-deque 0.8.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-epoch 0.9.15  # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.16  # MIT OR Apache-2.0
+MODCARGO_CRATES += ctrlc   3.4.1   # MIT/Apache-2.0
+MODCARGO_CRATES += dashmap 5.4.0   # MIT
+MODCARGO_CRATES += derive_arbitrary1.3.2   # MIT/Apache-2.0
+MODCARGO_CRATES += dissimilar  1.0.7   # Apache-2.0
+MODCARGO_CRATES += dot 0.1.4   # MIT/Apache-2.0
+MODCARGO_CRATES += drop_bomb   0.1.5   # MIT OR Apache-2.0
+MODCARGO_CRATES += either  1.9.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += ena 0.14.2  # MIT OR Apache-2.0
+MODCARGO_CRATES += equivalent  1.0.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += expect-test 1.4.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += filetime0.2.22  # MIT/Apache-2.0
+MODCARGO_CRATES += fixedbitset 0.4.2   # MIT/Apache-2.0
+MODCARGO_CRATES += flate2  1.0.26  # MIT OR Apache-2.0
+MODCARGO_CRATES += form_urlencoded 1.2.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += fsevent-sys 4.1.0   # MIT
+MODCARGO_CRATES += fst 0.4.7   # Unlicense/MIT
+MODCARGO_CRATES += gimli   0.27.3  # MIT OR Apache-2.0
+MODCARGO_CRATES += hashbrown   0.12.3  # MIT OR Apache-2.

Re: New: games/serioussam

2023-12-03 Thread Kirill Bychkov
On Sun, December 3, 2023 17:53, Александр Павлов wrote:
> Hello!
> This is my first ever port for OpenBSD. It's the open source Serious Sam
> Classic engine.
>
> Tested on amd64 and i386 architectures. Works just as well as on Linux or
> FreeBSD.
>
> I wish to get this added to the official ports tree, so please leave
> any feedback or suggestions on what can be improved. Thank you!
>
> Source on Github:
> https://github.com/tx00100xt/SeriousSamClassic
>
Damn... My school-days... Will take a look in a few days.



Re: Fix u-boot-asahi plist

2023-12-03 Thread Tobias Heider
On Sun, Dec 03, 2023 at 10:08:24PM +0100, Mark Kettenis wrote:
> Add a few files that were missed in a previous update.
> 
> ok?

ok tobhe@

> 
> 
> Index: sysutils/u-boot-asahi/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot-asahi/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- sysutils/u-boot-asahi/Makefile10 Sep 2023 15:18:39 -  1.12
> +++ sysutils/u-boot-asahi/Makefile3 Dec 2023 21:03:44 -
> @@ -6,6 +6,7 @@ VERSION=  2023.07.02
>  GH_ACCOUNT=  AsahiLinux
>  GH_PROJECT=  u-boot
>  GH_TAGNAME=  openbsd-v${VERSION}
> +REVISION=0
>  
>  PKGNAME= u-boot-asahi-${VERSION:S/-/./g}
>  
> Index: sysutils/u-boot-asahi/pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/u-boot-asahi/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- sysutils/u-boot-asahi/pkg/PLIST   11 Nov 2022 19:38:11 -  1.3
> +++ sysutils/u-boot-asahi/pkg/PLIST   3 Dec 2023 21:03:44 -
> @@ -8,12 +8,19 @@ share/u-boot/apple_m1/dts/t6001-j314c.dt
>  share/u-boot/apple_m1/dts/t6001-j316c.dtb
>  share/u-boot/apple_m1/dts/t6001-j375c.dtb
>  share/u-boot/apple_m1/dts/t6002-j375d.dtb
> +share/u-boot/apple_m1/dts/t6020-j414s.dtb
> +share/u-boot/apple_m1/dts/t6020-j474s.dtb
> +share/u-boot/apple_m1/dts/t6021-j414c.dtb
> +share/u-boot/apple_m1/dts/t6021-j416c.dtb
> +share/u-boot/apple_m1/dts/t6022-j180d.dtb
>  share/u-boot/apple_m1/dts/t8103-j274.dtb
>  share/u-boot/apple_m1/dts/t8103-j293.dtb
>  share/u-boot/apple_m1/dts/t8103-j313.dtb
>  share/u-boot/apple_m1/dts/t8103-j456.dtb
>  share/u-boot/apple_m1/dts/t8103-j457.dtb
>  share/u-boot/apple_m1/dts/t8112-j413.dtb
> +share/u-boot/apple_m1/dts/t8112-j415.dtb
> +share/u-boot/apple_m1/dts/t8112-j473.dtb
>  share/u-boot/apple_m1/dts/t8112-j493.dtb
>  share/u-boot/apple_m1/u-boot
>  share/u-boot/apple_m1/u-boot-nodtb.bin
> 



Fix u-boot-asahi plist

2023-12-03 Thread Mark Kettenis
Add a few files that were missed in a previous update.

ok?


Index: sysutils/u-boot-asahi/Makefile
===
RCS file: /cvs/ports/sysutils/u-boot-asahi/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- sysutils/u-boot-asahi/Makefile  10 Sep 2023 15:18:39 -  1.12
+++ sysutils/u-boot-asahi/Makefile  3 Dec 2023 21:03:44 -
@@ -6,6 +6,7 @@ VERSION=2023.07.02
 GH_ACCOUNT=AsahiLinux
 GH_PROJECT=u-boot
 GH_TAGNAME=openbsd-v${VERSION}
+REVISION=  0
 
 PKGNAME=   u-boot-asahi-${VERSION:S/-/./g}
 
Index: sysutils/u-boot-asahi/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/u-boot-asahi/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- sysutils/u-boot-asahi/pkg/PLIST 11 Nov 2022 19:38:11 -  1.3
+++ sysutils/u-boot-asahi/pkg/PLIST 3 Dec 2023 21:03:44 -
@@ -8,12 +8,19 @@ share/u-boot/apple_m1/dts/t6001-j314c.dt
 share/u-boot/apple_m1/dts/t6001-j316c.dtb
 share/u-boot/apple_m1/dts/t6001-j375c.dtb
 share/u-boot/apple_m1/dts/t6002-j375d.dtb
+share/u-boot/apple_m1/dts/t6020-j414s.dtb
+share/u-boot/apple_m1/dts/t6020-j474s.dtb
+share/u-boot/apple_m1/dts/t6021-j414c.dtb
+share/u-boot/apple_m1/dts/t6021-j416c.dtb
+share/u-boot/apple_m1/dts/t6022-j180d.dtb
 share/u-boot/apple_m1/dts/t8103-j274.dtb
 share/u-boot/apple_m1/dts/t8103-j293.dtb
 share/u-boot/apple_m1/dts/t8103-j313.dtb
 share/u-boot/apple_m1/dts/t8103-j456.dtb
 share/u-boot/apple_m1/dts/t8103-j457.dtb
 share/u-boot/apple_m1/dts/t8112-j413.dtb
+share/u-boot/apple_m1/dts/t8112-j415.dtb
+share/u-boot/apple_m1/dts/t8112-j473.dtb
 share/u-boot/apple_m1/dts/t8112-j493.dtb
 share/u-boot/apple_m1/u-boot
 share/u-boot/apple_m1/u-boot-nodtb.bin



Re: New: games/serioussam

2023-12-03 Thread Stefan Hagen
Stefan Hagen wrote (2023-12-03 18:38 CET):
> Morgan Aldridge wrote (2023-12-03 17:04 CET):
> > On Sun, Dec 3, 2023 at 09:57 Александр Павлов  wrote:
> > 
> > > Hello!
> > > This is my first ever port for OpenBSD. It's the open source Serious Sam
> > > Classic engine.
> > >
> > > Tested on amd64 and i386 architectures. Works just as well as on Linux or
> > > FreeBSD.
> > >
> > > I wish to get this added to the official ports tree, so please leave
> > > any feedback or suggestions on what can be improved. Thank you!
> > >
> > > Source on Github:
> > > https://github.com/tx00100xt/SeriousSamClassic
> > >
> > 
> > Excellent and thanks! We were just discussing your work in #openbsd-gamin
> > on irc.libera.chat yesterday.
> > 
> > There was no attachment for your submission and a .tgz containing the new
> > port directory is preferred for new ports. I saw you submitted a PR to an
> > individual's WIP ports repo on GitHub:
> > 
> > 
> > 
> > I haven't tested, but I'd suggest tarballing that (less the 'FINISHED'
> > file) and attaching it here for easier testing by porters.
> 
> Ahh so many memories. I played quite a bit of ssam on lan parties.
> Back then, when monitors were small and heavy. :-)
> 
> Tarball attached with the following changes:
> 
> - changed to DIST_TUPLE
> - Added missing RUN_DEPENDS
> - Uncommented the aarch64 + armv7 bits (let's try to build it)
> - Removed REVISION (not needed on a new port)
> - simplified the README
> - some indentation changes
> - update-plist (for @tag update-desktop-database after adding RDEPS)

I forgot to remove ONLY_FOR_ARCH, thanks mbuhl@ for spotting.

There was also a trailing \ at LIB_DEPENDS.
While there, I also sorted *DEPENDS and WANTLIB.
And I changed the COMMENT wording to read a bit more fluent in English.

@Alexander: This is a pretty good first contribution. All the stuff I'm
changeing is pretty much nit picking. The port worked on the first try!

Updated tarball attached.

Stefan



serioussam.tgz
Description: application/tar-gz


Re: NEW: lang/hare

2023-12-03 Thread Brian Callahan
On 12/3/2023 7:38 AM, Lorenz (xha) wrote:
> On Sun, Dec 03, 2023 at 01:22:31PM +0100, Omar Polo wrote:
>> There are a small number of tests that fail, and one that segfaults, but
>> as support is brand new, I don't think that's necessarily a showstopper.

 can you tell me which test segfaults so i can fix this? all tests should
 and are passing for me (amd64)
>>>
>>> The harec tests don't seem to work at all for me.
>>
>> I'm new to hare, just playing with it, so sorry for chiming in, but
>> tests are fully passing for me, both hare and harec ones.  (There are
>> three skipped tests in hare, but it's just the 'slow tests'.)
>>
>> I'm on amd64 without ibt.
> 
> the harec tree hasn't been updated to compile with -z nobtcfi on
> openbsd, this is why it fails on amd64 with ibt.
> 
> the hare stdlib tests (hare directory) should work with and without ibt
> since we add -z nobtcfi.

Thanks, all. It's in and I've sent my test logs to Lorenz; hopefully he
can help smooth the warts.

~Brian



Re: New: games/serioussam

2023-12-03 Thread Stefan Hagen
Morgan Aldridge wrote (2023-12-03 17:04 CET):
> On Sun, Dec 3, 2023 at 09:57 Александр Павлов  wrote:
> 
> > Hello!
> > This is my first ever port for OpenBSD. It's the open source Serious Sam
> > Classic engine.
> >
> > Tested on amd64 and i386 architectures. Works just as well as on Linux or
> > FreeBSD.
> >
> > I wish to get this added to the official ports tree, so please leave
> > any feedback or suggestions on what can be improved. Thank you!
> >
> > Source on Github:
> > https://github.com/tx00100xt/SeriousSamClassic
> >
> 
> Excellent and thanks! We were just discussing your work in #openbsd-gamin
> on irc.libera.chat yesterday.
> 
> There was no attachment for your submission and a .tgz containing the new
> port directory is preferred for new ports. I saw you submitted a PR to an
> individual's WIP ports repo on GitHub:
> 
> 
> 
> I haven't tested, but I'd suggest tarballing that (less the 'FINISHED'
> file) and attaching it here for easier testing by porters.

Ahh so many memories. I played quite a bit of ssam on lan parties.
Back then, when monitors were small and heavy. :-)

Tarball attached with the following changes:

- changed to DIST_TUPLE
- Added missing RUN_DEPENDS
- Uncommented the aarch64 + armv7 bits (let's try to build it)
- Removed REVISION (not needed on a new port)
- simplified the README
- some indentation changes
- update-plist (for @tag update-desktop-database after adding RDEPS)

Best Regards,
Stefan


serioussam.tgz
Description: application/tar-gz


Re : Re: Re : Re: qt5/qtscript crash fix

2023-12-03 Thread Jonathan Armani


Your diff works well for me too, thanks !



Le dimanche 3 décembre 2023 à 5:19 PM, Rafael Sadowski  
a écrit :


> 
> 
> On Sun Dec 03, 2023 at 12:33:30PM +, Stuart Henderson wrote:
> 
> > Could it be this?
> > 
> > https://bugreports.qt.io/plugins/servlet/mobile#issue/QBS-1684/comment/640130
> > 
> > Franz Jung
> > Added 26 Jan '23 09:38
> > 
> > Clang >= 13
> > Opitmizes the JSC::ExecState::removeHostCallFrameFlag and
> > JSC::ExecState::hasHostCallFrameFlag calls away (file
> > qtscript/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h)
> > Thats the reason why an 0x1 pointer instead of an nullptr gets propagated
> > around.
> > 
> > so if you change these to static member funtctions instead of non-static to
> > remove/check for HostCallFrame it should work.
> > 
> > see https://github.com/llvm/llvm-project/issues/60294
> 
> 
> Interesting. When I use static I ran in other compile issues with auto_ptr.
> So I tried:
> 
> 
> Index: src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h
> --- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h.orig
> +++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h
> @@ -135,9 +135,11 @@ namespace JSC {
> static CallFrame* noCaller() { return 
> reinterpret_cast(HostCallFrameFlag); }
> 
> int returnValueRegister() const { return 
> this[RegisterFile::ReturnValueRegister].i(); }
> 
> +#pragma clang optimize off
> bool hasHostCallFrameFlag() const { return reinterpret_cast(this) & 
> HostCallFrameFlag; }
> 
> CallFrame* addHostCallFrameFlag() const { return 
> reinterpret_cast(reinterpret_cast(this) | 
> HostCallFrameFlag); }
> 
> CallFrame* removeHostCallFrameFlag() { return 
> reinterpret_cast(reinterpret_cast(this) & 
> ~HostCallFrameFlag); }
> 
> +#pragma clang optimize on
> 
> private:
> void setArgumentCount(int count) { 
> static_cast(this)[RegisterFile::ArgumentCount] = 
> Register::withInt(count); }
> 
> 
> This patch above compiles and qcad starts with an dialog but then an
> error message appears:
> 
> QCAD version 3.27.9
> 17:15:40: Debug: loading plugins...
> 17:15:40: Debug: loading static plugins...
> Warning: Qt WebEngine seems to be initialized from a plugin. Please set 
> Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute before 
> constructing QGuiApplication.
> 17:15:41: Debug: Renaming old unversioned config file from 
> '/home/rsadowski/.config/QCAD/QCAD3.conf' to 
> '/home/rsadowski/.config/QCAD/QCAD3_old.conf'
> Warning: RScriptHandlerEcma::eval: script engine exception: "TypeError: 
> Result of expression 'paperSize.width' [undefined] is not a function."
> Warning: "() at 
> /usr/local/share/qcad/scripts/Widgets/FirstStart/FirstStart.js:151\nmain() at 
> scripts/autostart.js:584\n() at scripts/autostart.js:859"
> 
> Warning: At least one uncaught exception:
> Warning: "() at 
> /usr/local/share/qcad/scripts/Widgets/FirstStart/FirstStart.js:151\nmain() at 
> scripts/autostart.js:584\n() at scripts/autostart.js:859"
> 
> 17:15:43: Debug: "() at 151"
> 
> 
> (no coredump)
> 
> 
> which is funny, because now this error also appears with the "-O0"
> version. I will analyze this later.



Re: Change VARBASE to LOCALSTATEDIR in multiple ports

2023-12-03 Thread A Tammy


On 12/3/23 05:38, Stefan Hagen wrote:
> Hi,
>
> I'm progressing in removing VARBASE usage in the ports tree. Most ports are
> updated already, but there are a few left for which I haven't gotten an OK 
> yet.
>
> Attached are diffs for:
>
> No response from maintainer in the last week:
> security/vaultwarden
> net/znc


Ah! It seems like my dovecot got borked for a bit and I didn't see your
message.
OK from me for both these ports.


Thanks,
Aisha


> Maintainer address is handeled by gmail, which doesn't accept my mails at the 
> moment:
> productivity/radicale
> sysutils/slant
>
> No maintainer:
> databases/influxdb
> productivity/radicale2
> sysutils/facette
>
> I'm looking for OKs for these.
>
> No REVISION bump is intentional, because the plist doesn't change.
>
> Best regards,
> Stefan



Re: Re : Re: qt5/qtscript crash fix

2023-12-03 Thread Rafael Sadowski
On Sun Dec 03, 2023 at 12:33:30PM +, Stuart Henderson wrote:
> Could it be this?
> 
> https://bugreports.qt.io/plugins/servlet/mobile#issue/QBS-1684/comment/640130
> 
> Franz Jung
> Added 26 Jan '23 09:38
> 
> Clang >= 13
> Opitmizes the JSC::ExecState::removeHostCallFrameFlag and
> JSC::ExecState::hasHostCallFrameFlag calls away (file
> qtscript/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h)
> Thats the reason why an 0x1 pointer instead of an nullptr gets propagated
> around.
> 
> so if you change these to static member funtctions instead of non-static to
> remove/check for HostCallFrame it should work.
> 
> see https://github.com/llvm/llvm-project/issues/60294
> 

Interesting. When I use static I ran in other compile issues with auto_ptr.
So I tried:


Index: src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h
--- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h.orig
+++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h
@@ -135,9 +135,11 @@ namespace JSC  {
 static CallFrame* noCaller() { return 
reinterpret_cast(HostCallFrameFlag); }
 int returnValueRegister() const { return 
this[RegisterFile::ReturnValueRegister].i(); }
 
+#pragma clang optimize off
 bool hasHostCallFrameFlag() const { return 
reinterpret_cast(this) & HostCallFrameFlag; }
 CallFrame* addHostCallFrameFlag() const { return 
reinterpret_cast(reinterpret_cast(this) | 
HostCallFrameFlag); }
 CallFrame* removeHostCallFrameFlag() { return 
reinterpret_cast(reinterpret_cast(this) & 
~HostCallFrameFlag); }
+#pragma clang optimize on
 
 private:
 void setArgumentCount(int count) { 
static_cast(this)[RegisterFile::ArgumentCount] = 
Register::withInt(count); }

This patch above compiles and qcad starts with an dialog but then an
error message appears:

QCAD version  3.27.9
17:15:40: Debug:loading plugins...
17:15:40: Debug:loading static plugins...
Warning:  Qt WebEngine seems to be initialized from a plugin. Please set 
Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute before 
constructing QGuiApplication.
17:15:41: Debug:Renaming old unversioned config file from 
'/home/rsadowski/.config/QCAD/QCAD3.conf' to 
'/home/rsadowski/.config/QCAD/QCAD3_old.conf'
Warning:  RScriptHandlerEcma::eval: script engine exception:  "TypeError: 
Result of expression 'paperSize.width' [undefined] is not a function."
Warning:  "() at 
/usr/local/share/qcad/scripts/Widgets/FirstStart/FirstStart.js:151\nmain() at 
scripts/autostart.js:584\n() at scripts/autostart.js:859"
Warning:  At least one uncaught exception:
Warning:  "() at 
/usr/local/share/qcad/scripts/Widgets/FirstStart/FirstStart.js:151\nmain() at 
scripts/autostart.js:584\n() at scripts/autostart.js:859"
17:15:43: Debug:"() at 151"

(no coredump)


which is funny, because now this error also appears with the "-O0"
version. I will analyze this later.



Re: New: games/serioussam

2023-12-03 Thread Morgan Aldridge
On Sun, Dec 3, 2023 at 09:57 Александр Павлов  wrote:

> Hello!
> This is my first ever port for OpenBSD. It's the open source Serious Sam
> Classic engine.
>
> Tested on amd64 and i386 architectures. Works just as well as on Linux or
> FreeBSD.
>
> I wish to get this added to the official ports tree, so please leave
> any feedback or suggestions on what can be improved. Thank you!
>
> Source on Github:
> https://github.com/tx00100xt/SeriousSamClassic
>

Excellent and thanks! We were just discussing your work in #openbsd-gamin
on irc.libera.chat yesterday.

There was no attachment for your submission and a .tgz containing the new
port directory is preferred for new ports. I saw you submitted a PR to an
individual's WIP ports repo on GitHub:



I haven't tested, but I'd suggest tarballing that (less the 'FINISHED'
file) and attaching it here for easier testing by porters.

Morgan


New: games/serioussam

2023-12-03 Thread Александр Павлов
Hello!
This is my first ever port for OpenBSD. It's the open source Serious Sam
Classic engine.

Tested on amd64 and i386 architectures. Works just as well as on Linux or
FreeBSD.

I wish to get this added to the official ports tree, so please leave
any feedback or suggestions on what can be improved. Thank you!

Source on Github:
https://github.com/tx00100xt/SeriousSamClassic


Re: Change VARBASE to LOCALSTATEDIR in multiple ports

2023-12-03 Thread Omar Polo
On 2023/12/03 11:38:01 +0100, Stefan Hagen  wrote:
> Hi,
> 
> I'm progressing in removing VARBASE usage in the ports tree. Most ports are
> updated already, but there are a few left for which I haven't gotten an OK 
> yet.
> 
> Attached are diffs for:
> 
> No response from maintainer in the last week:
> security/vaultwarden
> net/znc
> 
> Maintainer address is handeled by gmail, which doesn't accept my mails at the 
> moment:

:/

> productivity/radicale
> sysutils/slant
> 
> No maintainer:
> databases/influxdb
> productivity/radicale2
> sysutils/facette
> 
> I'm looking for OKs for these.
> 
> No REVISION bump is intentional, because the plist doesn't change.

haven't rebuilt the packages but the diffs reads fine to me.  ok op@


Thanks,

Omar Polo



Re: update x11/fvwm3 to 1.0.9

2023-12-03 Thread Michael
On Sun, Dec 03, 2023 at 01:28:36PM +0100, Omar Polo wrote:
> freshly released, works for me (stock configuration with just a few
> changes.)
> 
> full changelog: 
> 
> ok?

That was fast! Looks good to me, lightly tested on amd64 but works even 
with my rather extensive configuration. Thanks Omar.


> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/Makefile,v
> diff -u -p -r1.12 Makefile
> --- Makefile  30 Sep 2023 10:47:28 -  1.12
> +++ Makefile  3 Dec 2023 12:03:37 -
> @@ -1,8 +1,7 @@
>  COMMENT= multiple virtual desktop window manager
>  
> -VERSION= 1.0.8
> +VERSION= 1.0.9
>  DISTNAME=fvwm3-${VERSION}
> -REVISION=0
>  
>  CATEGORIES= x11
>  
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/distinfo,v
> diff -u -p -r1.5 distinfo
> --- distinfo  7 Sep 2023 09:46:33 -   1.5
> +++ distinfo  3 Dec 2023 12:03:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (fvwm3-1.0.8.tar.gz) = fQF8SCSvyJHvvbI3oyulnizZRUKs76sD4dmO3DHTQOs=
> -SIZE (fvwm3-1.0.8.tar.gz) = 5644021
> +SHA256 (fvwm3-1.0.9.tar.gz) = xtBBGpe2IdjA7tNbxBZ4BBUUgOhH9kaUrcqOVd0ZBkg=
> +SIZE (fvwm3-1.0.9.tar.gz) = 4525552
> Index: patches/patch-fvwm_infostore_c
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-fvwm_infostore_c,v
> diff -u -p -r1.1 patch-fvwm_infostore_c
> --- patches/patch-fvwm_infostore_c30 Sep 2023 10:47:28 -  1.1
> +++ patches/patch-fvwm_infostore_c3 Dec 2023 12:03:37 -
> @@ -1,26 +0,0 @@
> -Avoid use-after-free caused by LoadGlobalState() freeing the key
> -that was just inserted. Fix this by always copying the key and
> -avoiding a leak in the only other caller of insert_metainfo()
> -
> -https://github.com/fvwmorg/fvwm3/commit/9811e73aa9f67706e5d74ba811adeebadc195639
> -
> -Index: fvwm/infostore.c
>  fvwm/infostore.c.orig
> -+++ fvwm/infostore.c
> -@@ -78,7 +78,7 @@ void insert_metainfo(char *key, char *value)
> - 
> - /* It's a new item, add it to the list. */
> - mi_new = new_metainfo();
> --mi_new->key = key;
> -+mi_new->key = fxstrdup(key);
> - CopyString(&mi_new->value, value);
> - 
> - mi_new->next = mi_store;
> -@@ -192,6 +192,7 @@ void CMD_InfoStoreAdd(F_CMD_ARGS)
> - }
> - 
> - insert_metainfo(key, value);
> -+free(key);
> - free(value);
> - 
> - return;
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/x11/fvwm3/pkg/PLIST,v
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 4 Sep 2023 11:00:35 -   1.4
> +++ pkg/PLIST 3 Dec 2023 12:05:35 -
> @@ -185,3 +185,5 @@ share/fvwm3/perllib/FVWM/Tracker/WindowL
>  share/fvwm3/perllib/General/
>  share/fvwm3/perllib/General/FileSystem.pm
>  share/fvwm3/perllib/General/Parse.pm
> +share/xsessions/
> +share/xsessions/fvwm3.desktop
> 



Re: NEW: lang/hare

2023-12-03 Thread Lorenz (xha)
On Sun, Dec 03, 2023 at 01:22:31PM +0100, Omar Polo wrote:
> > > > > There are a small number of tests that fail, and one that segfaults, 
> > > > > but
> > > > > as support is brand new, I don't think that's necessarily a 
> > > > > showstopper.
> > > 
> > > can you tell me which test segfaults so i can fix this? all tests should
> > > and are passing for me (amd64)
> > 
> > The harec tests don't seem to work at all for me.
> 
> I'm new to hare, just playing with it, so sorry for chiming in, but
> tests are fully passing for me, both hare and harec ones.  (There are
> three skipped tests in hare, but it's just the 'slow tests'.)
> 
> I'm on amd64 without ibt.

the harec tree hasn't been updated to compile with -z nobtcfi on
openbsd, this is why it fails on amd64 with ibt.

the hare stdlib tests (hare directory) should work with and without ibt
since we add -z nobtcfi.



Re: Re : Re: qt5/qtscript crash fix

2023-12-03 Thread Stuart Henderson

Could it be this?

https://bugreports.qt.io/plugins/servlet/mobile#issue/QBS-1684/comment/640130

Franz Jung
Added 26 Jan '23 09:38

Clang >= 13
Opitmizes the JSC::ExecState::removeHostCallFrameFlag and 
JSC::ExecState::hasHostCallFrameFlag calls away (file 
qtscript/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h) 
Thats the reason why an 0x1 pointer instead of an nullptr gets propagated 
around.


so if you change these to static member funtctions instead of non-static to 
remove/check for HostCallFrame it should work.


see https://github.com/llvm/llvm-project/issues/60294

--
 Sent from a phone, apologies for poor formatting.

On 3 December 2023 09:09:05 Jonathan Armani  wrote:

Le vendredi 1 décembre 2023 à 19:46, Stuart Henderson  
a écrit :






Do you need -O0 or does -O1 also work?


Yes, I tried -01 first without success.



The last opt level on the command line is used, or doesn't really matter if
the existing one is present when you're overriding the default.

--
Sent from a phone, apologies for poor formatting.

On 1 December 2023 14:26:01 Jonathan Armani jonat...@armani.tech wrote:

> Hi,
>
> I hit an identical crash than QCAD in QT Script while playing with Mixxx.
>
> After trying some upstream fixes I found this solution in FreeBSD port.
> Hope it will fix QCAD too, I'm not using it.
>
> I'm not sure this is the best way to overide with CXXFLAGS as both -O2 & -O0
> are present in the generated build command.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtscript/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile 13 Jul 2022 15:48:58 - 1.13
> +++ Makefile 30 Nov 2023 20:29:46 -
> @@ -1,5 +1,9 @@
> QT5NAME = QtScript
> COMMENT-main = ECMAScript language for Qt5
> +REVISION-main = 1
> +
> +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265989
> +CXXFLAGS += -O0
>
> MULTI_PACKAGES = -main -examples
> SHARED_LIBS += Qt5Script 3.0 # 5.9




Re: NEW: lang/hare

2023-12-03 Thread Tobias Heider



On December 3, 2023 1:22:31 PM GMT+01:00, Omar Polo  wrote:
>On 2023/12/03 12:05:20 +0100, Tobias Heider  wrote:
>> On Sun, Dec 03, 2023 at 08:07:19AM +0100, Lorenz (xha) wrote:
>> > thanks for the port ;-)
>> > 
>> > On Sat, Dec 02, 2023 at 10:54:47PM +0100, Tobias Heider wrote:
>> > > On Sat, Dec 02, 2023 at 08:46:11PM +, Brian Callahan wrote:
>> > > > Hi ports --
>> > > > 
>> > > > Attached is a new port for the Hare programming language. Support for
>> > > > OpenBSD was just announced.
>> > > > 
>> > > > This is good enough to compile the Hello world example on the main
>> > > > harelang.org. The port itself is a snapshot I just made of the mainline
>> > > > code, making sure to include some additional improvements from tobhe@
>> > > > that just hit their tree.
>> > > > 
>> > > > Specifically looking for arm64 and riscv64 testing. I've only been able
>> > > > to test it on amd64. I believe some tweaks will be needed for the other
>> > > > archs.
>> > > > 
>> > > > There are a small number of tests that fail, and one that segfaults, 
>> > > > but
>> > > > as support is brand new, I don't think that's necessarily a 
>> > > > showstopper.
>> > 
>> > can you tell me which test segfaults so i can fix this? all tests should
>> > and are passing for me (amd64)
>> 
>> The harec tests don't seem to work at all for me.
>
>I'm new to hare, just playing with it, so sorry for chiming in, but
>tests are fully passing for me, both hare and harec ones.  (There are
>three skipped tests in hare, but it's just the 'slow tests'.)
>
>I'm on amd64 without ibt.

this could be an arm64 bug then

>
>> > > > 
>> > > > OK?
>> > > > 
>> > > > ~Brian
>
>I'm just starting with it, but the hello word and other example code
>from the website works, and i did the first "challenge" of the advent of
>code in it.  Works enough to be hooked in the tree IMHO :)
>
>so ok op@ if you want to import it.

Agree, ok from me too. we can fix the remaining warts in-tree

>
>(the XXX comment in harec/Makefile can be dropped, from what I see
>there's a typo in the upstream makefile that you're patching anyway.)
>



update x11/fvwm3 to 1.0.9

2023-12-03 Thread Omar Polo
freshly released, works for me (stock configuration with just a few
changes.)

full changelog: 

ok?

Index: Makefile
===
RCS file: /home/cvs/ports/x11/fvwm3/Makefile,v
diff -u -p -r1.12 Makefile
--- Makefile30 Sep 2023 10:47:28 -  1.12
+++ Makefile3 Dec 2023 12:03:37 -
@@ -1,8 +1,7 @@
 COMMENT=   multiple virtual desktop window manager
 
-VERSION=   1.0.8
+VERSION=   1.0.9
 DISTNAME=  fvwm3-${VERSION}
-REVISION=  0
 
 CATEGORIES= x11
 
Index: distinfo
===
RCS file: /home/cvs/ports/x11/fvwm3/distinfo,v
diff -u -p -r1.5 distinfo
--- distinfo7 Sep 2023 09:46:33 -   1.5
+++ distinfo3 Dec 2023 12:03:37 -
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.8.tar.gz) = fQF8SCSvyJHvvbI3oyulnizZRUKs76sD4dmO3DHTQOs=
-SIZE (fvwm3-1.0.8.tar.gz) = 5644021
+SHA256 (fvwm3-1.0.9.tar.gz) = xtBBGpe2IdjA7tNbxBZ4BBUUgOhH9kaUrcqOVd0ZBkg=
+SIZE (fvwm3-1.0.9.tar.gz) = 4525552
Index: patches/patch-fvwm_infostore_c
===
RCS file: /home/cvs/ports/x11/fvwm3/patches/patch-fvwm_infostore_c,v
diff -u -p -r1.1 patch-fvwm_infostore_c
--- patches/patch-fvwm_infostore_c  30 Sep 2023 10:47:28 -  1.1
+++ patches/patch-fvwm_infostore_c  3 Dec 2023 12:03:37 -
@@ -1,26 +0,0 @@
-Avoid use-after-free caused by LoadGlobalState() freeing the key
-that was just inserted. Fix this by always copying the key and
-avoiding a leak in the only other caller of insert_metainfo()
-
-https://github.com/fvwmorg/fvwm3/commit/9811e73aa9f67706e5d74ba811adeebadc195639
-
-Index: fvwm/infostore.c
 fvwm/infostore.c.orig
-+++ fvwm/infostore.c
-@@ -78,7 +78,7 @@ void insert_metainfo(char *key, char *value)
- 
-   /* It's a new item, add it to the list. */
-   mi_new = new_metainfo();
--  mi_new->key = key;
-+  mi_new->key = fxstrdup(key);
-   CopyString(&mi_new->value, value);
- 
-   mi_new->next = mi_store;
-@@ -192,6 +192,7 @@ void CMD_InfoStoreAdd(F_CMD_ARGS)
-   }
- 
-   insert_metainfo(key, value);
-+  free(key);
-   free(value);
- 
-   return;
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/x11/fvwm3/pkg/PLIST,v
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Sep 2023 11:00:35 -   1.4
+++ pkg/PLIST   3 Dec 2023 12:05:35 -
@@ -185,3 +185,5 @@ share/fvwm3/perllib/FVWM/Tracker/WindowL
 share/fvwm3/perllib/General/
 share/fvwm3/perllib/General/FileSystem.pm
 share/fvwm3/perllib/General/Parse.pm
+share/xsessions/
+share/xsessions/fvwm3.desktop



Re: NEW: lang/hare

2023-12-03 Thread Omar Polo
On 2023/12/03 12:05:20 +0100, Tobias Heider  wrote:
> On Sun, Dec 03, 2023 at 08:07:19AM +0100, Lorenz (xha) wrote:
> > thanks for the port ;-)
> > 
> > On Sat, Dec 02, 2023 at 10:54:47PM +0100, Tobias Heider wrote:
> > > On Sat, Dec 02, 2023 at 08:46:11PM +, Brian Callahan wrote:
> > > > Hi ports --
> > > > 
> > > > Attached is a new port for the Hare programming language. Support for
> > > > OpenBSD was just announced.
> > > > 
> > > > This is good enough to compile the Hello world example on the main
> > > > harelang.org. The port itself is a snapshot I just made of the mainline
> > > > code, making sure to include some additional improvements from tobhe@
> > > > that just hit their tree.
> > > > 
> > > > Specifically looking for arm64 and riscv64 testing. I've only been able
> > > > to test it on amd64. I believe some tweaks will be needed for the other
> > > > archs.
> > > > 
> > > > There are a small number of tests that fail, and one that segfaults, but
> > > > as support is brand new, I don't think that's necessarily a showstopper.
> > 
> > can you tell me which test segfaults so i can fix this? all tests should
> > and are passing for me (amd64)
> 
> The harec tests don't seem to work at all for me.

I'm new to hare, just playing with it, so sorry for chiming in, but
tests are fully passing for me, both hare and harec ones.  (There are
three skipped tests in hare, but it's just the 'slow tests'.)

I'm on amd64 without ibt.

> > > > 
> > > > OK?
> > > > 
> > > > ~Brian

I'm just starting with it, but the hello word and other example code
from the website works, and i did the first "challenge" of the advent of
code in it.  Works enough to be hooked in the tree IMHO :)

so ok op@ if you want to import it.

(the XXX comment in harec/Makefile can be dropped, from what I see
there's a typo in the upstream makefile that you're patching anyway.)



Re: NEW: lang/hare

2023-12-03 Thread Tobias Heider
On Sun, Dec 03, 2023 at 08:07:19AM +0100, Lorenz (xha) wrote:
> thanks for the port ;-)
> 
> On Sat, Dec 02, 2023 at 10:54:47PM +0100, Tobias Heider wrote:
> > On Sat, Dec 02, 2023 at 08:46:11PM +, Brian Callahan wrote:
> > > Hi ports --
> > > 
> > > Attached is a new port for the Hare programming language. Support for
> > > OpenBSD was just announced.
> > > 
> > > This is good enough to compile the Hello world example on the main
> > > harelang.org. The port itself is a snapshot I just made of the mainline
> > > code, making sure to include some additional improvements from tobhe@
> > > that just hit their tree.
> > > 
> > > Specifically looking for arm64 and riscv64 testing. I've only been able
> > > to test it on amd64. I believe some tweaks will be needed for the other
> > > archs.
> > > 
> > > There are a small number of tests that fail, and one that segfaults, but
> > > as support is brand new, I don't think that's necessarily a showstopper.
> 
> can you tell me which test segfaults so i can fix this? all tests should
> and are passing for me (amd64)

The harec tests don't seem to work at all for me.

> 
> > > 
> > > OK?
> > > 
> > > ~Brian
> > 
> > arm64 needs a little more work
> > 
> > 1. We need to fix the _start hook, I submitted a fix upstream at
> > https://lists.sr.ht/~sircmpwn/hare-dev/patches/47286
> > 
> > 2. config.mk hardcodes amd64 and always treats arm and riscv as if
> > it was cross compiled. we need to change this to work for natively
> > 
> > This works on arm64:
> > 
> > diff -Nru hare/hare/Makefile hare2/hare/Makefile
> > --- hare/hare/Makefile  Sat Dec  2 21:34:50 2023
> > +++ hare2/hare/Makefile Sat Dec  2 22:53:42 2023
> > @@ -13,5 +13,8 @@
> >  
> >  do-gen:
> > cp ${WRKSRC}/configs/openbsd.mk ${WRKSRC}/config.mk
> > +   sed -i "s/aarch64-//g" ${WRKSRC}/config.mk
> > +   sed -i "s/riscv64-//g" ${WRKSRC}/config.mk
> 
> can upstream this if you want. i think it doesn't make sense to always
> assume cross-compilation.

Sure, I can send a diff. I was planning to experiment some more and see if
we can make the default saner (assume host == target).

> 
> > +   echo "ARCH = $$(arch -s)" >> ${WRKSRC}/config.mk
> >  
> >  .include 
> > diff -Nru hare/harec/patches/patch-rt_+openbsd_start+aarch64_s 
> > hare2/harec/patches/patch-rt_+openbsd_start+aarch64_s
> > --- hare/harec/patches/patch-rt_+openbsd_start+aarch64_sThu Jan  1 
> > 01:00:00 1970
> > +++ hare2/harec/patches/patch-rt_+openbsd_start+aarch64_s   Sat Dec  2 
> > 22:25:37 2023
> > @@ -0,0 +1,9 @@
> > +Index: rt/+openbsd/start+aarch64.s
> > +--- rt/+openbsd/start+aarch64.s.orig
> >  rt/+openbsd/start+aarch64.s
> > +@@ -5,5 +5,4 @@ _start:
> > +   mov x30, #0
> > +   mov x0, sp
> > +   add sp, x0, #-16
> > +-  and sp, sp, #-16
> > +   b rt.start_ha
> > 
> 
> this is already upstreamed.



Re: [Update] editors/neovim-qt

2023-12-03 Thread Rafael Sadowski
On Fri Dec 01, 2023 at 11:14:46AM +, Laurence Tratt wrote:
> At last, neovim-qt-0.2.18 is out! I've been testing this for a couple of
> days and haven't noticed any regressions. Note that we can now all of
> the patches for this port, as they are part of 0.2.18.
> 
> 
> Laurie
> 
> 
> diff --git editors/neovim-qt/Makefile editors/neovim-qt/Makefile
> index 727b5258375..83732a979af 100644
> --- editors/neovim-qt/Makefile
> +++ editors/neovim-qt/Makefile
> @@ -2,7 +2,7 @@ COMMENT = Qt5 GUI front-end for neovim
>  
>  GH_ACCOUNT = equalsraf
>  GH_PROJECT = neovim-qt
> -GH_TAGNAME = v0.2.17
> +GH_TAGNAME = v0.2.18
>  
>  CATEGORIES = editors
>  
> @@ -25,6 +25,7 @@ MODPY_RUNDEP =  Yes
>  BUILD_DEPENDS =  editors/neovim
>  
>  LIB_DEPENDS =devel/msgpack \
> + x11/qt5/qtbase \

This is already present and comes from the qt5 module.
Checkout `make show=LIB_DEPENDS`

OK without the LIB_DEPENDS change.


>   x11/qt5/qtsvg
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
> @@ -34,6 +35,7 @@ RUN_DEPENDS =   devel/desktop-file-utils \
>  
>  CONFIGURE_ARGS = -DUSE_SYSTEM_MSGPACK=On \
>   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=On
> +CONFIGURE_ENV =  QT_DIR=${LOCALBASE}/lib/qt5/cmake/Qt5/
>  
>  TEST_IS_INTERACTIVE = X11
>  
> diff --git editors/neovim-qt/distinfo editors/neovim-qt/distinfo
> index 13a1ccea2a3..b3cc86e590a 100644
> --- editors/neovim-qt/distinfo
> +++ editors/neovim-qt/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (neovim-qt-0.2.17.tar.gz) = 
> rFOMLl1jVy3QVDwT+vtNQo5nEo6mdkZ/zaaJZbKqzaE=
> -SIZE (neovim-qt-0.2.17.tar.gz) = 1076230
> +SHA256 (neovim-qt-0.2.18.tar.gz) = 
> seHgGZRuyxBrOuqONfxuNn0u/ORMocFZmizN+zWihjU=
> +SIZE (neovim-qt-0.2.18.tar.gz) = 1078273
> diff --git editors/neovim-qt/patches/patch-src_gui_input_cpp 
> editors/neovim-qt/patches/patch-src_gui_input_cpp
> deleted file mode 100644
> index 7c50d217540..000
> --- editors/neovim-qt/patches/patch-src_gui_input_cpp
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 0dfa20e481edbc582caa29c608195d3a206f21d7 Mon Sep 17 00:00:00 2001
> -From: John Gehrig 
> -Date: Tue, 21 Feb 2023 21:51:46 -0500
> -Subject: [PATCH] Issue 999: Replace Issue 728 with key remap
> -
> -Many users find the shift-space and shift-backspace behavior in terminal
> -frustrating. However, some users still want to map these sequences.
> -
> -Applying the runtime re-map workaround, since Neovim is unable to fix
> -this issue upstream. Neovim still does not report `:terminal` mode.
> -
> -Index: src/gui/input.cpp
>  src/gui/input.cpp.orig
> -+++ src/gui/input.cpp
> -@@ -191,13 +191,6 @@ QString convertKey(const QKeyEvent& ev) noexcept
> - const QMap& specialKeys { GetSpecialKeysMap() };
> - 
> - if (specialKeys.contains(key)) {
> --// Issue#728: Shift + Space inserts ;2u in `:terminal`. 
> Incorrectly sent as .
> --// Issue#259: Shift + BackSpace inserts 7;2u in `:terminal`. 
> Incorrectly sent as .
> --if (key == Qt::Key_Space
> --|| key == Qt::Key_Backspace) {
> --mod &= ~Qt::ShiftModifier;
> --}
> --
> - return ToKeyString(GetModifierPrefix(mod), 
> specialKeys.value(key));
> - }
> - 
> diff --git 
> editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim 
> editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim
> deleted file mode 100644
> index 1c15c08ef76..000
> --- editors/neovim-qt/patches/patch-src_gui_runtime_plugin_nvim_gui_shim_vim
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 0dfa20e481edbc582caa29c608195d3a206f21d7 Mon Sep 17 00:00:00 2001
> -From: John Gehrig 
> -Date: Tue, 21 Feb 2023 21:51:46 -0500
> -Subject: [PATCH] Issue 999: Replace Issue 728 with key remap
> -
> -Many users find the shift-space and shift-backspace behavior in terminal
> -frustrating. However, some users still want to map these sequences.
> -
> -Applying the runtime re-map workaround, since Neovim is unable to fix
> -this issue upstream. Neovim still does not report `:terminal` mode.
> -
> -Index: src/gui/runtime/plugin/nvim_gui_shim.vim
>  src/gui/runtime/plugin/nvim_gui_shim.vim.orig
> -+++ src/gui/runtime/plugin/nvim_gui_shim.vim
> -@@ -278,3 +278,16 @@ function! s:GuiWindowOpacityCommand(value) abort
> -   call rpcnotify(0, 'Gui', 'WindowOpacity', a:value)
> - endfunction
> - command! -nargs=1 GuiWindowOpacity call s:GuiWindowOpacityCommand("")
> -+
> -+" Issue 728: Terminal reports ';2u' for key sequences such as 
> -+" Force-mapping keys is a less-than ideal workaround, but it is the only
> -+" option that appeases everyone. Neovim does not report terminal mode.
> -+"
> -+" See issues:
> -+"  - https://github.com/neovim/neovim/issues/20325
> -+"  - https://github.com/neovim/neovim/issues/19265
> -+"  - https://github.com/equalsraf/neovim-qt/issues/999
> -+tnoremap  
> -+tnoremap  
> -+tnoremap  
> -+tnoremap  
> diff --git editors/neovim-qt/p

Change VARBASE to LOCALSTATEDIR in multiple ports

2023-12-03 Thread Stefan Hagen
Hi,

I'm progressing in removing VARBASE usage in the ports tree. Most ports are
updated already, but there are a few left for which I haven't gotten an OK yet.

Attached are diffs for:

No response from maintainer in the last week:
security/vaultwarden
net/znc

Maintainer address is handeled by gmail, which doesn't accept my mails at the 
moment:
productivity/radicale
sysutils/slant

No maintainer:
databases/influxdb
productivity/radicale2
sysutils/facette

I'm looking for OKs for these.

No REVISION bump is intentional, because the plist doesn't change.

Best regards,
Stefan
Index: security/vaultwarden/Makefile
===
RCS file: /cvs/ports/security/vaultwarden/Makefile,v
diff -u -p -u -p -r1.29 Makefile
--- security/vaultwarden/Makefile   12 Nov 2023 06:08:41 -  1.29
+++ security/vaultwarden/Makefile   24 Nov 2023 21:21:52 -
@@ -47,7 +47,7 @@ WANTLIB +=pq
 LIB_DEPENDS += databases/postgresql
 .endif
 
-SUBST_VARS +=  WRKSRC VARBASE
+SUBST_VARS +=  WRKSRC
 
 post-configure:
mv ${WRKDIR}/myvendordir ${WRKSRC}
Index: security/vaultwarden/pkg/PLIST
===
RCS file: /cvs/ports/security/vaultwarden/pkg/PLIST,v
diff -u -p -u -p -r1.5 PLIST
--- security/vaultwarden/pkg/PLIST  18 Mar 2023 04:37:36 -  1.5
+++ security/vaultwarden/pkg/PLIST  24 Nov 2023 21:21:52 -
@@ -4,7 +4,7 @@
 @mode 750
 @owner _vaultwarden
 @group _vaultwarden
-@sample ${VARBASE}/vaultwarden/data/
+@sample ${LOCALSTATEDIR}/vaultwarden/data/
 @mode
 @owner
 @group
@@ -14,4 +14,4 @@ share/doc/vaultwarden/.env.template
 @mode 640
 @owner _vaultwarden
 @group _vaultwarden
-@sample ${VARBASE}/vaultwarden/.env
+@sample ${LOCALSTATEDIR}/vaultwarden/.env
Index: net/znc/Makefile
===
RCS file: /cvs/ports/net/znc/Makefile,v
diff -u -p -u -p -r1.51 Makefile
--- net/znc/Makefile27 Sep 2023 14:18:42 -  1.51
+++ net/znc/Makefile24 Nov 2023 20:36:13 -
@@ -36,6 +36,4 @@ CXXFLAGS+=-DHAVE_OPAQUE_SSL
 
 NO_TEST=   Yes
 
-SUBST_VARS+=   VARBASE
-
 .include 
Index: net/znc/pkg/PLIST-main
===
RCS file: /cvs/ports/net/znc/pkg/PLIST-main,v
diff -u -p -u -p -r1.2 PLIST-main
--- net/znc/pkg/PLIST-main  4 May 2022 09:52:20 -   1.2
+++ net/znc/pkg/PLIST-main  24 Nov 2023 20:36:13 -
@@ -4,8 +4,8 @@
 @rcscript ${RCDIR}/znc
 @owner _znc
 @group _znc
-@sample ${VARBASE}/znc/
-@sample ${VARBASE}/znc/configs/
+@sample ${LOCALSTATEDIR}/znc/
+@sample ${LOCALSTATEDIR}/znc/configs/
 @owner
 @group
 @bin bin/znc
Index: productivity/radicale/Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
diff -u -p -u -p -r1.44 Makefile
--- productivity/radicale/Makefile  13 Nov 2022 20:31:00 -  1.44
+++ productivity/radicale/Makefile  24 Nov 2023 20:38:31 -
@@ -20,7 +20,6 @@ MODPY_PYBUILD =   setuptools
 RUN_DEPENDS =  security/py-passlib${MODPY_FLAVOR}
 
 NO_TEST =  Yes
-SUBST_VARS +=  VARBASE
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/radicale/config.py
Index: productivity/radicale/pkg/PLIST
===
RCS file: /cvs/ports/productivity/radicale/pkg/PLIST,v
diff -u -p -u -p -r1.19 PLIST
--- productivity/radicale/pkg/PLIST 13 Nov 2022 20:31:00 -  1.19
+++ productivity/radicale/pkg/PLIST 24 Nov 2023 20:38:31 -
@@ -93,9 +93,9 @@ share/examples/radicale/log
 @mode 640
 @owner _radicale
 @group _radicale
-@sample ${VARBASE}/log/radicale
+@sample ${LOCALSTATEDIR}/log/radicale
 @mode 700
-@sample ${VARBASE}/db/radicale/
+@sample ${LOCALSTATEDIR}/db/radicale/
 @sample ${SYSCONFDIR}/radicale/private/
 @mode
 @owner
Index: sysutils/slant/Makefile
===
RCS file: /cvs/ports/sysutils/slant/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- sysutils/slant/Makefile 27 Sep 2023 17:16:34 -  1.10
+++ sysutils/slant/Makefile 24 Nov 2023 21:17:15 -
@@ -25,8 +25,6 @@ LIB_DEPENDS = databases/sqlite3
 
 SITES =https://kristaps.bsd.lv/slant/snapshots/
 
-SUBST_VARS = VARBASE
-
 CONFIGURE_STYLE =  simple
 
 CONFIGURE_ARGS +=  CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
Index: sysutils/slant/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/slant/pkg/PLIST,v
diff -u -p -u -p -r1.2 PLIST
--- sysutils/slant/pkg/PLIST11 Mar 2022 19:58:02 -  1.2
+++ sysutils/slant/pkg/PLIST24 Nov 2023 21:17:15 -
@@ -7,7 +7,7 @@
 sbin/slant-upgrade
 share/slant/
 share/slant/slant.kwbp
-@cwd ${VARBASE}/www
+@cwd ${LOCALSTATEDIR}/www
 @rcscript ${RCDIR}/slant_collectd
 @bin cgi-bin/slant-cgi
 @exec

Re : Re: qt5/qtscript crash fix

2023-12-03 Thread Jonathan Armani


Le vendredi 1 décembre 2023 à 19:46, Stuart Henderson  a 
écrit :


>
>
> Do you need -O0 or does -O1 also work?

Yes, I tried -01 first without success.

>
> The last opt level on the command line is used, or doesn't really matter if
> the existing one is present when you're overriding the default.
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 1 December 2023 14:26:01 Jonathan Armani jonat...@armani.tech wrote:
>
> > Hi,
> >
> > I hit an identical crash than QCAD in QT Script while playing with Mixxx.
> >
> > After trying some upstream fixes I found this solution in FreeBSD port.
> > Hope it will fix QCAD too, I'm not using it.
> >
> > I'm not sure this is the best way to overide with CXXFLAGS as both -O2 & -O0
> > are present in the generated build command.
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtscript/Makefile,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 Makefile
> > --- Makefile 13 Jul 2022 15:48:58 - 1.13
> > +++ Makefile 30 Nov 2023 20:29:46 -
> > @@ -1,5 +1,9 @@
> > QT5NAME = QtScript
> > COMMENT-main = ECMAScript language for Qt5
> > +REVISION-main = 1
> > +
> > +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265989
> > +CXXFLAGS += -O0
> >
> > MULTI_PACKAGES = -main -examples
> > SHARED_LIBS += Qt5Script 3.0 # 5.9