From 27ac8310497ac9f850a2680ee597dcc751ea7213 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 4 Jun 2012 00:57:45 +0200 Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages (#827800) - Make sub-packages for gdm-control and gnome-panel-control (#750056) --- ...ed-NET_WM_MOVERESIZE_CANCEL-messages.patch | 28 +++++++++++ openbox.spec | 46 +++++++++++++++++-- 2 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 openbox-3.5.0-Fix-crash-on-unexpected-NET_WM_MOVERESIZE_CANCEL-messages.patch diff --git a/openbox-3.5.0-Fix-crash-on-unexpected-NET_WM_MOVERESIZE_CANCEL-messages.patch b/openbox-3.5.0-Fix-crash-on-unexpected-NET_WM_MOVERESIZE_CANCEL-messages.patch new file mode 100644 index 0000000..174482d --- /dev/null +++ b/openbox-3.5.0-Fix-crash-on-unexpected-NET_WM_MOVERESIZE_CANCEL-messages.patch @@ -0,0 +1,28 @@ +From 339c19d1b3a7a5139aed8b59bad755ddd0e518ff Mon Sep 17 00:00:00 2001 +From: Mikael Magnusson +Date: Sun, 3 Jun 2012 20:18:48 +0200 +Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages + +gtk+ 3.4 apparently sends these randomly when you select text in a +GtkEntry. This also fixes bug #5460. +--- + openbox/event.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/openbox/event.c b/openbox/event.c +index b9ec1c5..4d091bf 100644 +--- a/openbox/event.c ++++ b/openbox/event.c +@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e) + } + else if ((Atom)e->xclient.data.l[2] == + OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL)) +- moveresize_end(TRUE); ++ if (moveresize_client) ++ moveresize_end(TRUE); + } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) { + gint ograv, x, y, w, h; + +-- +1.7.10 + diff --git a/openbox.spec b/openbox.spec index 3c4c1ba..52edc25 100644 --- a/openbox.spec +++ b/openbox.spec @@ -1,6 +1,6 @@ Name: openbox Version: 3.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -16,6 +16,8 @@ Source6: openbox.gnome-session Patch1: openbox-doubleclick.patch Patch2: openbox-3.4.11.2-gnomesession.patch +# https://github.com/Mikachu/openbox/commit/339c19d1 +Patch3: openbox-3.5.0-Fix-crash-on-unexpected-NET_WM_MOVERESIZE_CANCEL-messages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,12 +79,39 @@ Summary: GNOME integration for %{name} Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} Requires: gnome-session +Requires: gnome-panel-control +Requires: gdm-control %description gnome The %{name}-gnome package contains the files needed for using %{name} inside a GNOME session. +%package -n gnome-panel-control +Summary: Command line utility to control the GNOME panel +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} +Requires: gnome-panel + +%description -n gnome-panel-control +gnome-panel-control can be used to invoke the GNOME panel run or main menu from +the command line. It is originally a helper utility of openbox since +gnome-panel is no longer managing its own key bindings. + + +%package -n gdm-control +Summary: Command line utility to control the GNOME Display Manager +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} +Requires: gnome-panel + +%description -n gdm-control +gdm-control can be used to control the GNOME Display Manager. It can invoke +it's power management functions, shut down and reboot a machine or switch users. +It is originally a helper utility of openbox since gdm lacks control over these +features. + + %package kde Summary: KDE integration for %{name} Group: User Interface/Desktops @@ -98,6 +127,7 @@ KDE session. %setup -q %patch1 -p1 -b .doubleclick %patch2 -p1 -b .gnome +%patch3 -p1 -b .fix-crash %build @@ -170,14 +200,20 @@ rm -rf %{buildroot} %files gnome %defattr(-,root,root,-) -%{_bindir}/gnome-panel-control -%{_bindir}/gdm-control %{_bindir}/%{name}-gnome-session %{_datadir}/xsessions/%{name}-gnome.desktop %{_datadir}/gnome/wm-properties/openbox.desktop %{_datadir}/gnome-session/sessions/gnome-openbox.session %{_mandir}/man1/%{name}-gnome-session*.1* +%files -n gnome-panel-control +%defattr(-,root,root,-) +%{_bindir}/gnome-panel-control + +%files -n gdm-control +%defattr(-,root,root,-) +%{_bindir}/gdm-control + %files kde %defattr(-,root,root,-) %{_bindir}/%{name}-kde-session @@ -192,6 +228,10 @@ rm -rf %{buildroot} %changelog +* Sun Jun 03 2012 Christoph Wickert - 3.5.0-6 +- Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages (#827800) +- Make sub-packages for gdm-control and gnome-panel-control (#750056) + * Fri Mar 30 2012 Miroslav Lichvar - 3.5.0-5 - increase doubleclick timeout (#727995) - fix another crash in xdg-menu (#799663)