Details
- Reviewers
grahamperrin 0mp manu - Commits
- R11:e6f66fef0255: x11/xkeyboard-config: Update to 2.40
Diff Detail
- Repository
- R11 FreeBSD ports repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 31 | So this is removed because the port switch to meson but since you didn't add the meson counterpart for NLS it will always be on. | |
Looks like NLS is still needed, without gettext-tools install I have :
po/meson.build:2: WARNING: Gettext not found, all translation (po) targets will be ignored.
When it's installed the .mo are correctly built/installed.
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 15 | Why was xorg-cat:data was removed ? | |
Good catch. Do we need to bring the NLS option back then? Or just add gettext-tools and iconv in USES? I am not very familiar with the ports infrastructure, sorry.
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 15 | It is giving me a meson usage error when I have it included: meson setup: error: ambiguous option: --build=amd64-portbld-freebsd13.2 could match --buildtype, --build.pkg-config-path, --build.cmake-prefix-path | |
The po/meson.build doesn't require a knob to be set, so NLS is always on by
default, which means we just have to include gettext-tools and iconv in
USES and remove %%NLS%% from the .mo files in pkg-plist.
So there is no way to disable NLS now ?
This likely needs to be reported upstream or better : fixed.
I know I said that if it's not configurable we should remove the option but tbh I was wrong, a lot of people don't want NLS stuff and configure ports to not add them.
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 15 | Mk/Uses/xorg-cat.mk might need some changes for meson, this needs to be fixed before this can go in. | |
I might be mistaken, but
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/master/po/meson.build?ref_type=heads
seems to enable it by default. Am I missing something?
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 15 | Could you please take care of this? | |
Add optional NLS support. I have submitted a merge request to upstream to make
NLS optional in their meson build, so do not push this until upstream is
updated.
Add NLS patch (same as the one I submitted to upstream) manually until new
upstream version is released with the patch built-in.
@manu I tested it both with WITH=NLS and without and it works fine, so consider this one done once you test it yourself as well if you want. Could you please handle the xorg-cat.mk changes or can we get this patch through without them?
The upstream MR is here:
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/640?commit_id=9f56d6537839809f5b8d20b414d76d0c089b5e08
When the new version is released, we will get rid of files/patch-nls.
| x11/xkeyboard-config/Makefile | ||
|---|---|---|
| 6 | That should be USES= tar:xz | |
I'll try to have a look at this today or this weekend.
The upstream MR is here:
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/640?commit_id=9f56d6537839809f5b8d20b414d76d0c089b5e08When the new version is released, we will get rid of files/patch-nls.
Since the patch will land in 2.41, we can go ahead and commit this one without waiting for upstream. Once they release 2.41 I will get rid of the patch file.