diff -Nru i3-wm-4.20/debian/changelog i3-wm-4.20.1/debian/changelog --- i3-wm-4.20/debian/changelog 2021-10-30 14:25:02.000000000 +0000 +++ i3-wm-4.20.1/debian/changelog 2021-12-07 22:02:10.000000000 +0000 @@ -1,3 +1,14 @@ +i3-wm (4.20.1-1) unstable; urgency=medium + + * New upstream version 4.20.1 + * Register as x-session-manager (Closes: #978997) + * Make i3-wm depend on dex (Closes: #999696) + * Make i3-wm depend on i3status + * Drop man-title-fix patch (applied upstream) + * Switch to DH 13 + + -- Jakob Haufe Tue, 07 Dec 2021 22:02:10 +0000 + i3-wm (4.20-1) unstable; urgency=medium * New upstream version 4.20 diff -Nru i3-wm-4.20/debian/compat i3-wm-4.20.1/debian/compat --- i3-wm-4.20/debian/compat 2021-10-21 15:31:36.000000000 +0000 +++ i3-wm-4.20.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru i3-wm-4.20/debian/control i3-wm-4.20.1/debian/control --- i3-wm-4.20/debian/control 2021-10-30 13:59:07.000000000 +0000 +++ i3-wm-4.20.1/debian/control 2021-12-07 21:12:17.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian i3 maintainers Uploaders: Jakob Haufe , Michael Stapelberg -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper-compat (= 13), meson, libx11-dev, libxcb-util0-dev (>= 0.3.8), @@ -38,7 +38,7 @@ Package: i3 Architecture: any Depends: i3-wm (=${binary:Version}), ${misc:Depends} -Recommends: i3lock (>= 2.2), suckless-tools, i3status (>= 2.3), dunst +Recommends: i3lock (>= 2.2), suckless-tools, dunst Description: metapackage (i3 window manager, screen locker, menu, statusbar) This metapackage installs the i3 window manager (i3-wm), the i3lock screen locker, i3status (for system information) and suckless-tools (for dmenu). @@ -46,7 +46,7 @@ Package: i3-wm Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} +Depends: dex, i3status, ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} Provides: x-window-manager Recommends: xfonts-base, fonts-dejavu-core, libanyevent-i3-perl (>= 0.12), libjson-xs-perl, rxvt-unicode | x-terminal-emulator Description: improved dynamic tiling window manager diff -Nru i3-wm-4.20/debian/i3-wm.postinst i3-wm-4.20.1/debian/i3-wm.postinst --- i3-wm-4.20/debian/i3-wm.postinst 1970-01-01 00:00:00.000000000 +0000 +++ i3-wm-4.20.1/debian/i3-wm.postinst 2021-12-07 14:36:27.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/x-session-manager \ + x-session-manager /usr/bin/i3 30 \ + --slave /usr/share/man/man1/x-session-manager.1.gz \ + x-session-manager.1.gz /usr/share/man/man1/i3.1.gz +fi + +#DEBHELPER# diff -Nru i3-wm-4.20/debian/i3-wm.prerm i3-wm-4.20.1/debian/i3-wm.prerm --- i3-wm-4.20/debian/i3-wm.prerm 1970-01-01 00:00:00.000000000 +0000 +++ i3-wm-4.20.1/debian/i3-wm.prerm 2021-12-07 14:36:56.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove x-session-manager /usr/bin/i3 +fi + +#DEBHELPER# diff -Nru i3-wm-4.20/debian/patches/man-title-fix i3-wm-4.20.1/debian/patches/man-title-fix --- i3-wm-4.20/debian/patches/man-title-fix 2021-10-28 07:13:37.000000000 +0000 +++ i3-wm-4.20.1/debian/patches/man-title-fix 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Fix i3-migrate-config-to-v4 man page title -Author: Jakob Haufe -Forwarded: https://github.com/i3/i3/pull/4629 -Applied-Upstream: commit:36f9f8671429427b7cb2ce9fd3fa8a18caf75b5d -Last-Update: 2021-10-27 - ---- i3-wm-4.20.orig/man/i3-migrate-config-to-v4.1 -+++ i3-wm-4.20/man/i3-migrate-config-to-v4.1 -@@ -7,7 +7,7 @@ - .\" Source: i3 4.20 - .\" Language: English - .\" --.TH "I3\-MIGRATE\-CONFIG\" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" -+.TH "I3\-MIGRATE\-CONFIG\-TO\-V4" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/debian/patches/series i3-wm-4.20.1/debian/patches/series --- i3-wm-4.20/debian/patches/series 2021-10-28 07:10:40.000000000 +0000 +++ i3-wm-4.20.1/debian/patches/series 2021-12-07 17:25:17.000000000 +0000 @@ -1,2 +1 @@ fix-perl-interpreter-path -man-title-fix diff -Nru i3-wm-4.20/docs/debugging.html i3-wm-4.20.1/docs/debugging.html --- i3-wm-4.20/docs/debugging.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/debugging.html 2021-11-03 08:23:11.157998600 +0000 @@ -957,7 +957,7 @@ diff -Nru i3-wm-4.20/docs/hacking-howto.html i3-wm-4.20.1/docs/hacking-howto.html --- i3-wm-4.20/docs/hacking-howto.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/hacking-howto.html 2021-11-03 08:23:11.157998600 +0000 @@ -2283,7 +2283,7 @@ diff -Nru i3-wm-4.20/docs/i3bar-protocol.html i3-wm-4.20.1/docs/i3bar-protocol.html --- i3-wm-4.20/docs/i3bar-protocol.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/i3bar-protocol.html 2021-11-03 08:23:11.157998600 +0000 @@ -1221,7 +1221,7 @@ diff -Nru i3-wm-4.20/docs/ipc.html i3-wm-4.20.1/docs/ipc.html --- i3-wm-4.20/docs/ipc.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/ipc.html 2021-11-03 08:23:11.157998600 +0000 @@ -2868,7 +2868,7 @@ diff -Nru i3-wm-4.20/docs/layout-saving.html i3-wm-4.20.1/docs/layout-saving.html --- i3-wm-4.20/docs/layout-saving.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/layout-saving.html 2021-11-03 08:23:11.157998600 +0000 @@ -1016,7 +1016,7 @@ diff -Nru i3-wm-4.20/docs/multi-monitor.html i3-wm-4.20.1/docs/multi-monitor.html --- i3-wm-4.20/docs/multi-monitor.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/multi-monitor.html 2021-11-03 08:23:11.157998600 +0000 @@ -816,7 +816,7 @@ diff -Nru i3-wm-4.20/docs/testsuite.html i3-wm-4.20.1/docs/testsuite.html --- i3-wm-4.20/docs/testsuite.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/testsuite.html 2021-11-03 08:23:11.157998600 +0000 @@ -1469,7 +1469,7 @@ diff -Nru i3-wm-4.20/docs/userguide.html i3-wm-4.20.1/docs/userguide.html --- i3-wm-4.20/docs/userguide.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/userguide.html 2021-11-03 08:23:11.157998600 +0000 @@ -4196,7 +4196,7 @@ diff -Nru i3-wm-4.20/docs/wsbar.html i3-wm-4.20.1/docs/wsbar.html --- i3-wm-4.20/docs/wsbar.html 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/docs/wsbar.html 2021-11-03 08:23:11.157998600 +0000 @@ -844,7 +844,7 @@ diff -Nru i3-wm-4.20/i3bar/src/ipc.c i3-wm-4.20.1/i3bar/src/ipc.c --- i3-wm-4.20/i3bar/src/ipc.c 2021-10-19 06:37:59.899037100 +0000 +++ i3-wm-4.20.1/i3bar/src/ipc.c 2021-11-03 08:23:08.231370400 +0000 @@ -173,6 +173,9 @@ if (a_null != b_null) { return true; } + if (a_null && b_null) { + return false; + } return strcmp(a, b) != 0; } diff -Nru i3-wm-4.20/include/libi3.h i3-wm-4.20.1/include/libi3.h --- i3-wm-4.20/include/libi3.h 2021-10-19 06:37:59.899037100 +0000 +++ i3-wm-4.20.1/include/libi3.h 2021-11-03 08:23:08.231370400 +0000 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff -Nru i3-wm-4.20/man/i3.1 i3-wm-4.20.1/man/i3.1 --- i3-wm-4.20/man/i3.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3 .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3bar.1 i3-wm-4.20.1/man/i3bar.1 --- i3-wm-4.20/man/i3bar.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3bar.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3bar .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3BAR" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3BAR" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-config-wizard.1 i3-wm-4.20.1/man/i3-config-wizard.1 --- i3-wm-4.20/man/i3-config-wizard.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-config-wizard.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-config-wizard .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-CONFIG\-WIZARD" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-CONFIG\-WIZARD" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-dmenu-desktop.1 i3-wm-4.20.1/man/i3-dmenu-desktop.1 --- i3-wm-4.20/man/i3-dmenu-desktop.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-dmenu-desktop.1 2021-11-03 08:23:11.157998600 +0000 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "I3-DMENU-DESKTOP 1" -.TH I3-DMENU-DESKTOP 1 "2021-10-19" "perl v5.34.0" "User Contributed Perl Documentation" +.TH I3-DMENU-DESKTOP 1 "2021-11-03" "perl v5.34.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru i3-wm-4.20/man/i3-dump-log.1 i3-wm-4.20.1/man/i3-dump-log.1 --- i3-wm-4.20/man/i3-dump-log.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-dump-log.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-dump-log .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-DUMP\-LOG" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-DUMP\-LOG" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-input.1 i3-wm-4.20.1/man/i3-input.1 --- i3-wm-4.20/man/i3-input.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-input.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-input .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-INPUT" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-INPUT" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-migrate-config-to-v4.1 i3-wm-4.20.1/man/i3-migrate-config-to-v4.1 --- i3-wm-4.20/man/i3-migrate-config-to-v4.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-migrate-config-to-v4.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-migrate-config-to-v4 .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-MIGRATE\-CONFIG\" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-MIGRATE\-CONFIG\-TO\-V4" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-msg.1 i3-wm-4.20.1/man/i3-msg.1 --- i3-wm-4.20/man/i3-msg.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-msg.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-msg .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-MSG" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-MSG" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -64,7 +64,7 @@ Instead of exiting right after receiving the first subscribed event, wait indefinitely for all of them\&. Can only be used with "\-t subscribe"\&. See the "subscribe" IPC message type below for details\&. .RE .PP -\fB\-q, \-\-raw\fR +\fB\-r, \-\-raw\fR .RS 4 Display the raw JSON reply instead of pretty\-printing errors (for commands) or displaying the top\-level config file contents (for GET_CONFIG)\&. .RE diff -Nru i3-wm-4.20/man/i3-msg.man i3-wm-4.20.1/man/i3-msg.man --- i3-wm-4.20/man/i3-msg.man 2021-10-19 06:37:59.902370500 +0000 +++ i3-wm-4.20.1/man/i3-msg.man 2021-11-03 08:23:08.234703500 +0000 @@ -36,7 +36,7 @@ wait indefinitely for all of them. Can only be used with "-t subscribe". See the "subscribe" IPC message type below for details. -*-q, --raw*:: +*-r, --raw*:: Display the raw JSON reply instead of pretty-printing errors (for commands) or displaying the top-level config file contents (for GET_CONFIG). diff -Nru i3-wm-4.20/man/i3-nagbar.1 i3-wm-4.20.1/man/i3-nagbar.1 --- i3-wm-4.20/man/i3-nagbar.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-nagbar.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-nagbar .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-NAGBAR" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-NAGBAR" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-save-tree.1 i3-wm-4.20.1/man/i3-save-tree.1 --- i3-wm-4.20/man/i3-save-tree.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-save-tree.1 2021-11-03 08:23:11.157998600 +0000 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "I3-SAVE-TREE 1" -.TH I3-SAVE-TREE 1 "2021-10-19" "perl v5.34.0" "User Contributed Perl Documentation" +.TH I3-SAVE-TREE 1 "2021-11-03" "perl v5.34.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru i3-wm-4.20/man/i3-sensible-editor.1 i3-wm-4.20.1/man/i3-sensible-editor.1 --- i3-wm-4.20/man/i3-sensible-editor.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-sensible-editor.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-sensible-editor .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-SENSIBLE\-EDITOR" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-SENSIBLE\-EDITOR" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-sensible-pager.1 i3-wm-4.20.1/man/i3-sensible-pager.1 --- i3-wm-4.20/man/i3-sensible-pager.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-sensible-pager.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-sensible-pager .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-SENSIBLE\-PAGER" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-SENSIBLE\-PAGER" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/man/i3-sensible-terminal.1 i3-wm-4.20.1/man/i3-sensible-terminal.1 --- i3-wm-4.20/man/i3-sensible-terminal.1 2021-10-19 06:38:02.808998300 +0000 +++ i3-wm-4.20.1/man/i3-sensible-terminal.1 2021-11-03 08:23:11.157998600 +0000 @@ -2,12 +2,12 @@ .\" Title: i3-sensible-terminal .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 10/19/2021 +.\" Date: 11/03/2021 .\" Manual: i3 Manual -.\" Source: i3 4.20 +.\" Source: i3 4.20.1 .\" Language: English .\" -.TH "I3\-SENSIBLE\-TERMIN" "1" "10/19/2021" "i3 4\&.20" "i3 Manual" +.TH "I3\-SENSIBLE\-TERMINAL" "1" "11/03/2021" "i3 4\&.20\&.1" "i3 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru i3-wm-4.20/meson.build i3-wm-4.20.1/meson.build --- i3-wm-4.20/meson.build 2021-10-19 06:37:59.902370500 +0000 +++ i3-wm-4.20.1/meson.build 2021-11-03 08:23:08.234703500 +0000 @@ -6,7 +6,7 @@ project( 'i3', 'c', - version: '4.20', + version: '4.20.1', default_options: [ 'c_std=c11', 'warning_level=1', # enable all warnings (-Wall) @@ -63,7 +63,7 @@ sources: vcs_tag( input: config_h_in, output: 'config.h', - fallback: meson.project_version() + ' (2021-10-19)', + fallback: meson.project_version() + ' (2021-11-03)', ) ) @@ -229,6 +229,8 @@ output: '@BASENAME@.1', command: [ xmlto, + '--stringparam', + 'man.th.title.max.length=30', 'man', '-o', '@OUTDIR@', diff -Nru i3-wm-4.20/RELEASE-NOTES-4.20 i3-wm-4.20.1/RELEASE-NOTES-4.20 --- i3-wm-4.20/RELEASE-NOTES-4.20 2021-10-19 06:37:59.882370700 +0000 +++ i3-wm-4.20.1/RELEASE-NOTES-4.20 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ - - ┌──────────────────────────────┐ - │ Release notes for i3 v4.20 │ - └──────────────────────────────┘ - -This is i3 v4.20. This version is considered stable. All users of i3 are -strongly encouraged to upgrade. - -Two long-awaited features have been added: - - 1. You can now use an “include” directive in your i3 config: - https://i3wm.org/docs/userguide.html#include - - 2. You can now enable showing window icons in window titlebars: - https://i3wm.org/docs/userguide.html#title_window_icon - -In case you notice any issues regarding your background/wallpaper, note: - - Some login managers (e.g. gdm) start the X11 server with the -background none - flag. When this flag is set, a background needs to be explicitly set later in - the X11 session, otherwise stale copies of closed windows remain visible on - the X11 root window (symptom looks like “my terminal window is not closing”). - - i3 works around this situation by setting a screenshot as background when - starting. Any background you set before starting i3 (e.g. in your Xsession) or - after starting i3 (e.g. via exec statements in the i3 config) will be visible. - - A downside of this workaround is that if you have any windows already open in - your X11 session, those will be part of the screenshot. - - To fix this issue, starting in v4.20, i3 detects whether the -background none - option is enabled and only then sets a screenshot as background. - - ┌────────────────────────────┐ - │ Changes in i3 v4.20 │ - └────────────────────────────┘ - - • default config: use dex for XDG autostart - • docs/ipc: document scratchpad_state - • ipc: the GET_CONFIG request now returns all included files and their details - • i3-nagbar: position on focused monitor by default - • i3-nagbar: add option to position on primary monitor - • i3bar: use first bar config by default - • i3-dmenu-desktop: ignore duplicate files and directories (fixes crash on NixOS) - • i3-dump-log -f now uses UNIX sockets instead of pthreads. The UNIX socket approach - should be more reliable and also more portable. - • When clicking on a tab, focus its child (like when scrolling), or (if - already focused), focus the tab container (alternatingly). - • Implement the include config directive: - https://i3wm.org/docs/userguide.html#include - • Implement optionally showing window icons in titlebar: - https://i3wm.org/docs/userguide.html#title_window_icon - • Allow for_window to match against WM_CLIENT_MACHINE - • Add %machine placeholder (WM_CLIENT_MACHINE) to title_format - • 'move container|workspace to output': toggle a workspace (or container) - between multiple outputs when multiple output names specified. - • Add 'move container|workspace to output next' - • Add 'all' window matching criterion - • Acquire the WM_Sn selection when starting as required by ICCCM - • Add --replace command line argument to replace an existing WM - • Notify systemd when i3 is ready, allowing other services in a systemd user session - to use i3 as a dependency - - ┌────────────────────────────┐ - │ Bugfixes │ - └────────────────────────────┘ - - • i3bar: properly close file descriptors - • i3bar: properly restart status command after config change - • i3bar: exit with 1 when a wrong command line argument is used - • ipc: return proper signed int for container positions: negative values were - returned as large 32 bits integers - • when initializing new outputs, avoid duplicating workspace numbers - • fix workspaces not moving to assigned output after output becomes available - • fix duplicate bindcode after i3-config-wizard - • fix commented-out rofi call in default i3 config - • clear pixmap before drawing to prevent visual garbage - • fix crash with "layout default" - • send an "output" event on XRandR 1.5 monitor configuration change - - ┌────────────────────────────┐ - │ Thanks! │ - └────────────────────────────┘ - -Thanks for testing, bugfixes, discussions and everything I forgot go out to: - - ajakk, Albert Safin, Anaël Beutot, Antoine Martin, Dmitri Goutnik, ekarpp, - Imran Virani, Ingo Bürk, Isaac Garzon, Ivan Milov, Jay Khandkar, j-jzk, Ken - Gilmer, Kjetil Torgrim Homme, lbonn, Michael Stapelberg, Orestis Floros, Ralph - Gutkowski, Romuald Brunet, tomty89, Tristan Giles, Tudor Brindus, Uli - Schlachter, Vincent Bernat, Vladimir Panteleev - --- Michael Stapelberg, 2021-10-19 diff -Nru i3-wm-4.20/RELEASE-NOTES-4.20.1 i3-wm-4.20.1/RELEASE-NOTES-4.20.1 --- i3-wm-4.20/RELEASE-NOTES-4.20.1 1970-01-01 00:00:00.000000000 +0000 +++ i3-wm-4.20.1/RELEASE-NOTES-4.20.1 2021-11-03 08:23:08.214703800 +0000 @@ -0,0 +1,27 @@ + + ┌──────────────────────────────┐ + │ Release notes for i3 v4.20.1 │ + └──────────────────────────────┘ + +This is i3 v4.20.1. This version is considered stable. All users of i3 are +strongly encouraged to upgrade. + + ┌────────────────────────────┐ + │ Bugfixes │ + └────────────────────────────┘ + + • i3bar: fix crash with multiple monitors + • xmlto: fix broken .TH line by extending title length + • i3-msg: fix --raw short form (-r) in manpage + • libi3: add missing sys/stat.h header + • use getcwd(NULL, 0) instead of GNU extension get_current_dir_name() + + ┌────────────────────────────┐ + │ Thanks! │ + └────────────────────────────┘ + +Thanks for testing, bugfixes, discussions and everything I forgot go out to: + + rvalieris, Jakob Haufe, lycurgus, Baptiste Daroussin + +-- Michael Stapelberg, 2021-11-03 diff -Nru i3-wm-4.20/src/config_parser.c i3-wm-4.20.1/src/config_parser.c --- i3-wm-4.20/src/config_parser.c 2021-10-19 06:37:59.902370500 +0000 +++ i3-wm-4.20.1/src/config_parser.c 2021-11-03 08:23:08.234703500 +0000 @@ -864,7 +864,7 @@ FILE *fstr; char buffer[4096], key[512], value[4096], *continuation = NULL; - char *old_dir = get_current_dir_name(); + char *old_dir = getcwd(NULL, 0); char *dir = NULL; /* dirname(3) might modify the buffer, so make a copy: */ char *dirbuf = sstrdup(f);