Re: Update pandoc to 3.1.6.1

2023-08-12 Thread Evan Silberman
Greg Steuck  wrote:
> Looks like `pandoc lua` doesn't require and runtime deps on lua,
> is that correct?

Correct. HsLua embeds a Lua interpreter by default. NB the embedded Lua
existed before 3.x for custom filters there just wasn't the option to
run pandoc in Lua repl mode, so nothing new here. We can configure our
build to link to a system-installed Lua. I don't know of a particular
reason to do so.

Evan



godot: disable strict shader syntax checking for ,-main, restoring pre-3.5 behavior and unbreaking some Godot games

2023-08-12 Thread Thomas Frohwein
Discussed off-list with op@ already; sharing here also for documentation
of the issue: Godot 3.5 introduced stricter checks on shader syntax [1]
which was classified as a breaking change. This was discussed [2]
upstream and they conceded that starting with a warning would have been
better, but didn't make any fixes. For us, as we use built rather than
bundled Godot binary, this means that games distributed with use of the
outlawed syntax don't work anymore... or rather they run, but they
don't process the shaders that throw a (non-breaking) error here. The
result for example with Haiki [3] is that the program runs, but
everything except for a few animations is white on white.

The diff below changes the errors to a WARN_PRINT_ONCE message for
godot,-main which is the 'export template' that is used to run the
games without the editor. The upstream behavior with more disruptive
shader errors is still preserved for the godot,-tools build that is for
the editor itself (which has TOOLS_ENABLED defined).

ok?

[1] https://github.com/godotengine/godot/pull/55623/files
[2] https://github.com/godotengine/godot/issues/59316
[3] https://store.steampowered.com/app/1395270/Haiki/

Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile11 Aug 2023 12:36:10 -  1.47
+++ Makefile13 Aug 2023 02:27:49 -
@@ -7,7 +7,7 @@ V = 3.5.2
 GODOTSTEAM_V = v3.20
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
-REVISION = 3
+REVISION = 4
 
 CATEGORIES =   games
 
Index: patches/patch-servers_visual_shader_language_cpp
===
RCS file: patches/patch-servers_visual_shader_language_cpp
diff -N patches/patch-servers_visual_shader_language_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-servers_visual_shader_language_cpp13 Aug 2023 02:27:50 
-
@@ -0,0 +1,95 @@
+disable strict shader syntax check errors for export template build and warn
+instead
+
+Index: servers/visual/shader_language.cpp
+--- servers/visual/shader_language.cpp.orig
 servers/visual/shader_language.cpp
