On Tue 2018-01-02 09:33:46 +0100, Martin Bagge / brother wrote:
> this issue is real. downgrading to 3.6.1-4 solves the error at hand.
> that patch should be reversed and if needed reimplemented to not break
> other stuff.

i've just uploaded openbox 3.6.1-5.1 as an NMU with the patch from Bing Xia.
A debdiff is attached.

     --dkg

diff --git a/debian/changelog b/debian/changelog
index 9e1772e..6dc85a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openbox (3.6.1-5.1) unstable; urgency=medium
+
+  [ Daniel Kahn Gillmor ]
+  * Non-maintainer upload
+
+  [ Bing Xia ]
+  * fix maximize/restore vertical or horizontal only (Closes: #873480)
+
+ -- Daniel Kahn Gillmor <d...@fifthhorseman.net>  Tue, 02 Jan 2018 11:53:06 -0500
+
 openbox (3.6.1-5) unstable; urgency=medium
 
   [ Mateusz Łukasik ]
diff --git a/debian/patches/873480_fix_restore-horz-vert.patch b/debian/patches/873480_fix_restore-horz-vert.patch
new file mode 100644
index 0000000..9be8236
--- /dev/null
+++ b/debian/patches/873480_fix_restore-horz-vert.patch
@@ -0,0 +1,21 @@
+Description: Re-enable horizontal and vertical maximization/restore
+Author: Bing Xia <darkeyes.onl...@gmail.com>
+Bug-Debian: https://bugs.debian.org/873480
+
+--- a/openbox/client.c
++++ b/openbox/client.c
+@@ -3522,11 +3522,11 @@
+         }
+     }
+ 
+-    if (dir == 0)
+-    {
++    // need them to restore from both one directional and full maximization
++    if (dir == 0 || dir == 1) /* horz */
+         self->max_horz = max;
++    if (dir == 0 || dir == 2) /* vert */
+         self->max_vert = max;
+-    }
+ 
+     if (max) {
+         /* make sure the window is on some monitor */
diff --git a/debian/patches/series b/debian/patches/series
index ad9fb6a..1c3da51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ rpi/79b77e78cf141cc8a7111c9e4e26842bad092d17.patch
 rpi/de67618ea9e3e22e7623d56530934d3a3fc272e0.patch
 adapt-to-gsd-324.patch
 843231.patch
+873480_fix_restore-horz-vert.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to