Update to 4.24

OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/i3?expand=0&rev=104
2024-11-07 19:45:10 +00:00 · 2024-11-07 19:45:10 +00:00 · d0c74d8615
commit d0c74d8615
12 changed files with 6179 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.osc
--- a/0001-Ignoring-desktop-windows-and-moving-them-on-the-bott.patch
+++ b/0001-Ignoring-desktop-windows-and-moving-them-on-the-bott.patch
@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrzej Pronobis <a.pronobis@gmail.com>
+Date: Mon, 3 Aug 2015 09:40:22 -0700
+Subject: [PATCH] Ignoring desktop windows and moving them on the bottom of the
+ stack.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is important when i3 is used together with KDE Plasma Desktop.
+
+(cherry picked from commit 39fd7e9f6fc649fb1c5a4e112e1dc62ae2bc0170)
+Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
+---
+ include/i3-atoms_NET_SUPPORTED.xmacro.h |  3 ++-
+ src/manage.c                            | 12 ++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/include/i3-atoms_NET_SUPPORTED.xmacro.h b/include/i3-atoms_NET_SUPPORTED.xmacro.h
+index b491da98a6b7a5fd59a8e8bbcb179fb975d41880..cfd850e8972d4d60938088ea6b2cce7a064923bb 100644
+--- a/include/i3-atoms_NET_SUPPORTED.xmacro.h
+++ b/include/i3-atoms_NET_SUPPORTED.xmacro.h
+@@ -34,4 +34,5 @@ xmacro(_NET_DESKTOP_NAMES) \
+ xmacro(_NET_DESKTOP_VIEWPORT) \
+ xmacro(_NET_ACTIVE_WINDOW) \
+ xmacro(_NET_CLOSE_WINDOW) \
+-xmacro(_NET_MOVERESIZE_WINDOW)
+xmacro(_NET_MOVERESIZE_WINDOW) \
+xmacro(_NET_WM_WINDOW_TYPE_DESKTOP)
+diff --git a/src/manage.c b/src/manage.c
+index a7de243e2109f18240b6bc7e91edbaf974f86610..14b61d0b57c023601fb624a30b6b2a2813779d9a 100644
+--- a/src/manage.c
+++ b/src/manage.c
+@@ -245,6 +245,18 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
+     /* Where to start searching for a container that swallows the new one? */
+     Con *search_at = croot;
+ 
+    /* Ignore DESKTOP windows and move them to the bottom of the stack. */
+    if (xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_DESKTOP)) {
+        LOG("Ignoring window of type desktop\n");
+        xcb_map_window(conn, window);
+        uint32_t values[] = {XCB_STACK_MODE_BELOW};
+        xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, values);
+
+        FREE(state_reply);
+        FREE(type_reply);
+        goto geom_out;
+    }
+
+     if (xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_DOCK)) {
+         LOG("This window is of type dock\n");
+         Output *output = get_output_containing(geom->x, geom->y);
--- a/i3-4.23.tar.xz
+++ b/i3-4.23.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61026a7196c9139d0f3aadd27197e8b320c576e3a450e01d74c1aca484044c46
+size 1354628
--- a/i3-4.23.tar.xz.asc
+++ b/i3-4.23.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQk4U1wPnxtQ9nW82TnFg7UrI7h0FAmU+Hp0ACgkQTnFg7UrI
+7h0lXxAAoIr7VtUR7StmYl/MPlMwmFY1p381VTifcLpPzUr93j0gBsR6Y9Mi5XAg
+7emx26e8/HkRYHG7nuoqU0wiV4/BiW90O5ALBZS7nLOHTqLm6dMhQyL76GlHcu3s
+6xlt10400eVSgYi3/pPe7eU6KV0Bxs54Cg19e+h2VTLUqYcpOGer1pTU+0Bnqer5
+wolUfm/5fmwkq6AOO3Aoj+5E33AxXFjAeSKbU6/Mq+DATnZSRGr3DM5Vi4G4TYIN
+P/mw1PTue1qXsrwU4l/BJSipsSturNChs7PLXaqVElmwiZqaq1LVEzhFBxN2iLRd
+pZwMKFPrrYDo2nGDCA4tER4AXvH9E5NO0q5iuR0ONY8g3hV73wZQZjFb6JssXzr6
+dudF1AHWgvAVT2V+/xjgkPnkYJqh0yWhfOhJMxEy5Id1fa9CriiSWS/MQtKM2KuX
+Wy0aLYqPAtOM5CHFeISThdN0+P3JzVniWd9ucDZMFFCMqHCWnLvSYj9ATYjfYc4v
+Sz6GiCYx18rjMYYPGA75VyAxE6S367zLc0ZiAW0F29o0EEMrZEAbGexBL8Yt9WFt
+Tn8ejgQuIIzZXDzzDS9ItLrYtT05N6G2iBxlnncgFYczXuxU1yUkZoNfnhcbmsV9
+cQxF8oa8fNR3qd9tipSGzxCUgKa13WqshuOXAfEKFpu8FUDgEVE=
+=GFJR
+-----END PGP SIGNATURE-----
--- a/i3-4.24.tar.xz
+++ b/i3-4.24.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5baefd0e5e78f1bafb7ac85deea42bcd3cbfe65f1279aa96f7e49661637ac981
+size 1358292
--- a/i3-4.24.tar.xz.asc
+++ b/i3-4.24.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEQk4U1wPnxtQ9nW82TnFg7UrI7h0FAmcrpvEACgkQTnFg7UrI
+7h2TBA/+IDUW3BU1+KzrzFnQaTfuM6yeZklkbt5wYJ4WTHcRSKkKvqbe0OJH9sM6
+MjV4oR/sHfM+ckFH7/egWwf8PSG92Nuc4LbUHdaf4aW2o+LoDn7h98nYKrqVYXnP
+lFQLOJ6PO9KxmNyozwaslTHxijxkQxK1ucSk5gZL19HGwSthU6EXr2R/F33dRqlA
+qspxEBS9ZCtLD6wqhHSatKOI1A209vlGSWLX05al9izL8IT0MNKQR9D1HGPSYzhd
+yN9AM8KelUUUfwqotc67eYbpk3x19GTd8UX27FPMQ3ieZ16VFbmUqYD7Jlb+2BsO
+Dlvu0KIBjRz2YviM8KNJPAQeN6lb4w53/+NjFjI8+7Fq+5bGDmivkP6JrLQCA6nW
+aVh+st3inRfwUHWNL0WM+j/GODfPxYSQ0DMpHSD4ip3nLq2BLFwptw91d5skw24c
+gLO90DoCYos/0n1laZPtQFlwm5blsnqzIret0XtppuTZYfKL5rBFGO3IPAtMvo3N
+hTpLWi57bw3EphHz3Nq2W0kijPqV0V4jtTz9EAast/be3JpyW1H3dZnvDssxxwMf
+8ek3hfaGwyCWyDdPKLVPrdw67+v8F6C3IIhddRDrDwNuASNkQxrttJgzz8M5oHb2
+M/xdVEQJHgNaCoBmowNK5SZv7TwCX8DRX7cnBn8xIxWspGKfzlI=
+=V8vQ
+-----END PGP SIGNATURE-----
--- a/i3-desktop_file_valid.patch
+++ b/i3-desktop_file_valid.patch
@ -0,0 +1,16 @@
+Index: i3-4.13/share/applications/i3.desktop
+===================================================================
+--- i3-4.13.orig/share/applications/i3.desktop
+++ i3-4.13/share/applications/i3.desktop
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+Encoding=UTF-8
+ Type=Application
+ Name=i3
+ NoDisplay=true
+ GenericName=A dynamic tiling window manager
+ Comment=improved dynamic tiling window manager
+Icon=i3
+ Exec=i3
+ X-GNOME-WMName=i3
+ X-GNOME-Autostart-Phase=WindowManager
--- a/i3.changes
+++ b/i3.changes
--- a/i3.keyring
+++ b/i3.keyring
--- a/i3.png
+++ b/i3.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ca4a5347714b465e7402265a537ef6c6fb78b2bb250f717fb0e2368ba1fb5aa
+size 20484
--- a/i3.spec
+++ b/i3.spec
@ -0,0 +1,135 @@
+#
+# spec file for package i3
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           i3
+Version:        4.24
+Release:        0
+Summary:        Tiling window manager
+License:        BSD-3-Clause
+Group:          System/GUI/Other
+URL:            https://i3wm.org/
+Source0:        https://i3wm.org/downloads/%{name}-%{version}.tar.xz
+Source1:        %{name}.png
+Source2:        %{name}.keyring
+Source3:        https://i3wm.org/downloads/%{name}-%{version}.tar.xz.asc
+Patch1:         i3-desktop_file_valid.patch
+# PATCH-FIX-UPSTREAM handle-netwm-wm-type-desktop.patch - from PR 1828
+Patch2:         0001-Ignoring-desktop-windows-and-moving-them-on-the-bott.patch
+BuildRequires:  asciidoc
+BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  libyajl-devel
+BuildRequires:  meson
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
+BuildRequires:  xmlto
+BuildRequires:  pkgconfig(cairo) >= 1.14.4
+BuildRequires:  pkgconfig(libev)
+BuildRequires:  pkgconfig(libpcre2-8) >= 10
+BuildRequires:  pkgconfig(libstartup-notification-1.0)
+BuildRequires:  pkgconfig(pangocairo)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-cursor)
+BuildRequires:  pkgconfig(xcb-event)
+BuildRequires:  pkgconfig(xcb-icccm)
+BuildRequires:  pkgconfig(xcb-keysyms)
+BuildRequires:  pkgconfig(xcb-randr)
+BuildRequires:  pkgconfig(xcb-util)
+BuildRequires:  pkgconfig(xcb-xinerama)
+BuildRequires:  pkgconfig(xcb-xkb)
+BuildRequires:  pkgconfig(xcb-xrm)
+BuildRequires:  pkgconfig(xkbcommon-x11)
+# Required for i3-save-tree.
+Requires:       perl-AnyEvent-I3
+Recommends:     dmenu
+Recommends:     i3lock
+Recommends:     i3status
+Recommends:     xorg-x11-server
+Provides:       windowmanager
+# Since 4.22, gaps are merged
+Obsoletes:      i3-gaps < 4.19.1
+# Upstream First - Policy:
+# Never add any patches to this package without the upstream commit id
+# in the patch. Any patches added here without a very good reason to make
+# an exception will be silently removed with the next version update.
+
+%description
+i3 is a tiling window manager for X11. It supports tiling, stacking,
+and tabbing layouts, which it handles dynamically. Configuration is
+achieved via plain text file and extending i3 is possible using its
+Unix domain socket and JSON based IPC interface.
+
+%package devel
+Summary:        Development headers for i3
+Group:          Development/Libraries/C and C++
+Requires:       %{name}
+BuildArch:      noarch
+
+%description devel
+Development headers for the i3 window manager.
+
+%prep
+%autosetup -p1
+
+# fix rpmlint E: env-script-interpreter
+sed -i 's,^#!/usr/bin/env ,#!/usr/bin/,' i3-dmenu-desktop i3-migrate-config-to-v4 i3-save-tree
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
+install -D -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%{name}.png
+
+%files
+%license LICENSE
+%doc RELEASE-NOTES-%{version}
+%{_mandir}/man1/i3*.1%{?ext_man}
+%{_bindir}/i3
+%{_bindir}/i3-dump-log
+%{_bindir}/i3-with-shmlog
+%{_bindir}/i3bar
+%{_bindir}/i3-config-wizard
+%{_bindir}/i3-dmenu-desktop
+%{_bindir}/i3-input
+%{_bindir}/i3-migrate-config-to-v4
+%{_bindir}/i3-msg
+%{_bindir}/i3-nagbar
+%{_bindir}/i3-save-tree
+%{_bindir}/i3-sensible-editor
+%{_bindir}/i3-sensible-pager
+%{_bindir}/i3-sensible-terminal
+%dir %{_sysconfdir}/i3/
+%config %{_sysconfdir}/i3/config
+%config %{_sysconfdir}/i3/config.keycodes
+%{_datadir}/xsessions/i3.desktop
+%{_datadir}/xsessions/i3-with-shmlog.desktop
+%{_datadir}/applications/i3.desktop
+%{_datadir}/pixmaps/i3.png
+%{_datadir}/doc/i3/refcard_style.css
+%{_datadir}/doc/i3/*.png
+
+%files devel
+%dir %{_includedir}/i3/
+%dir %{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/%{name}/*.html
+%{_includedir}/i3/ipc.h
+
+%changelog