From 18e7d8b2d8837caed0e4fc3c407a574c4f5344a1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 12 Aug 2013 09:04:04 +0200 Subject: [PATCH] openbox: update to 3.5.2 (soname bumps). --- common/shlibs | 4 +-- ...ix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch | 28 ------------------- srcpkgs/openbox/template | 19 ++++++++++--- 3 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch diff --git a/common/shlibs b/common/shlibs index d4ce7a7b71e..997585e531c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -940,8 +940,8 @@ libmdbsql.so.0 libmdb-0.5_1 libkmod.so.2 libkmod-5_1 libestr.so.0 libestr-0.1.2_1 libee.so.0 libee-0.3.2_1 -libobt.so.0 libopenbox-3.5.0_1 -libobrender.so.27 libopenbox-3.5.0_1 +libobt.so.2 libopenbox-3.5.2_1 +libobrender.so.29 libopenbox-3.5.2_1 libgssglue.so.1 libgssglue-0.3_1 libtirpc.so.1 libtirpc-0.2.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 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 deleted file mode 100644 index dda2311e08e..00000000000 --- a/srcpkgs/openbox/patches/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/template b/srcpkgs/openbox/template index 9c1f2ed75b5..6ba4cca9cde 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -1,18 +1,18 @@ # Template file for 'openbox' pkgname=openbox -version=3.5.0 -revision=4 +version=3.5.2 +revision=1 build_style=gnu-configure configure_args="--enable-startup-notification" hostmakedepends="pkg-config" makedepends="startup-notification-devel libxml2-devel libXrandr-devel - libXcursor-devel libXinerama-devel imlib2-devel pango-devel" + libXcursor-devel libXinerama-devel libSM-devel imlib2-devel pango-devel" short_desc="Standards compliant, fast, light-weight, extensible window manager" maintainer="Juan RP " license="GPL-2" homepage="http://www.openbox.org" distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz" -checksum=6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a +checksum=128fb4ef11f83f6edb1685cfc04f44a16a5322082fc519f9d7cac84fc658af33 long_desc=" Openbox works with your applications, and makes your desktop easier to manage. This is because the approach to its development was the opposite of @@ -34,6 +34,17 @@ long_desc=" * Multi-head Xinerama support! * Pipe menus" +# Package build options +build_options="svg" +desc_option_svg="Enable support for SVG icons" + +if [ "$build_option_svg" ]; then + configure_args+=" --enable-librsvg" + makedepends+=" librsvg-devel" +else + configure_args+=" --disable-librsvg" +fi + post_install() { rm ${DESTDIR}/usr/bin/{gdm-control,gnome-panel-control}