Bug#778465: unblock: i3-wm/4.8-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package i3-wm
4.8-2 (which I have just uploaded) contains two backported bugfixes from
upstream to address the serious issues #778460 and #778461. Both bugfixes are
well-tested for many weeks and address common problems that users report over
and over. Having them in the next stable release would be a great service to
our users.
debdiff:
diff -Nru i3-wm-4.8/debian/changelog i3-wm-4.8/debian/changelog
--- i3-wm-4.8/debian/changelog 2014-06-15 19:21:51.000000000 +0200
+++ i3-wm-4.8/debian/changelog 2015-02-15 13:24:57.000000000 +0100
@@ -1,3 +1,11 @@
+i3-wm (4.8-2) unstable; urgency=medium
+
+ * Backport two bugfixes:
+ - backport-dpi-fix.patch (Closes: #778460)
+ - backport-i3bar-tray-fix.patch (Closes: #778461)
+
+ -- Michael Stapelberg <stapelberg@debian.org> Sun, 15 Feb 2015 13:24:42 +0100
+
i3-wm (4.8-1) unstable; urgency=medium
* New upstream release.
diff -Nru i3-wm-4.8/debian/patches/backport-dpi-fix.patch i3-wm-4.8/debian/patches/backport-dpi-fix.patch
--- i3-wm-4.8/debian/patches/backport-dpi-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ i3-wm-4.8/debian/patches/backport-dpi-fix.patch 2015-02-15 13:22:18.000000000 +0100
@@ -0,0 +1,25 @@
+Description: Treat everything up to 120 dpi as 96 dpi
+Author: Michael Stapelberg <michael@stapelberg.de>
+Origin: https://github.com/i3/i3/commit/33d1d5d3c61a2136eb4b42ffd29870fd68d2d766
+Last-Update: 2015-02-15
+
+---
+
+Index: i3-wm-4.8/libi3/dpi.c
+===================================================================
+--- i3-wm-4.8.orig/libi3/dpi.c
++++ i3-wm-4.8/libi3/dpi.c
+@@ -12,5 +12,13 @@ extern xcb_screen_t *root_screen;
+ int logical_px(const int logical) {
+ const int dpi = (double)root_screen->height_in_pixels * 25.4 /
+ (double)root_screen->height_in_millimeters;
++ /* There are many misconfigurations out there, i.e. systems with screens
++ * whose dpi is in fact higher than 96 dpi, but not significantly higher,
++ * so software was never adapted. We could tell people to reconfigure their
++ * systems to 96 dpi in order to get the behavior they expect/are used to,
++ * but since we can easily detect this case in code, let’s do it for them.
++ */
++ if ((dpi / 96.0) < 1.25)
++ return logical;
+ return ceil((dpi / 96.0) * logical);
+ }
diff -Nru i3-wm-4.8/debian/patches/backport-i3bar-tray-fix.patch i3-wm-4.8/debian/patches/backport-i3bar-tray-fix.patch
--- i3-wm-4.8/debian/patches/backport-i3bar-tray-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ i3-wm-4.8/debian/patches/backport-i3bar-tray-fix.patch 2015-02-15 13:23:19.000000000 +0100
@@ -0,0 +1,25 @@
+Description: add a sync call to i3bar to confirm reparents before exiting
+ Without this call, sometimes the tray icon windows are reparented into
+ i3’s container around the i3bar window, i.e. into the next remaining
+ window in the window hierarchy. Since i3 then closes that container
+ (since the i3bar window itself was closed), the tray window will also
+ get closed. In general, this weird interaction (getting reparented and
+ then closed) is not well received by tray icon providers :).
+Author: Michael Stapelberg <michael@stapelberg.de>
+Origin: https://github.com/i3/i3/commit/4699c714b33afb1c264f3d19911b880267165b94
+Last-Update: 2015-02-15
+
+---
+
+Index: i3-wm-4.8/i3bar/src/xcb.c
+===================================================================
+--- i3-wm-4.8.orig/i3bar/src/xcb.c
++++ i3-wm-4.8/i3bar/src/xcb.c
+@@ -1290,6 +1290,7 @@ void clean_xcb(void) {
+ FREE(outputs);
+
+ xcb_flush(xcb_connection);
++ xcb_aux_sync(xcb_connection);
+ xcb_disconnect(xcb_connection);
+
+ ev_check_stop(main_loop, xcb_chk);
diff -Nru i3-wm-4.8/debian/patches/series i3-wm-4.8/debian/patches/series
--- i3-wm-4.8/debian/patches/series 2014-06-15 19:16:10.000000000 +0200
+++ i3-wm-4.8/debian/patches/series 2015-02-15 13:19:12.000000000 +0100
@@ -1,2 +1,4 @@
use-x-terminal-emulator.patch
manpage-x-terminal-emulator.patch
+backport-i3bar-tray-fix.patch
+backport-dpi-fix.patch
unblock i3-wm/4.8-2
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (990, 'testing'), (600, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: