On Wed, 23 Sep 2026 19:02:33 +0200, Nazarenko Mykyta <[email protected]> wrote: > > [1 <text/plain; US-ASCII (7bit)>] > On Wed, 23 Sep 2026 15:39:58 +0200 > Kirill A. Korinsky <[email protected]> wrote: > > > On Wed, 23 Sep 2026 15:13:22 +0200, > > Nazarenko Mykyta <[email protected]> wrote: > > > > > > RCS file: > > > /cvs/ports/net/64gram/patches/patch-cmake_external_CMakeLists_txt,v > > > diff -u -r1.1.1.1 patch-cmake_external_CMakeLists_txt > > > --- patches/patch-cmake_external_CMakeLists_txt 16 Sep 2026 10:15:58 > > > -0000 1.1.1.1 > > > +++ patches/patch-cmake_external_CMakeLists_txt 23 Sep 2026 13:01:35 > > > -0000 > > > @@ -1,11 +1,9 @@ > > > -Skip unused TooManyCooks, it requires newer libcxx > > > - > > > ---- cmake/external/CMakeLists.txt.orig Tue Aug 4 12:34:45 2026 > > > -+++ cmake/external/CMakeLists.txt Tue Aug 4 12:35:00 2026 > > > -@@ -49,7 +49,6 @@ > > > - add_checked_subdirectory(rlottie) > > > +--- cmake/external/CMakeLists.txt.orig Fri Sep 11 16:35:56 2026 > > > ++++ cmake/external/CMakeLists.txt Tue Sep 22 10:33:08 2026 > > > +@@ -52,7 +52,6 @@ > > > add_checked_subdirectory(rnnoise) > > > add_checked_subdirectory(tde2e) > > > + add_checked_subdirectory(tlottie) > > > -add_checked_subdirectory(tmc) > > > add_checked_subdirectory(ton) > > > add_checked_subdirectory(variant) > > > > I see that TooManyCooks was switched off here: > > https://github.com/openbsd/ports/commit/b98f248ae1cbc45b8a896f970e2b89d7cda6d48a > > > > If I recall right we had libcxx-19 at that time. > > > > And now we should have libcxx-22. > > > > Are you sure that tdesktop/64gram needs something never? Really? > > > > If I recall right libcxx-23 was release in August and that remove of > > TooManyCooks had happened in June. > > > > You're absolutely right; patch-cmake_external_CMakeLists_txt can > be removed - it works. And I added tlottie to LIB_DEPENDS, just as > they did for webkitgtk-6.0 in net/tdesktop. > > Updated diff attached. >
I can't aply your diff: |=================================================================== |RCS file: /cvs/ports/net/64gram/Makefile,v |diff -u -r1.1.1.1 Makefile |--- Makefile 16 Sep 2026 10:15:58 -0000 1.1.1.1 |+++ Makefile 23 Sep 2026 16:43:51 -0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 3. Hunk #2 succeeded at 38. Hunk #3 succeeded at 68. Hunk #4 succeeded at 101. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: distinfo |=================================================================== |RCS file: /cvs/ports/net/64gram/distinfo,v |diff -u -r1.1.1.1 distinfo |--- distinfo 16 Sep 2026 10:15:58 -0000 1.1.1.1 |+++ distinfo 23 Sep 2026 16:43:51 -0000 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: patches/patch-cmake_external_CMakeLists_txt |=================================================================== |RCS file: patches/patch-cmake_external_CMakeLists_txt |diff -N patches/patch-cmake_external_CMakeLists_txt |--- patches/patch-cmake_external_CMakeLists_txt 16 Sep 2026 10:15:58 -0000 1.1.1.1 |+++ /dev/null 1 Jan 1970 00:00:00 -0000 -------------------------- Patching file patches/patch-cmake_external_CMakeLists_txt using Plan A... Empty context always matches. Reversed (or previously applied) patch detected! Assume -R? [y] n Apply anyway? [n] y Reversed (or previously applied) patch detected! Assume -R? [y] n Apply anyway? [n] y Reversed (or previously applied) patch detected! Assume -R? [y] n Apply anyway? [n] y Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to patches/patch-cmake_external_CMakeLists_txt.rej done 64gram $ md5 /tmp/64gram.diff MD5 (/tmp/64gram.diff) = 61167b491c79f9e205f99f9a096312f2 64gram $ The reason seems that you had missed ^M at the end of each line inside patches/patch-cmake_external_CMakeLists_txt Anyway, I tried it with manually droped patch and https://marc.info/?l=openbsd-ports&m=179023677023942&w=2 It seems to work fine. -- wbr, Kirill
