Created attachment 256071 [details] Patch to update textproc/ibus - Update to 1.5.31 - Add GTK4 option - Enable by default GTK3, GTK4 and WAYLAND options (disable GTK2) - Remove reference to KDE4 in pkg-message Note: Wayland is enabled by default in x11-toolkits/gtk30 and x11-toolkits/gtk40
On the high level this looks good, I have a few comments, though: 1. I know vulkan and graphene are listed as 'requirements' in gtk4.pc. Do you think that we should list them as dependencies of this port, though? This port does not use them directly; instead, they're depended upon indirectly through GTK4, right? So we possibly should just have GTK4 depend on them? If you check the code, actually gtk2 & gtk3 plugins also use graphene, but they're not listed. I suppose removing them creates warnings in stage-qa? I still lean towards not having them as direct dependencies, though, at least not vulkan - we do have some code which uses graphene, although the code does not even include its header. I think the code possibly should be fixed upstream... My opinion on this is not very strong, though. If you want to keep them to avoid the warning, I'm okay with that. 2. I think removing the BUILD_DEP on gtk-doc is not fully correct; it should be there when the DOCS option is enabled, otherwise, it'll be detected as missing during configure, and docs would not be built. 3. This is not relevant to this change, but it seems like that we're missing a bunch of html files in the pkg-plist, if the DOCS option is enabled. I don't know why we didn't notice this earlier, but we should install them, I think. This is discovered through `make check-plist`.
Created attachment 256348 [details] Patch to update textproc/ibus Fix DOCS option and pkg-plist About vulkan and graphene, this is ports framework stage-qa which tell me. They come from x11-toolkits/gtk40 and graphics/wayland
(In reply to Olivier Duchateau from comment #2) Thanks, looks good. Running poudriere to test the patch.
Created attachment 256473 [details] poudriere log on 13.4-RELEASE
Created attachment 256493 [details] poudriere log on 14.1-RELEASE
poudriere test passed. please commit.
Is MAKE_JOBS_UNSAFE still necessary?
(In reply to Nuno Teixeira from comment #7) I built it a few times and it seems like that it builds fine without it, so let's remove it. It was added in 2020: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250491#c5 I think maybe the old version had some problem, which has been fixed.
Note to self: add to commit msg: + Switch to DISTVERSION + Switch to MASTER_SITES (release tarball) + Remove MAKE_JOBS_UNSAFE restriction
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=119972ab4161a441163969cbb86951bcc54f1080 commit 119972ab4161a441163969cbb86951bcc54f1080 Author: Olivier Duchateau <duchateau.olivier@gmail.com> AuthorDate: 2025-01-08 05:50:38 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2025-01-08 05:57:45 +0000 textproc/ibus: Update to 1.5.31 - Switch to DISTVERSION - Switch to MASTER_SITES (release tarball) - Add GTK4 option - Enable by default GTK3, GTK4 and WAYLAND [1] options (disable GTK2) - Remove reference to KDE4 in pkg-message - Remove MAKE_JOBS_UNSAFE restriction [1] Wayland is enabled by default in x11-toolkits/gtk{30,40} ChangeLog: https://github.com/ibus/ibus/releases/tag/1.5.31 PR: 283516 textproc/ibus/Makefile | 60 +++++++++++++++++++++++------------------------ textproc/ibus/distinfo | 6 ++--- textproc/ibus/pkg-message | 4 ++-- textproc/ibus/pkg-plist | 57 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 90 insertions(+), 37 deletions(-)
Committed, thanks!