mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-02-05 04:06:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump wlroots requirement to v0.18

Browse source
This commit is contained in:
Simon Ser 2024-02-16 16:17:47 +01:00
parent eaeab71ffa
commit 8714a82c24
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/main.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc
- name: Fetch wlroots as a subproject - name: Fetch wlroots as a subproject
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17 run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.18
- name: Compile Cage (XWayland=${{ matrix.xwayland }}) - name: Compile Cage (XWayland=${{ matrix.xwayland }})
run: | run: |
@ -52,7 +52,7 @@ jobs:
pacman-key --init pacman-key --init
pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc hwdata pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc hwdata
- name: Fetch wlroots as a subproject - name: Fetch wlroots as a subproject
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17 run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.18
- name: Check for formatting changes - name: Check for formatting changes
run: | run: |
meson build-clang-format -Dwlroots:xwayland=enabled meson build-clang-format -Dwlroots:xwayland=enabled
@ -71,7 +71,7 @@ jobs:
pacman-key --init pacman-key --init
pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc hwdata pacman -Syu --noconfirm xcb-util-wm seatd git clang meson libinput libdrm mesa libxkbcommon wayland wayland-protocols xorg-server-xwayland scdoc hwdata
- name: Fetch wlroots as a subproject - name: Fetch wlroots as a subproject
run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.17 run: git clone https://gitlab.freedesktop.org/wlroots/wlroots.git subprojects/wlroots -b 0.18
- name: Run scan-build - name: Run scan-build
run: | run: |
meson build-scan-build -Dwlroots:xwayland=enabled meson build-scan-build -Dwlroots:xwayland=enabled

2
README.md
View file

@ -20,7 +20,7 @@ All releases are published on [GitHub](https://github.com/cage-kiosk/cage/releas
You can build Cage with the [meson](https://mesonbuild.com/) build system. It You can build Cage with the [meson](https://mesonbuild.com/) build system. It
requires wayland, wlroots, and xkbcommon to be installed. Optionally, install requires wayland, wlroots, and xkbcommon to be installed. Optionally, install
scdoc for manual pages. Cage is currently based on branch 0.17 of wlroots. scdoc for manual pages. Cage is currently based on branch 0.18 of wlroots.
Simply execute the following steps to build Cage: Simply execute the following steps to build Cage:

2
meson.build
View file

@ -35,7 +35,7 @@ if is_freebsd
) )
endif endif
wlroots = dependency('wlroots', version: '>= 0.17.0', fallback: ['wlroots', 'wlroots']) wlroots = dependency('wlroots-0.18', fallback: ['wlroots', 'wlroots'])
wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')