From f37cbd892db45b858a9a876c3aea2f007803b7e1 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Jul 2013 01:37:35 -0700 Subject: Sat Jul 6 01:36:25 PDT 2013 --- community/openbox/PKGBUILD | 70 +++++++++++----------- community/openbox/movesize.patch | 19 ------ ...5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch | 28 +++++++++ .../openbox/openbox-3.5.0-title-matching.patch | 11 ++++ community/openbox/openbox-3.5.0-which-2.20.patch | 11 ++++ community/openbox/openbox.install | 4 -- community/openbox/title-matching.patch | 11 ---- community/openbox/which-2.20.patch | 11 ---- 8 files changed, 86 insertions(+), 79 deletions(-) delete mode 100644 community/openbox/movesize.patch create mode 100644 community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch create mode 100644 community/openbox/openbox-3.5.0-title-matching.patch create mode 100644 community/openbox/openbox-3.5.0-which-2.20.patch delete mode 100644 community/openbox/openbox.install delete mode 100644 community/openbox/title-matching.patch delete mode 100644 community/openbox/which-2.20.patch (limited to 'community/openbox') diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index 47e6573b4..2443d6e7c 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70588 2012-05-12 09:12:54Z bpiotrowski $ +# $Id: PKGBUILD 93576 2013-07-05 19:21:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Andrea Scarpino @@ -6,52 +6,54 @@ pkgname=openbox pkgver=3.5.0 -pkgrel=7 -pkgdesc="A highly configurable and lightweight X11 window manager" +pkgrel=8 +pkgdesc='Highly configurable and lightweight X11 window manager' arch=('i686' 'x86_64') -url="http://openbox.org" +url='http://openbox.org' license=('GPL') depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' 'libxcursor' 'pango' 'imlib2') -optdepends=('pyxdg: for the xdg-autostart script') +optdepends=('python2: for the xdg-autostart script') groups=('lxde') -install=${pkgname}.install options=('!libtool') backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml') -source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz - which-2.20.patch - movesize.patch - title-matching.patch) +source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz + openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch + openbox-3.5.0-title-matching.patch + openbox-3.5.0-which-2.20.patch) md5sums=('00441b53cf14c03566c8e82643544ff9' - '7ca3b5244bb092d46f5bcf1e2bdf4a18' - 'e09d77842aac9a0cd7eebe112df88383' - '6f99711eee0b1c413dca9fa691917b71') + 'f2e5198a9dfc803c59fd42448a85f2da' + '0a11d7149da210a31ef88f8a9c717711' + '7ca3b5244bb092d46f5bcf1e2bdf4a18') -build() { - cd "${srcdir}"/${pkgname}-${pkgver} +prepare() { + cd $pkgname-$pkgver + + patch -Np1 -i "$srcdir"/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812 + patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277 + patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455 - patch -Np1 -i "${srcdir}"/which-2.20.patch # FS#11455 - patch -Np1 -i "${srcdir}"/movesize.patch # FS#29812 - patch -Np0 -i "${srcdir}"/title-matching.patch # FS#5277 on Openbox bugtracker + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + data/autostart/openbox-xdg-autostart +} - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - data/autostart/openbox-xdg-autostart - - ./configure --prefix=/usr \ - --with-x \ - --enable-startup-notification \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/openbox - - make +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --with-x \ + --enable-startup-notification \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/openbox + make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control} - sed -i "s:startkde:/usr/bin/\0:" \ - "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop - sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \ - "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop + sed -i 's:startkde:/usr/bin/\0:' \ + "$pkgdir"/usr/share/xsessions/openbox-kde.desktop + sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \ + "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop } diff --git a/community/openbox/movesize.patch b/community/openbox/movesize.patch deleted file mode 100644 index 4f0e8595e..000000000 --- a/community/openbox/movesize.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- openbox-3.5.0/openbox/moveresize.c.orig 2011-08-01 21:14:58.000000000 +0100 -+++ openbox-3.5.0/openbox/moveresize.c 2012-03-28 20:04:36.100459920 +0100 -@@ -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 ! diff --git a/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch new file mode 100644 index 000000000..174482da4 --- /dev/null +++ b/community/openbox/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 +--- 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/community/openbox/openbox-3.5.0-title-matching.patch b/community/openbox/openbox-3.5.0-title-matching.patch new file mode 100644 index 000000000..fdfe28af0 --- /dev/null +++ b/community/openbox/openbox-3.5.0-title-matching.patch @@ -0,0 +1,11 @@ +--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200 ++++ openbox-3.5.0/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/community/openbox/openbox-3.5.0-which-2.20.patch b/community/openbox/openbox-3.5.0-which-2.20.patch new file mode 100644 index 000000000..f947d6a98 --- /dev/null +++ b/community/openbox/openbox-3.5.0-which-2.20.patch @@ -0,0 +1,11 @@ +--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 ++++ openbox-3.5.0/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/community/openbox/openbox.install b/community/openbox/openbox.install deleted file mode 100644 index 762a3ef14..000000000 --- a/community/openbox/openbox.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Place menu.xml, rc.xml and autostart in ~/.config/openbox" - echo "They can be found in /etc/xdg/openbox" -} diff --git a/community/openbox/title-matching.patch b/community/openbox/title-matching.patch deleted file mode 100644 index 88ed73546..000000000 --- a/community/openbox/title-matching.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch deleted file mode 100644 index f947d6a98..000000000 --- a/community/openbox/which-2.20.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 -+++ openbox-3.5.0/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 - -- cgit v1.2.3-54-g00ecf