diff options
| author | Britney Fransen <brfransen@gmail.com> | 2011-08-22 04:05:20 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2011-08-22 04:05:20 (GMT) |
| commit | ef7f11ce4d15098ffa32c363cf3c33ec70d722e9 (patch) | |
| tree | 30eb983ddc0777dd9100dd570f4ad14159efd97d /abs/core | |
| parent | 92c844fb9391447c2d2d8f95be9b62c4c080961d (diff) | |
| download | linhes_pkgbuild-ef7f11ce4d15098ffa32c363cf3c33ec70d722e9.zip linhes_pkgbuild-ef7f11ce4d15098ffa32c363cf3c33ec70d722e9.tar.gz linhes_pkgbuild-ef7f11ce4d15098ffa32c363cf3c33ec70d722e9.tar.bz2 | |
fluxbox: Update fullscreen patch
Diffstat (limited to 'abs/core')
| -rw-r--r-- | abs/core/fluxbox/PKGBUILD | 10 | ||||
| -rw-r--r-- | abs/core/fluxbox/__changelog | 2 | ||||
| -rw-r--r-- | abs/core/fluxbox/fluxbox_fullscreen_focus.patch | 27 |
3 files changed, 20 insertions, 19 deletions
diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD index bd6d497..4ca4e8a 100644 --- a/abs/core/fluxbox/PKGBUILD +++ b/abs/core/fluxbox/PKGBUILD @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -13,10 +13,13 @@ makedepends=('pkg-config') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - fluxbox.desktop keys) + fluxbox.desktop keys fluxbox_fullscreen_focus.patch) build() { cd "${srcdir}/${pkgname}-${pkgver}" + echo "Patching fluxbox" + patch -p0 < $srcdir/fluxbox_fullscreen_focus.patch || return 1 + echo "Building fluxbox" ./configure --prefix=/usr \ --enable-gnome --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls @@ -32,4 +35,5 @@ package() { } md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - 'd201812779a3e66c81b9ca753af39396') + 'd201812779a3e66c81b9ca753af39396' + '7d2fff845c9f951e925b9adcd1053242') diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog index 57b62e9..7ea4e0d 100644 --- a/abs/core/fluxbox/__changelog +++ b/abs/core/fluxbox/__changelog @@ -1,3 +1,3 @@ 2/22/11 - chw - Added keys file. 2/23/11 - chw - Added fullscreen patch. -8/21/11 - brf - Removed fullscreen patch; Not needed for v1.3.1 +8/21/11 - brf - Updated fullscreen patch for v1.3.1 diff --git a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch index 0e792dd..9197ad5 100644 --- a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch +++ b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch @@ -1,15 +1,12 @@ ---- /dev/null -+++ b/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch -@@ -0,0 +1,12 @@ -+--- src/Window.cc.orig 2010-04-12 16:45:00.750585365 -0500 -++++ src/Window.cc 2010-04-12 16:45:38.719755786 -0500 -+@@ -2042,8 +2042,7 @@ -+ FluxboxWindow *cur = FocusControl::focusedFbWindow(); -+ WinClient *client = FocusControl::focusedWindow(); -+ if (ret && cur && getRootTransientFor(&from) != getRootTransientFor(client)) -+- ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) && -+- !cur->isTyping(); -++ ret = !cur->isTyping(); -+ -+ if (!ret) -+ Fluxbox::instance()->attentionHandler().addAttention(from); +--- src/Window.cc.orig 2011-08-22 03:38:28.260387361 +0000 ++++ src/Window.cc 2011-08-22 03:39:37.989821465 +0000 +@@ -2004,8 +2004,7 @@ + FluxboxWindow *cur = FocusControl::focusedFbWindow(); + WinClient *client = FocusControl::focusedWindow(); + if (cur && getRootTransientFor(&from) != getRootTransientFor(client)) +- ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) && +- !cur->isTyping(); ++ ret = !cur->isTyping(); + + if (!ret) + Fluxbox::instance()->attentionHandler().addAttention(from); |