Accepting request 1321644 from X11:Wayland

OBS-URL: https://build.opensuse.org/request/show/1321644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sway?expand=0&rev=53

sway-1.10.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2fbf3a2f94c8926efa18d6af59bb9f5f1eafa6d46491284b1610c57bef2d105
-size 5588240

sway-1.11.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e37a55b7c3379230e97e1ad982542b75016a0c7d6676198604e557f9b373dae
+size 5630956

sway-contrib-1.10.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92d936dce14b36eec55b63efdebe83ee6128d9b7474827a830b163a33f3b6956
+size 21686

sway-contrib-1.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d81a6eee472d9b8dedd0ac9badc6fb88504c19b9dcf873f18d24378eab3f0995
-size 14248

sway.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Fri Dec  5 10:05:50 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
+
+- Properly use sway-xkb-layout-generator package
+
+-------------------------------------------------------------------
+Thu Dec  4 16:33:44 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Don’t bundle xkb-layout-generator use it from the package.
+
+-------------------------------------------------------------------
+Wed Dec  3 16:36:30 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Run spec-cleaner on the SPEC file
+- Add xkb-layout-generator with %post scriptlet generating per-system
+  configuration for national keyboards.
+
+-------------------------------------------------------------------
+Sat Jul 12 15:59:42 UTC 2025 - Jakob Lorenz <onlyjak0b@mailbox.org>
+
+- Update sway to 1.11
+  * All of the enhancements from wlroots 0.19.0.
+  * Add support for linux-drm-syncobj-v1 for explicit synchronization
+  * Add support for alpha-modifier-v1 for setting an alpha multiplier
+    for a surface
+  * Add support for ext-image-copy-capture-v1 and ext-image-capture-source-v1
+    for improved screen capture
+  * Add support for ext-data-control-v1 as an alternative protocol for
+    clipboard managers
+  * Improved output configuration logic for better and faster fallbacks
+  * Pointer keys are now supported and can be bound in keymaps to trigger
+    pointer events
+  * security-context-v1 metadata is exposed in IPC, and can be used in
+    criteria and title format
+  * The default configuration file now ships key bindings for a few
+    utilities: pactl, brightnessctl, grim
+  * The default menu now uses wmenu-run and no longer depends on dmenu_path.
+  * The default tap-and-drag lock mode has been switched to sticky as
+    recommended by upstream
+  * The sway.desktop file now sets DesktopNames (XDG_CURRENT_DESKTOP will
+    be set by login managers)
+- Update sway-constrib to 1.10.1
+  * grimpicker: Handle different output scales
+  * Add Float Window Manager directory (containing script and readme)
+  * Improve the robustness of inactive-windows-transparency
+  * Fix grimshot trying to send notification even when disabled
+
 -------------------------------------------------------------------
 Thu Mar 20 03:56:20 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
 

sway.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sway
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,9 @@
 #
 
 
-%define contribver 1.10
-
+%define contribver 1.10.1
 Name:           sway
-Version:        1.10.1
+Version:        1.11
 Release:        0
 Summary:        Window manager for Wayland compatible with i3
 License:        MIT
@@ -31,10 +30,10 @@ Source2:        https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk
 Source3:        sway-portals.conf
 Source4:        https://github.com/OctopusET/sway-contrib/archive/refs/tags/%{contribver}-contrib.0.tar.gz#/sway-contrib-%{contribver}.tar.gz
 Source5:        sway.rpmlintrc
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 #BuildRequires:  libxslt-tools
 BuildRequires:  libevdev-devel
-BuildRequires:  fdupes
 BuildRequires:  libpixman-1-0-devel
 BuildRequires:  meson >= 0.60.0
 BuildRequires:  pam-devel
@@ -55,21 +54,20 @@ BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.24
 BuildRequires:  pkgconfig(wayland-server) >= 1.21.0
-BuildRequires:  pkgconfig(wlroots-0.18)
+BuildRequires:  pkgconfig(wlroots-0.19)
 BuildRequires:  pkgconfig(xkbcommon)
 # WARNING: do not set this to versioned, as it breaks other branding providers
 # such as openSUSEway (bsc#1222579)
 Requires:       %{name}-branding
+Recommends:     swaybar
+Recommends:     swaynag
+# For file picker and other stuff and for the sway-portal.conf
+Recommends:     xdg-desktop-portal-gtk
+Recommends:     xdg-desktop-portal-wlr
 %if 0%{?suse_version}
 # I definitely recommend Xwayland
 Recommends:     xorg-x11-server-wayland
 %endif
-Recommends:     swaybar
-Recommends:     swaynag
-Recommends:     xdg-desktop-portal-wlr
-
-# For file picker and other stuff and for the sway-portal.conf
-Recommends:     xdg-desktop-portal-gtk
 
 %description
 Sway is a tiling Wayland compositor and a drop-in replacement for the i3
@@ -84,20 +82,21 @@ Supplements:    (%{name} and branding-upstream)
 Conflicts:      %{name}-branding
 Provides:       %{name}-branding = %{version}
 BuildArch:      noarch
