summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/fluxbox/PKGBUILD7
-rw-r--r--abs/core/fluxbox/__changelog2
-rw-r--r--abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch10
-rw-r--r--abs/core/fluxbox/fluxbox_fullscreen_focus.patch27
-rw-r--r--abs/core/fluxbox/keys12
-rw-r--r--abs/core/iproute2/PKGBUILD20
6 files changed, 40 insertions, 38 deletions
diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD
index 3873ff1..cb52bed 100644
--- a/abs/core/fluxbox/PKGBUILD
+++ b/abs/core/fluxbox/PKGBUILD
@@ -16,7 +16,6 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkg
fluxbox.desktop keys fluxbox_fullscreen_focus.patch)
build() {
- echo "==> Patching Fluxbox with fullscreen focus patch..."
patch < fluxbox_fullscreen_focus.patch ${srcdir}/${pkgname}-${pkgver}/src/Window.cc || return 1
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr \
@@ -28,10 +27,10 @@ build() {
# this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-(
sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init || return 1
install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1
- install -D -m644 ../keys ${pkgdir}/usr/share/fluxbox/keys || return 1
+ install -D -m644 ../keys ${pkgdir}/usr/share/$pkgname/keys || return 1
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
}
md5sums=('fa9fa8fe9a44f86522de5754f8b285ca'
'eeae9c88a2526ac0bd8afcd9ce97f9ed'
- 'bb9f812c559263b4bf1d722628a11ca8'
- '82dac089f2d42bb9592debc93291846d')
+ 'b2c3340710b15fb82603dd5893bfb92f'
+ 'd4b1195c78ac08ad41a678a424086420')
diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog
new file mode 100644
index 0000000..f3f64c2
--- /dev/null
+++ b/abs/core/fluxbox/__changelog
@@ -0,0 +1,2 @@
+2/22/11 - chw - Added keys file.
+2/23/11 - chw - Added fullscreen patch.
diff --git a/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch b/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch
deleted file mode 100644
index 2e7db28..0000000
--- a/abs/core/fluxbox/fluxbox-1.0.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fluxbox-1.0.0-orig/src/main.cc 2007-08-11 14:22:20.000000000 -0400
-+++ fluxbox-1.0.0/src/main.cc 2008-05-05 15:14:59.000000000 -0400
-@@ -49,6 +49,7 @@
- #include <fstream>
- #include <stdexcept>
- #include <typeinfo>
-+#include <cstring>
-
- using std::cout;
- using std::cerr;
diff --git a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
index 1a8c233..0e792dd 100644
--- a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
+++ b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch
@@ -1,12 +1,15 @@
---- 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);
+--- /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);
diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys
index d0091eb..85b6fd1 100644
--- a/abs/core/fluxbox/keys
+++ b/abs/core/fluxbox/keys
@@ -1,3 +1,14 @@
+!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
@@ -27,3 +38,4 @@ 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}
+
diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD
index deb10fa..fa31f11 100644
--- a/abs/core/iproute2/PKGBUILD
+++ b/abs/core/iproute2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96235 2010-10-19 13:01:29Z allan $
+# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
-pkgver=2.6.35
-pkgrel=4
+pkgver=2.6.37
+pkgrel=1
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -17,10 +17,9 @@ options=('!makeflags')
backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2
- 'iproute2-fhs.patch' 'iproutegetfix.patch')
-sha1sums=('862b86ac73ea696867675765d119654553a22aeb'
- '2416b11252364d7a6c742eabb4a6924a75637a46'
- 'cd8c969800a9bd1d4ebba0e1eae69d0892786d60')
+ 'iproute2-fhs.patch')
+sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
build() {
cd $srcdir/iproute2-${pkgver}
@@ -28,18 +27,15 @@ build() {
# set correct fhs structure
patch -Np1 -i ${srcdir}/iproute2-fhs.patch
- # fix ip route get breakage
- patch -Np0 -i ${srcdir}/iproutegetfix.patch
-
./configure
- make || return 1
+ make
}
package() {
cd $srcdir/iproute2-${pkgver}
- make DESTDIR=$pkgdir install || return 1
+ make DESTDIR=$pkgdir install
# libnetlink isn't installed, install it FS#19385
install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h