From 298e04dcd391ab79cd555518f1a0ccf2b994b183 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 28 Jul 2013 18:23:07 +0200 Subject: [PATCH] openbox: add some patches for bugfixes (Arch). --- ...ix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch | 28 +++++++++++++++++++ .../openbox-3.5.0-title-matching.patch | 11 ++++++++ .../patches/openbox-3.5.0-which-2.20.patch | 11 ++++++++ srcpkgs/openbox/template | 16 +++++++---- 4 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch create mode 100644 srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch create mode 100644 srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch diff --git a/srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch b/srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch new file mode 100644 index 0000000000..dda2311e08 --- /dev/null +++ b/srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.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 +--- openbox/event.c ++++ 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/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch b/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch new file mode 100644 index 0000000000..88ed73546c --- /dev/null +++ b/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch @@ -0,0 +1,11 @@ +--- openbox/client.c 2011-08-01 22:14:58.000000000 +0200 ++++ openbox/client.c 2011-10-22 14:59:56.000000000 +0200 +@@ -883,7 +883,7 @@ + !g_pattern_match(app->role, + strlen(self->role), self->role, NULL)) + match = FALSE; +- else if (app->title && ++ else if (app->title && self->title && + !g_pattern_match(app->title, + strlen(self->title), self->title, NULL)) + match = FALSE; diff --git a/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch b/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch new file mode 100644 index 0000000000..acb5ba357a --- /dev/null +++ b/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch @@ -0,0 +1,11 @@ +--- data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 ++++ data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 +@@ -8,7 +8,7 @@ + # + #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then + # @libexecdir@/gnome-settings-daemon & +-#elif which gnome-settings-daemon >/dev/null; then ++#elif which gnome-settings-daemon >/dev/null 2>&1; then + # gnome-settings-daemon & + #fi + diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index 938425cdd0..9c1f2ed75b 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -1,7 +1,7 @@ # Template file for 'openbox' pkgname=openbox version=3.5.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-startup-notification" hostmakedepends="pkg-config" @@ -35,14 +35,19 @@ long_desc=" * Pipe menus" post_install() { - # Doesn't work with GNOME3. - rm -f ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop + rm ${DESTDIR}/usr/bin/{gdm-control,gnome-panel-control} + + sed -i 's:startkde:/usr/bin/\0:' \ + ${DESTDIR}/usr/share/xsessions/openbox-kde.desktop + sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \ + ${DESTDIR}/usr/share/xsessions/openbox-gnome.desktop } openbox-devel_package() { depends="libopenbox>=${version}" pkg_install() { vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/include vmove usr/lib/pkgconfig } @@ -51,7 +56,7 @@ openbox-devel_package() { libopenbox_package() { short_desc="openbox runtime shared libraries" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } @@ -62,7 +67,6 @@ openbox_package() { /etc/xdg/openbox/environment /etc/xdg/openbox/autostart" pkg_install() { - vmove etc - vmove usr + vmove all } }