+@@ -596,6 +596,7 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
+   }
+   }
+ 
++#ifdef TOOLS_ENABLED
+   if (error) {
+   if (hexa_found) {
+   return 
_make_token(TK_ERROR, "Invalid (hexadecimal) numeric constant");
+@@ -608,6 +609,9 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
+   }
+   return 
_make_token(TK_ERROR, "Invalid (integer) numeric constant");
+   }
++#else
++  WARN_PRINT_ONCE("Invalid shader 
numeric constant");
++#endif
+   str += symbol;
+   i++;
+   }
+@@ -622,24 +626,40 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
+   } else if (period_found || 
exponent_found || float_suffix_found) {
+   //floats
+   if (exponent_found && 
(!_is_number(last_char) && last_char != 'f')) { // checks for eg: "2E", "2E-", 
"2E+"
++#ifdef TOOLS_ENABLED
+   return 
_make_token(TK_ERROR, "Invalid (float) numeric constant");
++#else
++  
WARN_PRINT_ONCE("Invalid shader numeric constant");
++#endif
+   }
+   if (period_found) {
+   if (float_suffix_found) 
{
+   //checks for eg 
"1.f" or "1.99f" notations
+   if (last_char 
!= 'f') {
++#ifdef TOOLS_ENABLED
+   return 
_make_token(TK_ERROR, "Invalid (float) numeric constant");
++#else
++  
WARN_PRINT_ONCE("Invalid shader numeric constant");
++#endif
+   }
+   } else {
+   //checks for 
eg. "1." or "1.99" notations
+   if (last_char 
!

[Update] net/tor 0.4.7.14

2023-08-12 Thread openbsd
Here's an update to the latest stable version of tor: 0.4.7.14.

This is mainly a bugfix release:
https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.7/ReleaseNotes

I changed MASTER_SITES to https://dist.torproject.org/, which is the official 
distribution site of the Tor Project. Otherwise, the update is really 
straightforward.

Regards.Index: Makefile
===
RCS file: /cvs/ports/net/tor/Makefile,v
retrieving revision 1.152
diff -u -p -r1.152 Makefile
--- Makefile	14 Jul 2023 09:12:42 -	1.152
+++ Makefile	11 Aug 2023 19:02:14 -
@@ -1,9 +1,8 @@
 COMMENT=	anonymity service using onion routing

-DISTNAME=	tor-0.4.7.13
+DISTNAME=	tor-0.4.7.14
 CATEGORIES=	net
 HOMEPAGE=	https://www.torproject.org/
-REVISION=	1

 MAINTAINER=	Pascal Stumpf 

@@ -12,7 +11,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c crypto event_core event_extra execinfo m pthread ssl z

-MASTER_SITES=	https://www.torproject.org/dist/
+MASTER_SITES=	https://dist.torproject.org/

 AUTOCONF_VERSION=2.69
 CONFIGURE_STYLE=autoconf
Index: distinfo
===
RCS file: /cvs/ports/net/tor/distinfo,v
retrieving revision 1.122
diff -u -p -r1.122 distinfo
--- distinfo	13 Jan 2023 11:05:23 -	1.122
+++ distinfo	11 Aug 2023 19:02:14 -
@@ -1,2 +1,2 @@
-SHA256 (tor-0.4.7.13.tar.gz) = IHkXLM4DRVbxEASOJgg86b6nUfMVSwrSgJdRgVsR6p0=
-SIZE (tor-0.4.7.13.tar.gz) = 8031948
+SHA256 (tor-0.4.7.14.tar.gz) = paxn9kZjgPwF6AQ9AcWB5Oiisi/glDABNHPnEGXmXfg=
+SIZE (tor-0.4.7.14.tar.gz) = 8220496


aarch64 bulk build report

2023-08-12 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Thu Aug 10 02:32:06 MDT 2023
finished at Sat Aug 12 10:15:08 MDT 2023
lasted 2D07h43m
done with kern.version=OpenBSD 7.3-current (GENERIC.MP) #2225: Wed Aug  9 
12:20:04 MDT 2023

built packages:11644
Aug 10:4178
Aug 11:2252
Aug 12:5213


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2023-08-10/summary.log

build failures: 2
http://build-failures.rhaalovely.net/aarch64/2023-08-10/emulators/mame.log
http://build-failures.rhaalovely.net/aarch64/2023-08-10/net/coredns.log

recurrent failures
 failures/emulators/mame.log
new failures
+++ ls-failures Sat Aug 12 10:15:20 2023
+failures/net/coredns.log
resolved failures
--- ../old/aarch64/last//ls-failuresTue Aug  8 00:20:24 2023



UPDATE: wayland-protocols 1.32

2023-08-12 Thread Matthieu Herrb
Hi,

diff below updates wayland-protocols to version 1.32. ok ?

diff --git a/wayland/wayland-protocols/Makefile 
b/wayland/wayland-protocols/Makefile
index 3a97c3b4a49..939034a13d8 100644
--- a/wayland/wayland-protocols/Makefile
+++ b/wayland/wayland-protocols/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  Wayland protocols
 
-V =1.31
+V =1.32
 DISTNAME = wayland-protocols-${V}
 
 CATEGORIES =   wayland
diff --git a/wayland/wayland-protocols/distinfo 
b/wayland/wayland-protocols/distinfo
index a2795e9e1b8..2b120f471e9 100644
--- a/wayland/wayland-protocols/distinfo
+++ b/wayland/wayland-protocols/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wayland-protocols-1.31.tar.xz) = 
oH+nIu2HZ27AINhncUvJovJMRk2nORLzlwbu71IZ4jg=
-SIZE (wayland-protocols-1.31.tar.xz) = 85524
+SHA256 (wayland-protocols-1.32.tar.xz) = 
dFl5nTQMgpa2le+FfAfd7yTFoJsJq2p097kmQNKxuhE=
+SIZE (wayland-protocols-1.32.tar.xz) = 90452
diff --git a/wayland/wayland-protocols/pkg/PLIST 
b/wayland/wayland-protocols/pkg/PLIST
index bddf006ab1f..9ef36ad1392 100644
--- a/wayland/wayland-protocols/pkg/PLIST
+++ b/wayland/wayland-protocols/pkg/PLIST
@@ -10,14 +10,20 @@ share/wayland-protocols/stable/xdg-shell/xdg-shell.xml
 share/wayland-protocols/staging/
 share/wayland-protocols/staging/content-type/
 share/wayland-protocols/staging/content-type/content-type-v1.xml
+share/wayland-protocols/staging/cursor-shape/
+share/wayland-protocols/staging/cursor-shape/cursor-shape-v1.xml
 share/wayland-protocols/staging/drm-lease/
 share/wayland-protocols/staging/drm-lease/drm-lease-v1.xml
+share/wayland-protocols/staging/ext-foreign-toplevel-list/
+share/wayland-protocols/staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml
 share/wayland-protocols/staging/ext-idle-notify/
 share/wayland-protocols/staging/ext-idle-notify/ext-idle-notify-v1.xml
 share/wayland-protocols/staging/ext-session-lock/
 share/wayland-protocols/staging/ext-session-lock/ext-session-lock-v1.xml
 share/wayland-protocols/staging/fractional-scale/
 share/wayland-protocols/staging/fractional-scale/fractional-scale-v1.xml
+share/wayland-protocols/staging/security-context/
+share/wayland-protocols/staging/security-context/security-context-v1.xml
 share/wayland-protocols/staging/single-pixel-buffer/
 share/wayland-protocols/staging/single-pixel-buffer/single-pixel-buffer-v1.xml
 share/wayland-protocols/staging/tearing-control/

-- 
Matthieu Herrb



sparc64 bulk build report

2023-08-12 Thread kmos
Bulk build on sparc64-0a.ports.openbsd.org

Started : Wed Aug  9 16:28:08 MDT 2023
Finished: Sat Aug 12 08:37:05 MDT 2023
Duration: 2 Days 16 hours 9 minutes

Built using OpenBSD 7.3-current (GENERIC.MP) #1855: Wed Aug  9 12:05:27 MDT 2023

Built 9296 packages

Number of packages built each day:
Aug 9: 4934
Aug 10: 2383
Aug 11: 1934
Aug 12: 45



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2023-08-09/summary.log

Build failures: 58
http://build-failures.rhaalovely.net/sparc64/2023-08-09/astro/calcmysky.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/astro/py-astropy,python3.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/audio/libcanberra.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/audio/libmusicbrainz.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/audio/libmusicbrainz5.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/audio/milkytracker.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/audio/ncmpc.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/abseil-cpp.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/difftastic.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/liburcu.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/mtxclient.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/orcania.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/qcoro.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/vim-command-t.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/devel/xsd.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/games/cataclysm-dda,no_x11.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/games/choria.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/games/fheroes2.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/games/gnukem.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/games/scid.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/libgexiv2.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/nomacs.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/rawstudio.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/spirv-tools.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/graphics/tesseract/tesseract.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/inputmethods/ibus.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/inputmethods/libime.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/mail/mu.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/mail/rspamd,hyperscan.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/math/gunits.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/net/cadaver.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/net/openconnect.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/security/opensc.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/sysutils/collectd,-main.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/sysutils/firmware/apple-boot.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/sysutils/nut.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/sysutils/u-boot-asahi.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/telephony/asterisk/16.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/telephony/asterisk/18.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/telephony/asterisk/20.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/telephony/baresip/baresip,-gtk.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/textproc/libmarisa.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/textproc/redland-bindings,-main.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/textproc/xxdiff.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/www/castor.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/www/havp.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/www/webkitgtk4.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/gnome/gjs.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/grantlee-qt5.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/kde-applications/libkexiv2.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/qt5/qttranslations.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/qt6/qtbase.log
http://build-failures.rhaalovely.net/sparc64/2023-08-09/x11/xpad.log

Recurre

Re: Update pandoc to 3.1.6.1

2023-08-12 Thread Greg Steuck
Thanks for the update Evan! I was not eager to do it due to the -cli
changes, so I appreciate your taking care of it.

I tested your diff with net/gssdp (which seems like the only BUILD_DEPS
user of pandoc). Then also ran a manual step of shellcheck to confirm
the new version produces something sensible. AFAICT, the update is good
to go in. I have just a minor clarifying question below before I commit.

Evan Silberman  writes:

> Hi Greg, ports@
>
> The below updates pandoc to this week's 3.1.6.1. Sorry for the lax
> maintainership! I should be a bit more regular with these now.
>
> The command line tool is now built from the pandoc-cli cabal module,
> which has its own versioning, so things are a little less tidy in the
> Makefile now, oh well. The big developments in version 3 were the
> `pandoc lua` and `pandoc server` modes, which start up into a Lua
> interpreter and an HTTP server respectively. Both modes seem to
> function, or at least execute properly.

Looks like `pandoc lua` doesn't require and runtime deps on lua,
is that correct?

Thanks
Greg