Page MenuHomeFreeBSD

x11-wm/sway: unbreak build after 42a49699a75e
ClosedPublic

Authored by manu on Mar 27 2023, 8:47 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 3, 10:41 AM
Unknown Object (File)
Wed, Apr 3, 10:41 AM
Unknown Object (File)
Wed, Apr 3, 10:41 AM
Unknown Object (File)
Wed, Apr 3, 10:41 AM
Unknown Object (File)
Wed, Apr 3, 10:37 AM
Unknown Object (File)
Jan 13 2024, 1:56 PM
Unknown Object (File)
Dec 20 2023, 8:38 AM
Unknown Object (File)
Nov 9 2023, 7:23 PM
Subscribers

Details

Summary

../sway/ipc-json.c:898:11: error: enumeration value 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror,-Wswitch]

switch (libinput_device_config_accel_get_profile(device)) {

^

Sponsored by: Beckhoff Automation GmbH & Co. KG

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

manu requested review of this revision.Mar 27 2023, 8:47 AM
jbeich requested changes to this revision.Mar 27 2023, 9:07 AM

x11-wm/sway: Add patch for libinput 1.23.0

Add a patch for handling newer libinput.

I don't like the commit message.

It's tautological:

  • body repeats subject
  • rewords small diff in English

and barely contains rationale (aka "why?" it was done) i.e.,

  • was build broken? if so provide an error excerpt
  • is it a regression? if so which commit introduced it

Try the following instead:

x11-wm/sway: unbreak build after 42a49699a75e

../sway/ipc-json.c:898:11: error: enumeration value 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror,-Wswitch]

switch (libinput_device_config_accel_get_profile(device)) {
        ^
x11-wm/sway/Makefile
3

Can you bump PORTREVISION in x11-wm/swayfx as well?

9

Can you run make makesum in x11-wm/swayfx? Otherwise, it fails to build:

$ poudriere testport -j 131amd64 x11-wm/swayfx
[...]
=======================<phase: fetch          >============================
===== env: DEVELOPER_MODE=yes STRICT_DEPENDS=yes USER=root UID=0 GID=0
===>  License MIT accepted by the user
===>   swayfx-0.2 depends on file: /usr/local/sbin/pkg - found
=> 26ae9b20773d.patch is not in /usr/ports/x11-wm/swayfx/distinfo.
=> Either /usr/ports/x11-wm/swayfx/distinfo is out of date, or
=> 26ae9b20773d.patch is spelled incorrectly.
*** Error code 1
x11-wm/sway/distinfo
1

This chunk can be omitted since PORTREVISION is bumped, anyway.

This revision now requires changes to proceed.Mar 27 2023, 9:07 AM
manu retitled this revision from x11-wm/sway: Add patch for libinput 1.23.0 to x11-wm/sway: unbreak build after 42a49699a75e.
manu edited the summary of this revision. (Show Details)
manu added inline comments.
x11-wm/sway/distinfo
1

Mhm no ?

bapt added inline comments.
x11-wm/sway/distinfo
1

Wrong the goal of the timestamp has been added and is there to cover the reproducible build which is not finished yet in order to have a stable timestamp (see reproducible build docs - upstream) and we decided that the timestamp would be the one from the last changes in the distfiles.

jbeich added inline comments.
x11-wm/sway/Makefile
9

Can you use dee032d0a0ec (from master branch) instead? Don't forget to re-run make makesum in both ports.

This revision is now accepted and ready to land.Mar 27 2023, 9:37 AM
This revision was automatically updated to reflect the committed changes.