Re: openarena crash 7.5
Stuart Henderson writes:
> On 2024/05/10 13:34, Divan Santana wrote:
>> Thomas Frohwein writes:
>>
>> > On Thu, May 09, 2024 at 07:22:50PM +0200, Divan Santana wrote:
>> >> Greetings :)
>> >>
>> >> Is openarena suppose to work from ports? Or perhaps it's my laptop
>> >> that's not compatible with it?
>>
>> > This issue is fine to raise on ports@.
>>
>> Noted.
>>
>>
>> > It's a BTCFI issue, see from
>> > ktrace(1)/kdump(1) output:
>>
>> > 67964 openarena-client PSIG SIGILL SIG_DFL code=ILL_BTCFI
>> > addr=0xf9ba34f3000 trapno=21
>>
>> Thanks. In layman's terms? Does this mean it's broken on all openbsd's
>> or just my CPU/graphics card?
>
> It's broken on newer intel CPUs.
>
> It can probably be worked-around with this:
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/openarena/Makefile,v
> diff -u -p -r1.26 Makefile
> --- Makefile 25 Sep 2023 17:07:29 - 1.26
> +++ Makefile 10 May 2024 12:31:08 -
> @@ -1,4 +1,5 @@
> ONLY_FOR_ARCHS = amd64 i386 macppc
> +USE_NOBTCFI =Yes
>
> BROKEN-i386 =code/qcommon/vm_x86.c:(.text+0x18): undefined
> reference to `callMask'
>
> @@ -15,8 +16,8 @@ E_V = ${V}# engine version
>
> PKGNAME =openarena-${V}
>
> -REVISION-main = 1
> -REVISION-server =0
> +REVISION-main = 2
> +REVISION-server =1
>
> PKG_ARCH-data = *
This patch, does indeed make it build and launch! Thank you very much
Stuart.
Sadly, in the game, it works for a few seconds, then there is a brief
graphics jerk or something, then my mouse no longer moves left or right.
I can still walk etc, but not move the mouse left or right.
I did try SDL_VIDEO_X11_DGAMOUSE=0 set, and without it, but the issue
occurs in both. I'm played with different graphics settings in the game
too, but it seems the issue persists.
[update] docker-compose: 2.26.2 -> 2.27.0
ports@,
Here a clean update for docker-compose.
Tested with updated docker-cli on -current/amd64.
diff --git sysutils/docker-compose/Makefile sysutils/docker-compose/Makefile
index dd94db08f3e..0f684d1e0a7 100644
--- sysutils/docker-compose/Makefile
+++ sysutils/docker-compose/Makefile
@@ -1,6 +1,6 @@
COMMENT = Define and run multi-container applications with Docker
-V =2.26.1
+V =2.27.0
GH_ACCOUNT = docker
GH_PROJECT = compose
GH_TAGNAME = v${V}
diff --git sysutils/docker-compose/distinfo sysutils/docker-compose/distinfo
index 2af79e08cbe..75831691d2b 100644
--- sysutils/docker-compose/distinfo
+++ sysutils/docker-compose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (compose-2.26.1.tar.gz) = CBrUAkH44UTK0IimXm/Q7FiOPTaTHluquz3FqwaM62A=
-SHA256 (docker-compose-vendor-2.26.1.tar.gz) =
PRbgo4mYSV8BVG9dyAMlZd1i4d0aEquednvzUJPPxBc=
-SIZE (compose-2.26.1.tar.gz) = 361194
-SIZE (docker-compose-vendor-2.26.1.tar.gz) = 11085547
+SHA256 (compose-2.27.0.tar.gz) = KbIjLRYJ3/A9t0GIp5RMhbqLYS9Hp+OZOKQ9uPt9cGc=
+SHA256 (docker-compose-vendor-2.27.0.tar.gz) =
gfFgyn+dE4/19KZn3l1pTlq66MTphFnmoa8I2FkgQ8g=
+SIZE (compose-2.27.0.tar.gz) = 362705
+SIZE (docker-compose-vendor-2.27.0.tar.gz) = 10982638
--
wbr, Kirill
[update] docker-cli: 26.0.1 -> 26.1.2
ports@, Here a trivial update of docker-cli which I've tested on -current/amd64. diff --git sysutils/docker-cli/Makefile sysutils/docker-cli/Makefile index 950dfc66118..1bb05c0d7b4 100644 --- sysutils/docker-cli/Makefile +++ sysutils/docker-cli/Makefile @@ -1,6 +1,6 @@ COMMENT = command-line tool for controlling Docker -V =26.0.1 +V =26.1.2 GH_ACCOUNT = docker GH_PROJECT = cli diff --git sysutils/docker-cli/distinfo sysutils/docker-cli/distinfo index 8ee5ae7c866..e30b79547b8 100644 --- sysutils/docker-cli/distinfo +++ sysutils/docker-cli/distinfo @@ -1,2 +1,2 @@ -SHA256 (cli-26.0.1.tar.gz) = bqGcoqbvjek+egtcyJx08UUmTOv33HFg0+12alHtXoE= -SIZE (cli-26.0.1.tar.gz) = 6913706 +SHA256 (cli-26.1.2.tar.gz) = L3BHldyXo4LpaJurakFJLWWEyudj2Oxm3RvSGaUWh8Q= +SIZE (cli-26.1.2.tar.gz) = 7213532 -- wbr, Kirill
[update] www/hugo 0.123.6 -> 0.125.7
ports@,
Here clean update of www/hugo to the last released version.
Tested on -curent/amd64 by regenerating a few sites.
Everything works, I just would like to point that I was supprised that hugo
depedns on aws, azure, google cloud api and many other things.
diff --git www/hugo/Makefile www/hugo/Makefile
index decb75f90f7..81b74c14c7f 100644
--- www/hugo/Makefile
+++ www/hugo/Makefile
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
COMMENT = fast and flexible static site generator
MODGO_MODNAME =github.com/gohugoio/hugo
-MODGO_VERSION =v0.123.6
+MODGO_VERSION =v0.125.7
DISTNAME = hugo-${MODGO_VERSION}
diff --git www/hugo/distinfo www/hugo/distinfo
index f5768cdac59..19d172eae58 100644
--- www/hugo/distinfo
+++ www/hugo/distinfo
@@ -328,18 +328,18 @@ SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f12275
SHA256
(go_modules/github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip)
= 9Slix/vsqB6op3fR+LHx0lgD3EN/u0kPJTNEIyiEMo4=
SHA256
(go_modules/github.com/!google!cloud!platform/cloudsql-proxy/@v/v1.33.14.mod) =
e6nGPXYlFDHBwhSs5UdzsdehkNs2LH00bbdD+4DdpjM=
SHA256
(go_modules/github.com/!google!cloud!platform/cloudsql-proxy/@v/v1.33.14.zip) =
TgulDJ2DYDHyGA6JyzIfShDbkTvF60nh2JDwd/uH2so=
-SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.2.1.mod) =
Szweb9ARH7axr0ylcfLQeaeiBuGRQHASsZ7HbASyN2A=
-SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.2.1.zip) =
2irW5NabMzqEIjrqaU3CIbscv+MlXSDD31ncCKdO+Hg=
-SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.12.0.mod) =
qDs7xEOANftPd3CBjb5D3Hlh7sxZakhlfo/dEanfpVE=
-SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.12.0.zip) =
Wjkn1wVTQrUgaRlXSpk3sSrGoK80/Y06OwKv8BgK0Vc=
+SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.6.0.mod) =
r/3U6HeASwwie/rF21Cvke9QHnttS++tU/kJeNhjXhw=
+SHA256 (go_modules/github.com/alecthomas/assert/v2/@v/v2.6.0.zip) =
YV7B6W8SIOJNuqiddZQXGWHxyirS7lpsLI9Hiljy8kI=
+SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.13.0.mod) =
HaAFPhqc+UtVlDB2+5fVjePyuVAVVLwkK+kK6K+v8vk=
+SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.13.0.zip) =
36/2KcmuAV54uoqB0STFkTDyAnwdcGd3ctu4jynuvDs=
SHA256 (go_modules/github.com/alecthomas/chroma/v2/@v/v2.5.0.mod) =
h1MpQG6b4jpX4LqSDQJe/dO1C/K5lpg3cBwAgLi4uuE=
-SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.2.0.mod) =
K/LL5QDij0uoEQeYW/DzESIcWImu+5JtUjBgaIlEMrQ=
-SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.2.0.zip) =
ib/EIL10sb2l9FgWtnqNdD9TRwujnFDjvJS8D9HAZPo=
+SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.4.0.mod) =
K/LL5QDij0uoEQeYW/DzESIcWImu+5JtUjBgaIlEMrQ=
+SHA256 (go_modules/github.com/alecthomas/repr/@v/v0.4.0.zip) =
5NTsBGw610Jcjng1LcEUqzSx3X86QsZA4Zy1HJRITDY=
SHA256
(go_modules/github.com/armon/go-radix/@v/v1.0.1-0.20221118154546-54df44f2176c.mod)
= Lc2vYuwp96+g04U01I9al/o+AnNDsPi/ZhrttxAhT9Y=
SHA256
(go_modules/github.com/armon/go-radix/@v/v1.0.1-0.20221118154546-54df44f2176c.zip)
= 8mGhFBES9lVkzsj2Uu9qvx1lQignXk/sYiC5gzdmfBM=
SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.24.0.mod) =
RXrLPBTnWCb1TPbaPZtPdVKj+mqsRN30BcD1ItVp+iA=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.24.1.mod) =
RXrLPBTnWCb1TPbaPZtPdVKj+mqsRN30BcD1ItVp+iA=
-SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.24.1.zip) =
5JPteWHZP03adVqp8fNiBSm2PzrCMgQPLxIv0+wCA7c=
+SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.26.1.mod) =
Ozhlj5BOszOsp6poFAv7hy7wlKuvmDg14C4ENOH9BCc=
+SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/@v/v1.26.1.zip) =
rw3JE9JBeTs+gW8uYNIDZrMnEsmyoNQaptowA9elf+Q=
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/@v/v1.5.4.mod)
= 38wvmWinXtbEUymH0CnnaZnRAlrSDRrRWWuc4S0EPWE=
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/@v/v1.5.4.zip)
= eR0WnQ/652B8j0W1+0j0npTgr8uyeYCuv3utGOfE3Z8=
SHA256 (go_modules/github.com/aws/aws-sdk-go-v2/config/@v/v1.26.1.mod) =
opwt72HAjKBFyMNjFgj/3fPGr1P9lDR31S5OGZ+/zAk=
@@ -350,18 +350,18 @@ SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.14.10.mod
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.14.10.zip) =
xJmaS0+3tDbZg/CJ2Yw4s3FJFh60kZmLnUgKVi78Wpo=
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.15.7.mod) =
jHNAU79vJrRh56Gzk7oG4ssQvHVUccCEilmk1IwwQrs=
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.15.7.zip) =
t6bct8C5iGzAxxpEeMmdwN7Y437LH7VL9E0qex+ucDI=
-SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/internal/configsources/@v/v1.2.10.mod)
= IkZMF44Ef25NU/BuQ0e/aj3Fvv5p9UXPBHmFAdcCIF0=
-SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/internal/configsources/@v/v1.2.10.zip)
= lv9WEjraoy3/QmoHKTYNjv8R30sBvaZprA2KaMgAHgY=
SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/internal/configsources/@v/v1.2.9.mod)
= xx8FrSmLKhzBk4QgncoI4Q5mizZGKxXR136firv+4gg=
-SHA256
(go_modules/github.com/aws/aws-sdk-go-v2/internal/endpo
update www/pipe-viewer
This updates pipe-viewer to latest version
pipe-viewer and gtk-pipe-viewer works fine for me
Changelog: https://github.com/trizen/pipe-viewer/releases/tag/0.5.1
ok?
diff --git a/www/pipe-viewer/Makefile b/www/pipe-viewer/Makefile
index 67f2eabc89f..f93908d03fc 100644
--- a/www/pipe-viewer/Makefile
+++ b/www/pipe-viewer/Makefile
@@ -1,7 +1,7 @@
COMMENT-main = lightweight YouTube client
COMMENT-gtk = lightweight YouTube client with a GTK interface
-VERSION = 0.5.0
+VERSION = 0.5.1
DIST_TUPLE = github trizen pipe-viewer ${VERSION} .
PKGNAME-main = pipe-viewer-${VERSION}
PKGNAME-gtk = gtk-pipe-viewer-${VERSION}
diff --git a/www/pipe-viewer/distinfo b/www/pipe-viewer/distinfo
index d48160a3ca4..3b0b1135729 100644
--- a/www/pipe-viewer/distinfo
+++ b/www/pipe-viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (trizen-pipe-viewer-0.5.0.tar.gz) =
hpRfZEhaBVnb49bgAA9PLl9gTBOq5TVu//eRJW+7iNE=
-SIZE (trizen-pipe-viewer-0.5.0.tar.gz) = 269544
+SHA256 (trizen-pipe-viewer-0.5.1.tar.gz) =
Ygb3WYS43dPNigjiHYtkCPbG0bvzEQnWWmNC4y0VS2w=
+SIZE (trizen-pipe-viewer-0.5.1.tar.gz) = 270337
diff --git a/www/pipe-viewer/pkg/PLIST-gtk b/www/pipe-viewer/pkg/PLIST-gtk
index 0bdb1290002..99d301ce3ab 100644
--- a/www/pipe-viewer/pkg/PLIST-gtk
+++ b/www/pipe-viewer/pkg/PLIST-gtk
@@ -1,7 +1,4 @@
bin/gtk-pipe-viewer
-${P5SITE}/auto/
-${P5SITE}/auto/share/
-${P5SITE}/auto/share/dist/
${P5SITE}/auto/share/dist/WWW-PipeViewer/
${P5SITE}/auto/share/dist/WWW-PipeViewer/gtk-pipe-viewer.desktop
${P5SITE}/auto/share/dist/WWW-PipeViewer/gtk-pipe-viewer.glade
diff --git a/www/pipe-viewer/pkg/PLIST-main b/www/pipe-viewer/pkg/PLIST-main
index 95d74cc3259..580ac7e6840 100644
--- a/www/pipe-viewer/pkg/PLIST-main
+++ b/www/pipe-viewer/pkg/PLIST-main
@@ -18,6 +18,8 @@ ${P5SITE}/WWW/PipeViewer/Utils.pm
${P5SITE}/WWW/PipeViewer/VideoCategories.pm
${P5SITE}/WWW/PipeViewer/Videos.pm
${P5SITE}/WWW/PipeViewer/Worker.pm
+${P5SITE}/auto/share/dist/WWW-PipeViewer/icons/left_arrow.png
+${P5SITE}/auto/share/dist/WWW-PipeViewer/icons/right_arrow.png
@man man/man1/pipe-viewer.1
@man man/man3p/WWW::PipeViewer.3p
@man man/man3p/WWW::PipeViewer::Channels.3p
update games/gzdoom
changelog https://github.com/ZDoom/gzdoom/compare/g4.11.3...g4.12.2
tested with doom2 and brutal doom, sound + music worked fine
one patch was merged upstream
diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
index 50b4a92f320..e4ca89b89c3 100644
--- a/games/gzdoom/Makefile
+++ b/games/gzdoom/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V =4.11.3
+V =4.12.2
DIST_TUPLE = github ZDoom gzdoom g${V} .
PKGNAME = gzdoom-${V}
diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo
index 34c0a704339..926b22dec20 100644
--- a/games/gzdoom/distinfo
+++ b/games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) =
WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
-SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
+SHA256 (ZDoom-gzdoom-g4.12.2.tar.gz) =
hkxaHsl23WBo+c2T+SxUBMZigkmWEB8UEd2yWlSvxzI=
+SIZE (ZDoom-gzdoom-g4.12.2.tar.gz) = 25910359
diff --git a/games/gzdoom/patches/patch-CMakeLists_txt
b/games/gzdoom/patches/patch-CMakeLists_txt
deleted file mode 100644
index 6d2aba4be6d..000
--- a/games/gzdoom/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -301,7 +301,7 @@ else()
-
- if ( UNIX )
- include(CheckSymbolExists)
-- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
HAVE_FTS )
- if ( NOT HAVE_FTS )
- include ( FindPkgConfig )
- pkg_check_modules( MUSL_FTS musl-fts )
diff --git a/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
new file mode 100644
index 000..f9dd257c5a3
--- /dev/null
+++ b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: libraries/ZWidget/CMakeLists.txt
+--- libraries/ZWidget/CMakeLists.txt.orig
libraries/ZWidget/CMakeLists.txt
+@@ -127,7 +127,7 @@ elseif(APPLE)
+ add_link_options(-pthread)
+ else()
+ set(ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES})
+- set(ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl)
++ set(ZWIDGET_LIBS ${CMAKE_DL_LIBS})
+ add_definitions(-DUNIX -D_UNIX)
+ add_link_options(-pthread)
+ endif()
Re: [update / simplify] devel/difftastic 0.58.0
On Sun, May 12, 2024 at 06:00:59PM GMT, Volker Schlecht wrote:
> With version 0.58.0 difftastic comes with its own manpage.
> I'd like to stop generating the HTML documentation and install the manpage
> instead.
>
> Fortunately now all the patches related to tree-magic-mini can be dropped as
> well.
>
> thoughts, objections, oks?
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/difftastic/Makefile,v
> diff -u -p -r1.13 Makefile
> --- Makefile 19 Mar 2024 18:29:52 - 1.13
> +++ Makefile 12 May 2024 15:56:32 -
> @@ -2,7 +2,7 @@ COMMENT = diff tool that compares files
>
> GH_ACCOUNT = Wilfred
> GH_PROJECT = difftastic
> -GH_TAGNAME = 0.56.1
> +GH_TAGNAME = 0.58.0
>
> HOMEPAGE = https://difftastic.wilfred.me.uk/
>
> @@ -14,7 +14,6 @@ CATEGORIES =devel
> PERMIT_PACKAGE = Yes
>
> MODULES =devel/cargo
> -BUILD_DEPENDS = textproc/mdbook
> COMPILER = base-clang ports-gcc
> WANTLIB += ${MODCARGO_WANTLIB} ${COMPILER_LIBCXX} m
>
> @@ -22,20 +21,8 @@ CONFIGURE_STYLE = cargo
>
> DOCDIR = ${PREFIX}/share/doc/difftastic
>
> -# Prepare directory for HTML manual
> -post-extract:
> - sed -i 's/DFT_VERSION_HERE/${GH_TAGNAME}/g' \
> - ${WRKSRC}/manual/src/introduction.md
> - sed -i '18,20d' ${WRKSRC}/manual/book.toml
> -
> -# Build and install HTML manual with mdBook
> -pre-install:
> - mkdir -p ${WRKSRC}/html_manual
> - mdbook build -d ${WRKSRC}/html_manual ${WRKSRC}/manual
> -
> post-install:
> - ${INSTALL_DATA_DIR} ${DOCDIR}
> - cp -r ${WRKSRC}/html_manual/* ${DOCDIR}
> + ${INSTALL_MAN} ${WRKSRC}/difft.1 ${PREFIX}/man/man1
>
> .include "crates.inc"
> .include
> Index: crates.inc
> ===
> RCS file: /cvs/ports/devel/difftastic/crates.inc,v
> diff -u -p -r1.10 crates.inc
> --- crates.inc19 Mar 2024 18:29:52 - 1.10
> +++ crates.inc12 May 2024 15:56:32 -
> @@ -1,138 +1,143 @@
> -MODCARGO_CRATES += ahash 0.8.9 # MIT OR Apache-2.0
> -MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
> +MODCARGO_CRATES += ahash 0.8.11 # MIT OR Apache-2.0
> +MODCARGO_CRATES += aho-corasick1.1.3 # Unlicense OR MIT
> MODCARGO_CRATES += allocator-api2 0.2.16 # MIT OR Apache-2.0
> -MODCARGO_CRATES += assert_cmd 2.0.5 # MIT OR Apache-2.0
> +MODCARGO_CRATES += assert_cmd 2.0.8 # MIT OR Apache-2.0
> MODCARGO_CRATES += atty0.2.14 # MIT
> MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
> MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0
> -MODCARGO_CRATES += bitflags2.4.2 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bstr0.2.17 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bstr1.6.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += bitflags2.5.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += bstr1.9.1 # MIT OR Apache-2.0
> MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0
> -MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
> -MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
> +MODCARGO_CRATES += cc 1.0.90 # MIT OR Apache-2.0
> MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
> MODCARGO_CRATES += clap3.2.25 # MIT OR Apache-2.0
> MODCARGO_CRATES += clap_lex0.2.4 # MIT OR Apache-2.0
> -MODCARGO_CRATES += const_format0.2.23 # Zlib
> -MODCARGO_CRATES += const_format_proc_macros0.2.22 # Zlib
> -MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-deque 0.8.1 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-epoch 0.9.8 # MIT OR Apache-2.0
> -MODCARGO_CRATES += crossbeam-utils 0.8.8 # MIT OR Apache-2.0
> +MODCARGO_CRATES += const_format0.2.32 # Zlib
> +MODCARGO_CRATES += const_format_proc_macros0.2.32 # Zlib
> +MODCARGO_CRATES += crossbeam-deque 0.8.5 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-epoch 0.9.18 # MIT OR Apache-2.0
> +MODCARGO_CRATES += crossbeam-utils 0.8.19 # MIT OR Apache-2.0
> MODCARGO_CRATES += crossterm 0.27.0 # MIT
> MODCARGO_CRATES += crossterm_winapi0.9.1 # MIT
> -MODCARGO_CRATES += ctor0.1.22 # Apache-2.0 OR MIT
> -MODCARGO_CRATES += diff0.1.12 # MIT OR Apache-2.0
> +MODCARGO_CRATES += diff0.1.13 # MIT OR Apache-2.0
> MODCARGO_CRATES += difflib 0.4.0 # MIT
> MODCARGO_CRATES += doc-comment 0.3.3 # MIT
> -MODCARGO_CRATES += either 1.6.1 # MIT/Apache-2.0
> -MODCARGO_CRATES += env_logger 0.10.0 # MIT OR Apache-2.0
> -MODCARGO_CRATES += errno 0.3.5 # MIT OR Apache-2.0
> -MODCARGO_CRATES += fixedbitset 0.4.1 # MIT/Apache-2.0
> +MODCARGO_CRATES += either 1.10.0 # MIT OR Apache-2.0
> +MODCARGO_CRATES += env_l
[update / simplify] devel/difftastic 0.58.0
With version 0.58.0 difftastic comes with its own manpage.
I'd like to stop generating the HTML documentation and install the manpage
instead.
Fortunately now all the patches related to tree-magic-mini can be dropped as
well.
thoughts, objections, oks?
Index: Makefile
===
RCS file: /cvs/ports/devel/difftastic/Makefile,v
diff -u -p -r1.13 Makefile
--- Makefile19 Mar 2024 18:29:52 - 1.13
+++ Makefile12 May 2024 15:56:32 -
@@ -2,7 +2,7 @@ COMMENT = diff tool that compares files
GH_ACCOUNT = Wilfred
GH_PROJECT = difftastic
-GH_TAGNAME = 0.56.1
+GH_TAGNAME = 0.58.0
HOMEPAGE = https://difftastic.wilfred.me.uk/
@@ -14,7 +14,6 @@ CATEGORIES = devel
PERMIT_PACKAGE = Yes
MODULES = devel/cargo
-BUILD_DEPENDS =textproc/mdbook
COMPILER = base-clang ports-gcc
WANTLIB += ${MODCARGO_WANTLIB} ${COMPILER_LIBCXX} m
@@ -22,20 +21,8 @@ CONFIGURE_STYLE =cargo
DOCDIR = ${PREFIX}/share/doc/difftastic
-# Prepare directory for HTML manual
-post-extract:
- sed -i 's/DFT_VERSION_HERE/${GH_TAGNAME}/g' \
- ${WRKSRC}/manual/src/introduction.md
- sed -i '18,20d' ${WRKSRC}/manual/book.toml
-
-# Build and install HTML manual with mdBook
-pre-install:
- mkdir -p ${WRKSRC}/html_manual
- mdbook build -d ${WRKSRC}/html_manual ${WRKSRC}/manual
-
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- cp -r ${WRKSRC}/html_manual/* ${DOCDIR}
+ ${INSTALL_MAN} ${WRKSRC}/difft.1 ${PREFIX}/man/man1
.include "crates.inc"
.include
Index: crates.inc
===
RCS file: /cvs/ports/devel/difftastic/crates.inc,v
diff -u -p -r1.10 crates.inc
--- crates.inc 19 Mar 2024 18:29:52 - 1.10
+++ crates.inc 12 May 2024 15:56:32 -
@@ -1,138 +1,143 @@
-MODCARGO_CRATES += ahash 0.8.9 # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
+MODCARGO_CRATES += ahash 0.8.11 # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.3 # Unlicense OR MIT
MODCARGO_CRATES += allocator-api2 0.2.16 # MIT OR Apache-2.0
-MODCARGO_CRATES += assert_cmd 2.0.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += assert_cmd 2.0.8 # MIT OR Apache-2.0
MODCARGO_CRATES += atty0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags2.4.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += bstr0.2.17 # MIT OR Apache-2.0
-MODCARGO_CRATES += bstr1.6.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += bitflags2.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += bstr1.9.1 # MIT OR Apache-2.0
MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
-MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc 1.0.90 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += clap3.2.25 # MIT OR Apache-2.0
MODCARGO_CRATES += clap_lex0.2.4 # MIT OR Apache-2.0
-MODCARGO_CRATES += const_format0.2.23 # Zlib
-MODCARGO_CRATES += const_format_proc_macros0.2.22 # Zlib
-MODCARGO_CRATES += crossbeam-channel 0.5.8 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-deque 0.8.1 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-epoch 0.9.8 # MIT OR Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.8 # MIT OR Apache-2.0
+MODCARGO_CRATES += const_format0.2.32 # Zlib
+MODCARGO_CRATES += const_format_proc_macros0.2.32 # Zlib
+MODCARGO_CRATES += crossbeam-deque 0.8.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-epoch 0.9.18 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.19 # MIT OR Apache-2.0
MODCARGO_CRATES += crossterm 0.27.0 # MIT
MODCARGO_CRATES += crossterm_winapi0.9.1 # MIT
-MODCARGO_CRATES += ctor0.1.22 # Apache-2.0 OR MIT
-MODCARGO_CRATES += diff0.1.12 # MIT OR Apache-2.0
+MODCARGO_CRATES += diff0.1.13 # MIT OR Apache-2.0
MODCARGO_CRATES += difflib 0.4.0 # MIT
MODCARGO_CRATES += doc-comment 0.3.3 # MIT
-MODCARGO_CRATES += either 1.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger 0.10.0 # MIT OR Apache-2.0
-MODCARGO_CRATES += errno 0.3.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += fixedbitset 0.4.1 # MIT/Apache-2.0
+MODCARGO_CRATES += either 1.10.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += env_logger 0.10.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += equivalent 1.0.1 # Apache-2.0 OR MIT
+MODCARGO_CRATES += errno 0.3.8 # MIT OR
Re: update: mail/offlineimap to latest HEAD
Sebastien Marie writes: > Hi, > > With the switch to python-3.11 by default, mail/offlineimap stopped > working due to some (wrong) assertion: > > AssertionError: Your sqlite is not multithreading safe. > > The `sqlite3.threadsafety` changed in python-3.11, the value is set > dynamically instead of hard-coding it to 1, and offlineimap is checking > for `1`. > > > The current version of mail/offlineimap is the latest published release > (8.0.0 from Oct 18, 2021), but the repository is somehow active (last > commit is 5 months ago) and has proper python-3.11 support. > > The following diff updates mail/offlineimap to the latest commit in > HEAD. I am using the date of the commit for the patchlevel suffix. > > With it, I could use offlineimap again. > > Comments or OK ? > -- > Sebastien Marie > This patch also worked for me. And thanks.
update devel/tig
changelog https://github.com/jonas/tig/releases/tag/tig-2.5.10 tested on amd64, works for me ok? diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 6edd3f7ec1b..6543d3f6b29 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,6 +1,6 @@ COMMENT = ncurses Git repository browser -V =2.5.9 +V =2.5.10 DISTNAME = tig-$V CATEGORIES = devel diff --git a/devel/tig/distinfo b/devel/tig/distinfo index 3edddfb8130..55a4d295c56 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,2 +1,2 @@ -SHA256 (tig-2.5.9.tar.gz) = DLTZ494A3JKqp5luFReEW9m5oNQ2jzIG9hjYE+jbizk= -SIZE (tig-2.5.9.tar.gz) = 1183142 +SHA256 (tig-2.5.10.tar.gz) = 9lXME2b8EAWKK9UFu4jKeOZT/3UmwbgXdMRLnYQSEOM= +SIZE (tig-2.5.10.tar.gz) = 1183631
Re: mail/imapdedup: new port
On Fri, 10 May 2024 05:55:11 +0100, A Tammy wrote: > > OK aisha@ > Thanks for ok. Here an updated version which includes changes from Stuart. May I ask anyone to import it? Thanks! -- wbr, Kirill imapdedup.tgz Description: Binary data
update games/vcmi
There is a new version of vcmi
https://github.com/vcmi/vcmi/blame/develop/ChangeLog.md
Controller support didn't work for me unfortunately (xbox one),
otherwise everything works fine.
Some patches were merged upstream and thus dropped,
I had to neut a prctl call because we don't have it,
I did not see any issue with that change (otherwise it won't
compile anyway).
ok?
diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index a274d2ee54f..075e8a1c155 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -6,7 +6,7 @@ HOMEPAGE = https://vcmi.eu/
MAINTAINER = Kirill Bychkov
-DIST_TUPLE += github vcmi vcmi 1.4.5 .
+DIST_TUPLE += github vcmi vcmi 1.5.0 .
DIST_TUPLE += github fuzzylite fuzzylite \
7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite
DIST_TUPLE += github google googletest \
@@ -51,7 +51,7 @@ CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
NO_TEST = Yes
-FIX_CRLF_FILES = Global.h lib/CStopWatch.h lib/CModHandler.h
+FIX_CRLF_FILES = Global.h
post-extract:
sed -i 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/vcmibuilder
diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo
index bef0c107ea1..acddf2d0d9f 100644
--- a/games/vcmi/distinfo
+++ b/games/vcmi/distinfo
@@ -1,6 +1,6 @@
SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) =
cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y=
SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) =
JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY=
-SHA256 (vcmi-vcmi-1.4.5.tar.gz) = EHaC3ygkgoK2rJZFmHVHGPlRHQx+AH/9vQ+lH4e7AEk=
+SHA256 (vcmi-vcmi-1.5.0.tar.gz) = OPpIx9oxiqWp4NMxn8sk9N/feFVcIbiwufm7tM7fM/g=
SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) =
2194254
SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) =
864010
-SIZE (vcmi-vcmi-1.4.5.tar.gz) = 9683419
+SIZE (vcmi-vcmi-1.5.0.tar.gz) = 9720419
diff --git a/games/vcmi/patches/patch-CMakeLists_txt
b/games/vcmi/patches/patch-CMakeLists_txt
index 9f82df512b6..77a15a7e595 100644
--- a/games/vcmi/patches/patch-CMakeLists_txt
+++ b/games/vcmi/patches/patch-CMakeLists_txt
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -468,7 +468,7 @@ endif()
+@@ -508,7 +508,7 @@ endif()
if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
# Widgets finds its own dependencies (QtGui and QtCore).
diff --git a/games/vcmi/patches/patch-client_CMT_cpp
b/games/vcmi/patches/patch-client_CMT_cpp
index 2172a349b2a..0f64536f23f 100644
--- a/games/vcmi/patches/patch-client_CMT_cpp
+++ b/games/vcmi/patches/patch-client_CMT_cpp
@@ -1,7 +1,7 @@
Index: client/CMT.cpp
--- client/CMT.cpp.orig
+++ client/CMT.cpp
-@@ -511,7 +511,7 @@ static void mainLoop()
+@@ -419,7 +419,7 @@ static void mainLoop()
// destruction of locked mutexes (fails an assertion), even in
third-party libraries (as well as native libs on Android)
// Android - std::quick_exit is available only starting from API level
21
// Mingw, macOS and iOS - std::quick_exit is unavailable (at least in
current version of CI)
diff --git a/games/vcmi/patches/patch-lib_CStopWatch_h
b/games/vcmi/patches/patch-lib_CStopWatch_h
deleted file mode 100644
index f861590e4e2..000
--- a/games/vcmi/patches/patch-lib_CStopWatch_h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: lib/CStopWatch.h
lib/CStopWatch.h.orig
-+++ lib/CStopWatch.h
-@@ -9,7 +9,7 @@
- */
- #pragma once
-
--#ifdef __FreeBSD__
-+#ifdef __OpenBSD__
- #include
- #include
- #include
-@@ -55,7 +55,7 @@ class CStopWatch (public)
- private:
- si64 clock()
- {
-- #ifdef __FreeBSD__ // TODO: enable also for Apple?
-+ #ifdef __OpenBSD__ // TODO: enable also for Apple?
- struct rusage usage;
- getrusage(RUSAGE_SELF, &usage);
- return static_cast(usage.ru_utime.tv_sec +
usage.ru_stime.tv_sec) * 100 + usage.ru_utime.tv_usec +
usage.ru_stime.tv_usec;
diff --git a/games/vcmi/patches/patch-lib_CThreadHelper_cpp
b/games/vcmi/patches/patch-lib_CThreadHelper_cpp
new file mode 100644
index 000..1f33c2cd3a0
--- /dev/null
+++ b/games/vcmi/patches/patch-lib_CThreadHelper_cpp
@@ -0,0 +1,12 @@
+Index: lib/CThreadHelper.cpp
+--- lib/CThreadHelper.cpp.orig
lib/CThreadHelper.cpp
+@@ -109,7 +109,7 @@ void setThreadName(const std::string &name)
+ pthread_setname_np(name.c_str());
+ #elif defined(VCMI_HAIKU)
+ rename_thread(find_thread(NULL), name.c_str());
+-#elif defined(VCMI_UNIX)
++#elif defined(VCMI_UNIX) && !defined(__OpenBSD__)
+ prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
+ #endif
+ }
diff --git a/games/vcmi/patches/patch-lib_modding_CModVersion_h
b/games/vcmi/patches/patch-lib_modding_CModVersion_h
deleted file mode 100644
index ff95fd414b9..000
--- a/games/vcmi/patches/patch-lib_modding_CModVersion_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/modding/CModVersion.h
--
OT: dkim (was Re: patch dkimproxy: use rsa-sha256 in sample signing config)
On Sun, May 12, 2024 at 11:13:46AM +0100, Kirill A. Korinsky wrote: > On Sun, 12 May 2024 00:26:50 +0100, > Steffen Nurpmeso wrote: > > > > What they are doing is wrong. Maybe if you move it out of Junk > > a few times their algorithm learns or what, i do not know. > > I would start screaming, but normally noone listens anyhow, sure. > > > > Yes, they are. > > But they delivery into Junk messages from Mail Delivery System > . A real one. Not fake one. Really. > > So I doubt that anything may help here. > While on the subject : https://16years.secvuln.info/ The old Debian OpenSSL bug from 2006 still haunts DKIM signatures today. -- Matthieu Herrb
Re: patch dkimproxy: use rsa-sha256 in sample signing config
On Sun, 12 May 2024 00:26:50 +0100, Steffen Nurpmeso wrote: > > What they are doing is wrong. Maybe if you move it out of Junk > a few times their algorithm learns or what, i do not know. > I would start screaming, but normally noone listens anyhow, sure. > Yes, they are. But they delivery into Junk messages from Mail Delivery System . A real one. Not fake one. Really. So I doubt that anything may help here. -- wbr, Kirill
update editors/kakoune
New version of kakoune available:
- gzip_man=no in MAKE_ENV didn't work anymore, I patched Makefile
- tests were not working, I reported it upstream who made a fix
- compilation didn't work due to quotes being lost, upstream made fix
I plan to commit it soon, but I'd like some feedback if possible
diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index 218164067da..17480e4ccb7 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,6 +1,6 @@
COMMENT = modal code editor with a focus on interactivity
-V =2023.08.05
+V =2024.05.09
DISTNAME = kakoune-${V}
CATEGORIES = editors
@@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes
# -std=c++2a
COMPILER = base-clang
-MAKE_ENV = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" gzip_man=no
+MAKE_ENV = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
FAKE_FLAGS = PREFIX="${TRUEPREFIX}"
# some tests fail without en_US.UTF-8
TEST_ENV = LC_CTYPE="en_US.UTF-8"
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index 42f8dafa9a2..079e7825106 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kakoune-2023.08.05.tar.bz2) =
PkUVHgrd01AN4taim1qs8iZ8QrslbUSnguc977Kc2lw=
-SIZE (kakoune-2023.08.05.tar.bz2) = 568612
+SHA256 (kakoune-2024.05.09.tar.bz2) =
IZC939OvWQwFk8OFNwiJdlR1BvR71utsDiI1Db0Woik=
+SIZE (kakoune-2024.05.09.tar.bz2) = 588121
diff --git a/editors/kakoune/patches/patch-Makefile
b/editors/kakoune/patches/patch-Makefile
new file mode 100644
index 000..013516f9446
--- /dev/null
+++ b/editors/kakoune/patches/patch-Makefile
@@ -0,0 +1,56 @@
+Partial changes from 7be22f1ec28677ca0bb30316c6893ab4436734b1
+
+- escape KAK_BIN_PATH
+- test target
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -5,7 +5,7 @@ CXX = c++
+
+ debug = no
+ static = no
+-gzip_man = yes
++gzip_man = no
+ # to get format compatible with GitHub archive use "gzip -S .gz" here
+ compress_bin = bzip2
+
+@@ -13,10 +13,8 @@ compress-suffix-bzip2 = bz2
+ compress-suffix-zstd = zst
+
+ CPPFLAGS-debug-yes = -DKAK_DEBUG
+-CXXFLAGS-debug-yes = -O0 -g3
+ tag-debug-yes = .debug
+
+-CXXFLAGS-debug-no = -O3 -g3
+ tag-debug-no = .opt
+
+ CXXFLAGS-sanitize-address = -fsanitize=address
+@@ -40,7 +38,7 @@ bindir = $(DESTDIR)$(PREFIX)/bin
+ libexecdir = $(DESTDIR)$(PREFIX)/libexec/kak
+ sharedir = $(DESTDIR)$(PREFIX)/share/kak
+ docdir = $(DESTDIR)$(PREFIX)/share/doc/kak
+-mandir = $(DESTDIR)$(PREFIX)/share/man/man1
++mandir = $(DESTDIR)$(PREFIX)/man/man1
+
+ # Both Cygwin and MSYS2 have "_NT" in their uname.
+ os = $(shell uname | sed 's/.*_NT.*/Windows/')
+@@ -54,7 +52,7 @@ LDFLAGS-os-FreeBSD = -L/usr/local/lib
+
+ LIBS-os-Haiku = -lnetwork -lbe
+
+-CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH="$(bindir)/kak" -I/usr/local/include
++CPPFLAGS-os-OpenBSD = -DKAK_BIN_PATH=\"$(bindir)/kak\" -I/usr/local/include
+ LDFLAGS-os-OpenBSD = -L/usr/local/lib
+ mandir-os-OpenBSD = $(DESTDIR)$(PREFIX)/man/man1
+
+@@ -136,6 +134,9 @@ doc/kak.1.gz: doc/kak.1
+
+ check: test
+ test: src/kak
++ if [ $(os) = OpenBSD ]; then \
++ export KAKOUNE_RUNTIME=$$PWD/share/kak; \
++ fi && \
+ cd test && ./run
+
+ TAGS: tags
diff --git a/editors/kakoune/patches/patch-src_Makefile
b/editors/kakoune/patches/patch-src_Makefile
deleted file mode 100644
index 84c865e9398..000
--- a/editors/kakoune/patches/patch-src_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove optimization flags for debug or release builds
-
-Index: src/Makefile
src/Makefile.orig
-+++ src/Makefile
-@@ -12,11 +12,9 @@ endif
-
- ifeq ($(debug),yes)
- CPPFLAGS += -DKAK_DEBUG
--CXXFLAGS += -O0
- suffix := .debug
- else
- ifeq ($(debug),no)
--CXXFLAGS += -O3
- suffix := .opt
- else
- $(error debug should be either yes or no)
diff --git a/editors/kakoune/patches/patch-src_ranges_hh
b/editors/kakoune/patches/patch-src_ranges_hh
deleted file mode 100644
index 5145755cd7e..000
--- a/editors/kakoune/patches/patch-src_ranges_hh
+++ /dev/null
@@ -1,66 +0,0 @@
-From 344d31f42b8ced12626d4f87a22ffa5a671668fd Mon Sep 17 00:00:00 2001
-From: Johannes Altmanninger
-Date: Tue, 9 May 2023 10:44:08 +0200
-Subject: [PATCH] Work around clang not inferring default args of template
- template args
-
-Index: src/ranges.hh
src/ranges.hh.orig
-+++ src/ranges.hh
-@@ -8,6 +8,11 @@
- #include
-
- #include "constexpr_utils.hh"
-+#if __clang_major__ >= 16
-+#include "memory.hh"
-+#include "meta.hh"
-+#include "vector.hh"
-+#endif
-
- namespace Kakoune
- {
-@@ -638,6 +643,35 @@ auto gather()
- }};
- }
-
-+#if __clang_major__ >= 16
-+
-+template {})>
-+ class Container>
-+auto gather()
-+{
-+return ViewFactory{[](auto&& range) {
-+using std::begin; using std::end;
-+using ValueType =
std::remove_cv_t>;
-+return Container(begin(range), end(range));
-+
