From 19054bbec93b1763c0d013b4707d8d2e671eec55 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 2 Mar 2025 02:09:20 -0800 Subject: [PATCH] feat(swayfx): package changes (#3574) (#3659) * Update packager email * Bump swayVersion * Update BuildRequires * Move %package wallpapers * Add patches * Bump release (cherry picked from commit c0f43d01778815b0f3063f3cf1bb21f6037bf73a) Co-authored-by: Atmois --- anda/desktops/swayfx/swayfx.spec | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/anda/desktops/swayfx/swayfx.spec b/anda/desktops/swayfx/swayfx.spec index abbf3a1ebf..ebfac78da7 100644 --- a/anda/desktops/swayfx/swayfx.spec +++ b/anda/desktops/swayfx/swayfx.spec @@ -1,8 +1,8 @@ -%global swayVersion 1.9 +%global swayVersion 1.10.1 Name: swayfx Version: 0.5 -Release: 1%?dist +Release: 2%?dist Summary: SwayFX: Sway, but with eye candy! URL: https://github.com/WillPower3309/swayfx @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(json-c) >= 0.13 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevdev) -BuildRequires: pkgconfig(libinput) >= 1.21.0 +BuildRequires: pkgconfig(libinput) >= 1.26.0 BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libsystemd) >= 239 BuildRequires: pkgconfig(libudev) @@ -33,8 +33,8 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) >= 1.21.0 BuildRequires: pkgconfig(wayland-protocols) >= 1.24 -BuildRequires: (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18) -BuildRequires: (pkgconfig(scenefx) >= 0.1 with pkgconfig(scenefx) < 0.2) +BuildRequires: pkgconfig(scenefx-0.2) +BuildRequires: pkgconfig(wlroots-0.18) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xkbcommon) >= 1.5.0 @@ -46,7 +46,7 @@ Conflicts: sway Provides: sway = %{swayVersion} -Packager: Atmois +Packager: Atmois %description %{summary} @@ -61,15 +61,6 @@ Provides: sway-config = %{version}-%{release} Conflicts: sway-config -%package wallpapers -Summary: Wallpapers for Sway -BuildArch: noarch -License: CC0 - -%description wallpapers -Wallpaper collection provided with Sway - - # Require the wallpaper referenced in the config. # Weak dependency here causes a swaynag warning during the configuration load Requires: sway-wallpapers @@ -106,10 +97,20 @@ Recommends: (qt6-qtwayland if qt6-qtbase-gui) Upstream configuration for Sway. Includes all important dependencies for a typical desktop system with minimal or no divergence from the upstream. +%package wallpapers +Summary: Wallpapers for Sway +BuildArch: noarch +License: CC0 + +%description wallpapers +Wallpaper collection provided with Sway + %prep %autosetup -N -n %{name}-%{version} +%autopatch -p1 -M99 + %build %meson \ -Dsd-bus-provider=libsystemd \