From f44ed8385a015ec5ba348026cc0577554ec74647 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 9 Nov 2012 09:49:19 -0600
Subject: fluxbox: 1.3.2 note 1.3.1 doesn't compile on 64 bit

---
 abs/core/fluxbox/PKGBUILD                       | 27 ++++++-----------
 abs/core/fluxbox/__changelog                    |  3 --
 abs/core/fluxbox/fluxbox.install                | 11 -------
 abs/core/fluxbox/fluxbox_fullscreen_focus.patch | 12 --------
 abs/core/fluxbox/keys                           | 40 -------------------------
 5 files changed, 9 insertions(+), 84 deletions(-)
 delete mode 100644 abs/core/fluxbox/__changelog
 delete mode 100644 abs/core/fluxbox/fluxbox.install
 delete mode 100644 abs/core/fluxbox/fluxbox_fullscreen_focus.patch
 delete mode 100644 abs/core/fluxbox/keys

diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD
index abe2c8a..45db54a 100644
--- a/abs/core/fluxbox/PKGBUILD
+++ b/abs/core/fluxbox/PKGBUILD
@@ -1,29 +1,25 @@
-# $Id$
+# $Id: PKGBUILD 141366 2011-10-30 03:08:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.3.1
-pkgrel=7
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
 license=('MIT')
-depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi' 
-'LinHES-system>=2-52')
-makedepends=('pkg-config')
+depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi')
 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_fullscreen_focus.patch)
-#install=fluxbox.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+        fluxbox.desktop)
+sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c'
+          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 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-xft --enable-xinerama \
     --enable-imlib2 --enable-nls
   make
 }
@@ -32,10 +28,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
-  install -D -m644 ../keys ${pkgdir}/usr/share/$pkgname/keys || return 1
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('0eaa940a69c0a876a520bb85d67b8bec'
-         'eeae9c88a2526ac0bd8afcd9ce97f9ed'
-         'c6d548dbefd76bad117db23bdf927bcd'
-         '7d2fff845c9f951e925b9adcd1053242')
diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog
deleted file mode 100644
index 7ea4e0d..0000000
--- a/abs/core/fluxbox/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-2/22/11 - chw - Added keys file.
-2/23/11 - chw - Added fullscreen patch.
-8/21/11 - brf - Updated fullscreen patch for v1.3.1
diff --git a/abs/core/fluxbox/fluxbox.install b/abs/core/fluxbox/fluxbox.install
deleted file mode 100644
index 8c4ae87..0000000
--- a/abs/core/fluxbox/fluxbox.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-   if [  -e $MYTHHOME/.fluxbox/keys ]
-   then
-    mv -f $MYTHHOME/.fluxbox/keys $MYTHHOME/.fluxbox/keys.backup-linhes
-	echo "#########################################"
-	echo "Created backup copy of .fluxbox/keys"
-	echo "fluxbox keys is no longer used for linhes specific shortcuts"
-	echo "if there were custom user keys, they will need to be restored"
-	echo "#########################################"
-   fi
-}
diff --git a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
deleted file mode 100644
index 9197ad5..0000000
--- a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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);
diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys
deleted file mode 100644
index 0871a48..0000000
--- a/abs/core/fluxbox/keys
+++ /dev/null
@@ -1,40 +0,0 @@
-!mouse actions added by fluxbox-update_configs
-OnTitlebar Mouse2 :StartTabbing
-
-!mouse actions added by fluxbox-update_configs
-OnTitlebar Double Mouse1 :Shade
-OnTitlebar Mouse3 :WindowMenu
-
-!mouse actions added by fluxbox-update_configs
-OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
-OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing BottomRight}
-
-OnDesktop Mouse1 :HideMenus
-OnDesktop Mouse2 :WorkspaceMenu
-OnDesktop Mouse3 :RootMenu
-OnDesktop Mouse4 :NextWorkspace
-OnDesktop Mouse5 :PrevWorkspace
-
-Mod1 Tab :NextWindow
-Mod1 Shift Tab :PrevWindow
-Mod1 F1 :Workspace 1
-Mod1 F2 :Workspace 2
-Mod1 F3 :Workspace 3
-Mod1 F4 :Workspace 4
-Mod1 F5 :Workspace 5
-Mod1 F6 :Workspace 6
-Mod1 F8 :Workspace 8
-Mod1 F9 :Workspace 9
-Mod1 F10 :Workspace 10
-Mod1 F11 :Workspace 11
-Mod1 F12 :Workspace 12
-#Mod1 x :ExecCommand tvterm.sh
-#Mod1 s :ExecCommand mythtv-setup
-#Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start
-#Mod1 1 :ExecCommand sudo sv start mythbackend
-#Mod1 2 :ExecCommand sudo sv stop mythbackend
-#Mod1 3 :ExecCommand sudo sv restart mythbackend
-#Mod1 h :ExecCommand MythVantage -H
-#Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh 
-Mod1 Escape :GotoWindow {1}
-Mod4 w :Restart wmaker
-- 
cgit v0.12

