From af799131a6ea4320dfb1239e5f9e15249587aa82 Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@openbsd.org>
Date: Tue, 23 Oct 2012 14:30:56 +0000
Subject: [PATCH] Little fix for openbox:

https://bugs.launchpad.net/ubuntu/+source/openbox/+bug/997212

Based on this:

https://launchpadlibrarian.net/104666437/50_gtk43bugfix.patch

Reported by Nicolas Pence. Thanks!

Ok benoit@ (maintainer)
---
 x11/openbox/Makefile                          | 11 +++++-----
 x11/openbox/distinfo                          |  3 ---
 .../patches/patch-openbox_moveresize_c        | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 x11/openbox/patches/patch-openbox_moveresize_c

diff --git a/x11/openbox/Makefile b/x11/openbox/Makefile
index be87bf20fce..0cf6ccc98b0 100644
--- a/x11/openbox/Makefile
+++ b/x11/openbox/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.66 2012/06/20 21:34:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.67 2012/10/23 14:30:56 gonzalo Exp $
 
 COMMENT =	small, fast & usable window manager
 
 V =		3.5.0
 DISTNAME =	openbox-${V}
-REVISION =	1
+REVISION =	2
 SHARED_LIBS +=  obt                  0.0      # 0.1
 SHARED_LIBS +=  obrender             10.0      # 27.1
 
@@ -22,9 +22,10 @@ PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB += ICE Imlib2 SM X11 X11-xcb Xau Xcursor Xext Xfixes Xft
 WANTLIB += Xinerama Xrandr Xrender c expat ffi fontconfig freetype
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0
-WANTLIB += pangoft2-1.0 pangoxft-1.0 pcre pthread startup-notification-1
-WANTLIB += xcb xcb-aux xml2 z
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 harfbuzz
+WANTLIB += icudata icule icuuc m pango-1.0 pangoft2-1.0 pangoxft-1.0
+WANTLIB += pcre pthread startup-notification-1 xcb xcb-aux xml2
+WANTLIB += z
 
 MASTER_SITES =	${HOMEPAGE}dist/openbox/
 
diff --git a/x11/openbox/distinfo b/x11/openbox/distinfo
index f76a55b3cb7..3439f04f1e2 100644
--- a/x11/openbox/distinfo
+++ b/x11/openbox/distinfo
@@ -1,5 +1,2 @@
-MD5 (openbox-3.5.0.tar.gz) = AEQbU88UwDVmyOgmQ1RP+Q==
-RMD160 (openbox-3.5.0.tar.gz) = r3ml6LEfNgWp05Bu1iVs5BAu/9U=
-SHA1 (openbox-3.5.0.tar.gz) = PDuNK8T04imHElTpLWsYY5vgAwI=
 SHA256 (openbox-3.5.0.tar.gz) = b6kAFlMLOqYQLiVAeUYZd0OTmFMfsj5+wHb/LBQP6go=
 SIZE (openbox-3.5.0.tar.gz) = 911834
diff --git a/x11/openbox/patches/patch-openbox_moveresize_c b/x11/openbox/patches/patch-openbox_moveresize_c
new file mode 100644
index 00000000000..ca9d645f093
--- /dev/null
+++ b/x11/openbox/patches/patch-openbox_moveresize_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-openbox_moveresize_c,v 1.1 2012/10/23 14:30:56 gonzalo Exp $
+--- openbox/moveresize.c.orig	Wed Oct 10 17:27:34 2012
++++ openbox/moveresize.c	Wed Oct 10 17:29:12 2012
+@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel)
+ #endif
+     }
+ 
++	if (!moveresize_client) {
++		ob_debug("moveresize_end: moveresize_client is NULL!");
++		return;
++	}
++
++	if (!moveresize_in_progress) {
++		ob_debug("moveresize_end: moveresize_in_progress is FALSE!");
++		return;
++	}
++
+     /* don't use client_move() here, use the same width/height as
+        we've been using during the move, otherwise we get different results
+        when moving maximized windows between monitors of different sizes !