[packages/cage] up to 0.2.0
atler
atler at pld-linux.org
Thu Feb 20 14:39:09 CET 2025
commit 399378da2c5811c40dac3e5c58da55eaa880a134
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Feb 20 13:52:28 2025 +0100
up to 0.2.0
cage.spec | 28 +++++++------------
wlroots-gcc14.patch | 75 ---------------------------------------------------
wlroots-version.patch | 11 --------
3 files changed, 10 insertions(+), 104 deletions(-)
---
diff --git a/cage.spec b/cage.spec
index 4c975e2..a27c10a 100644
--- a/cage.spec
+++ b/cage.spec
@@ -1,21 +1,19 @@
# Conditional build:
-%bcond_with system_wlroots # Link with system wlroots
+%bcond_without system_wlroots # Link with system wlroots
-%define wlroots_ver 0.16.2
+%define wlroots_ver 0.18.2
Summary: A Wayland kiosk
Name: cage
-Version: 0.1.5
-Release: 2
+Version: 0.2.0
+Release: 1
License: MIT
Group: Applications
Source0: https://github.com/cage-kiosk/cage/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 616bde2178a3c88f3238d9d26446a259
+# Source0-md5: 35843f54f096322d78d7802c94258bc4
Source1: https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/%{wlroots_ver}/downloads/wlroots-%{wlroots_ver}.tar.gz
-# Source1-md5: cea876a8833d60ab65548ef60aae14b7
-Patch0: wlroots-version.patch
-Patch1: wlroots-x32.patch
-Patch2: wlroots-gcc14.patch
+# Source1-md5: f230118c020e3ac40813823d4156d324
+Patch0: wlroots-x32.patch
URL: https://www.hjdskes.nl/projects/cage/
BuildRequires: meson >= 0.58.1
BuildRequires: ninja
@@ -27,8 +25,7 @@ BuildRequires: wayland-devel
BuildRequires: wayland-protocols >= 1.14
BuildRequires: xorg-lib-libxkbcommon-devel
%if %{with system_wlroots}
-BuildRequires: wlroots-devel >= 0.16.0
-BuildRequires: wlroots-devel < 0.17.0
+BuildRequires: wlroots0.18-devel
%else
BuildRequires: EGL-devel
BuildRequires: Mesa-libgbm-devel >= 21.1.0
@@ -48,7 +45,6 @@ BuildRequires: xcb-util-renderutil-devel
BuildRequires: xcb-util-wm-devel
BuildRequires: xorg-xserver-Xwayland-devel
%endif
-%{?with_system_wlroots:Requires: wlroots >= 0.16.0}
Requires: xorg-xserver-Xwayland
%if %{without system_wlroots}
Requires: Mesa-libgbm >= 21.1.0
@@ -71,18 +67,14 @@ prevents the user from interacting with anything but this application.
%prep
%setup -q %{!?with_system_wlroots:-a1}
-%patch -P0 -p1
-
%if %{without system_wlroots}
%{__mkdir} subprojects
%{__mv} wlroots-%{wlroots_ver} subprojects/wlroots
-%patch -P1 -p1 -d subprojects/wlroots
-%patch -P2 -p1 -d subprojects/wlroots
+%patch -P0 -p1 -d subprojects/wlroots
%endif
%build
%meson \
- -Dxwayland=true \
%if %{without system_wlroots}
--force-fallback-for=wlroots \
-Dwlroots:default_library=static \
@@ -97,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
%meson_install
%if %{without system_wlroots}
-%{__rm} -r $RPM_BUILD_ROOT{%{_includedir}/wlr,%{_libdir}/libwlroots.a,%{_pkgconfigdir}/wlroots.pc}
+%{__rm} -r $RPM_BUILD_ROOT{%{_includedir}/wlroots-0.18,%{_libdir}/libwlroots-0.18.a,%{_pkgconfigdir}/wlroots-0.18.pc}
%endif
%clean
diff --git a/wlroots-gcc14.patch b/wlroots-gcc14.patch
deleted file mode 100644
index 2e8158d..0000000
--- a/wlroots-gcc14.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur wlroots.orig/backend/libinput/tablet_pad.c wlroots/backend/libinput/tablet_pad.c
---- wlroots.orig/backend/libinput/tablet_pad.c 2023-02-10 23:29:59.000000000 +0100
-+++ wlroots/backend/libinput/tablet_pad.c 2024-06-28 23:27:34.499124855 +0200
-@@ -34,7 +34,7 @@
- ++group->ring_count;
- }
- }
-- group->rings = calloc(sizeof(unsigned int), group->ring_count);
-+ group->rings = calloc(group->ring_count, sizeof(unsigned int));
- if (group->rings == NULL) {
- goto group_fail;
- }
-@@ -51,7 +51,7 @@
- ++group->strip_count;
- }
- }
-- group->strips = calloc(sizeof(unsigned int), group->strip_count);
-+ group->strips = calloc(group->strip_count, sizeof(unsigned int));
- if (group->strips == NULL) {
- goto group_fail;
- }
-@@ -67,7 +67,7 @@
- ++group->button_count;
- }
- }
-- group->buttons = calloc(sizeof(unsigned int), group->button_count);
-+ group->buttons = calloc(group->button_count, sizeof(unsigned int));
- if (group->buttons == NULL) {
- goto group_fail;
- }
-diff -ur wlroots.orig/backend/wayland/output.c wlroots/backend/wayland/output.c
---- wlroots.orig/backend/wayland/output.c 2023-02-10 23:29:59.000000000 +0100
-+++ wlroots/backend/wayland/output.c 2024-06-28 23:27:34.495791624 +0200
-@@ -521,7 +521,7 @@
- }
-
- struct wlr_wl_output *output;
-- if (!(output = calloc(sizeof(struct wlr_wl_output), 1))) {
-+ if (!(output = calloc(1, sizeof(struct wlr_wl_output)))) {
- wlr_log(WLR_ERROR, "Failed to allocate wlr_wl_output");
- return NULL;
- }
-diff -ur wlroots.orig/examples/tablet.c wlroots/examples/tablet.c
---- wlroots.orig/examples/tablet.c 2023-02-10 23:29:59.000000000 +0100
-+++ wlroots/examples/tablet.c 2024-06-28 23:27:34.492458394 +0200
-@@ -309,7 +309,7 @@
- xkb_context_unref(context);
- break;
- case WLR_INPUT_DEVICE_TABLET_PAD:;
-- struct tablet_pad_state *pstate = calloc(sizeof(struct tablet_pad_state), 1);
-+ struct tablet_pad_state *pstate = calloc(1, sizeof(struct tablet_pad_state));
- pstate->wlr_tablet_pad = wlr_tablet_pad_from_input_device(device);
- pstate->sample = sample;
- pstate->destroy.notify = tablet_pad_destroy_notify;
-@@ -327,7 +327,7 @@
- sample->height_mm = tablet->height_mm == 0 ?
- 10 : tablet->height_mm;
-
-- struct tablet_tool_state *tstate = calloc(sizeof(struct tablet_tool_state), 1);
-+ struct tablet_tool_state *tstate = calloc(1, sizeof(struct tablet_tool_state));
- tstate->wlr_tablet = tablet;
- tstate->sample = sample;
- tstate->destroy.notify = tablet_tool_destroy_notify;
-diff -ur wlroots.orig/examples/touch.c wlroots/examples/touch.c
---- wlroots.orig/examples/touch.c 2023-02-10 23:29:59.000000000 +0100
-+++ wlroots/examples/touch.c 2024-06-28 23:27:34.489125164 +0200
-@@ -220,7 +220,7 @@
- xkb_context_unref(context);
- break;
- case WLR_INPUT_DEVICE_TOUCH:;
-- struct touch_state *tstate = calloc(sizeof(struct touch_state), 1);
-+ struct touch_state *tstate = calloc(1, sizeof(struct touch_state));
- tstate->wlr_touch = wlr_touch_from_input_device(device);
- tstate->sample = sample;
- tstate->destroy.notify = touch_destroy_notify;
diff --git a/wlroots-version.patch b/wlroots-version.patch
deleted file mode 100644
index dab9f0b..0000000
--- a/wlroots-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cage-0.1.5/meson.build.orig 2023-07-28 16:46:37.000000000 +0200
-+++ cage-0.1.5/meson.build 2024-06-28 23:10:30.722351855 +0200
-@@ -35,7 +35,7 @@
- )
- endif
-
--wlroots = dependency('wlroots', version: '>= 0.16.0', fallback: ['wlroots', 'wlroots'])
-+wlroots = dependency('wlroots', version: ['>= 0.16.0', '< 0.17.0'], fallback: ['wlroots', 'wlroots'])
- wayland_protos = dependency('wayland-protocols', version: '>=1.14')
- wayland_server = dependency('wayland-server')
- xkbcommon = dependency('xkbcommon')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cage.git/commitdiff/399378da2c5811c40dac3e5c58da55eaa880a134
More information about the pld-cvs-commit
mailing list