+Requires(post): sway-xkb-layout-generator
 #BRAND: /etc/sway/config contains upstream config and brand
 
 %description branding-upstream
 This package provides the upstream look and feel for sway.
 
 %package contrib
-Summary:        Contributed scripts for %{name}
 Version:        %{contribver}
+Summary:        Contributed scripts for %{name}
 Group:          System/GUI/Other
-# autoname-workspaces & inactive-windows-transparency
-Requires:       python3-i3ipc
 # for grimshot
 Requires:       grim
 Requires:       jq
+# autoname-workspaces & inactive-windows-transparency
+Requires:       python3-i3ipc
 Requires:       slurp
 Requires:       sway
 Requires:       wl-clipboard
@@ -128,10 +127,11 @@ mkdir -p contrib
 tar xvf %{SOURCE4} --strip-components=1 -C contrib/
 pushd contrib
 rm -rf .github
-find -type f -name "*.py" -execdir sed -i 's,#!/usr/bin/env python$,#!/usr/bin/python3,' {} \;
-find -type f -name "*.py" -execdir sed -i 's,#!/usr/bin/env python3$,#!/usr/bin/python3,' {} \;
-find -type f -name "grimpicker" -execdir sed -i 's,#!/usr/bin/env python3$,#!/usr/bin/python3,' {} \;
-find -type f -name "*.py" -execdir sed -i 's,#!/usr/bin/python$,#!/usr/bin/python3,' {} \;
+find -type f -name "*.py" -execdir sed -i 's,#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} \;
+find -type f -name "*.py" -execdir sed -i 's,#!%{_bindir}/env python3$,#!%{_bindir}/python3,' {} \;
+find -type f -name "grimpicker" -execdir sed -i 's,#!%{_bindir}/env python3$,#!%{_bindir}/python3,' {} \;
+find -type f -name "*.py" -execdir sed -i 's,#!%{_bindir}/python$,#!%{_bindir}/python3,' {} \;
+find -type f -name "*.sh" -execdir sed -i 's,#!%{_bindir}/env bash,#!%{_bindir}/bash,' {} \;
 popd
 
 %build
@@ -163,17 +163,21 @@ install -Dpm 0644 -t %{buildroot}%{_datadir}/xdg-desktop-portal/ %{SOURCE3}
 
 %fdupes %{buildroot}%{_prefix}
 
+%post branding-upstream
+test -e %{_sysconfdir}/sway/keyboard.conf \
+    || %{_libexecdir}/sway-xkb-layout-generator > %{_sysconfdir}/sway/keyboard.conf
+
 %files
 %license LICENSE
 %doc README.md CONTRIBUTING.md
 %{_bindir}/sway
 %{_bindir}/swaymsg
-%{_mandir}/man1/sway.1.gz
-%{_mandir}/man1/swaymsg.1.gz
-%{_mandir}/man5/sway-input.5.gz
-%{_mandir}/man5/sway-output.5.gz
-%{_mandir}/man5/sway.5.gz
-%{_mandir}/man7/sway-ipc.7.gz
+%{_mandir}/man1/sway.1%{?ext_man}
+%{_mandir}/man1/swaymsg.1%{?ext_man}
+%{_mandir}/man5/sway-input.5%{?ext_man}
+%{_mandir}/man5/sway-output.5%{?ext_man}
+%{_mandir}/man5/sway.5%{?ext_man}
+%{_mandir}/man7/sway-ipc.7%{?ext_man}
 %{_datadir}/wayland-sessions/
 %dir %{_datadir}/backgrounds
 %{_datadir}/backgrounds/sway
@@ -191,25 +195,25 @@ install -Dpm 0644 -t %{buildroot}%{_datadir}/xdg-desktop-portal/ %{SOURCE3}
 %files branding-upstream
 %dir %{_sysconfdir}/sway
 %config(noreplace) %{_sysconfdir}/sway/config
+%ghost %config(noreplace) %attr(0644,-,-) %{_sysconfdir}/sway/keyboard.conf
 
 %files contrib
 %license LICENSE
 %{_bindir}/grimshot
 %{_mandir}/man1/grimshot*
 %dir %{_datadir}/sway
-%dir %{_datadir}/sway/contrib
-%{_datadir}/sway/contrib/*
+%{_datadir}/sway/contrib
 
 %files -n swaybar
 %{_bindir}/swaybar
-%{_mandir}/man5/sway-bar.5.gz
-%{_mandir}/man7/swaybar-protocol.7.gz
+%{_mandir}/man5/sway-bar.5%{?ext_man}
+%{_mandir}/man7/swaybar-protocol.7%{?ext_man}
 %{_datadir}/bash-completion/completions/swaybar
 
 %files -n swaynag
 %{_bindir}/swaynag
 %{_datadir}/fish/vendor_completions.d/swaynag.fish
-%{_mandir}/man1/swaynag.1.gz
-%{_mandir}/man5/swaynag.5.gz
+%{_mandir}/man1/swaynag.1%{?ext_man}
+%{_mandir}/man5/swaynag.5%{?ext_man}
 
 %changelog