initial version

5 files changed, 162 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..e4e97410312f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = velox
+	pkgdesc = A simple xcb window manager inspired by awesome, xmonad, and dwm.
+	pkgver = 0.0.3
+	pkgrel = 2
+	url = http://www.ohloh.net/p/velox-wm
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	depends = xcb-util
+	depends = xcb-util-wm
+	depends = alsa-lib
+	depends = libx11
+	depends = libyaml
+	depends = libmpdclient
+	source = https://github.com/downloads/michaelforney/velox/velox-0.0.3.tar.bz2
+	source = xcb-atom.patch
+	source = xcb-aux.patch
+	source = build-fixes.patch
+	md5sums = 0eda26856cdc9fbc68593b6b360970db
+	md5sums = d008e54ee2cc11e69c6d98afed1d5726
+	md5sums = 37368fc1b753e4ec6d3a2469f701cd8b
+	md5sums = 0e79b777b060ea412b47b4cf52458bf6
+
+pkgname = velox
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..f0551967a0fc
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Contributor: Trizen <trizenx at gmail dot com>
+# Contributor: Federico Cinelli <cinelli.federico@gmail.com>
+
+pkgname=velox
+pkgver=0.0.3
+pkgrel=2
+pkgdesc="A simple xcb window manager inspired by awesome, xmonad, and dwm."
+arch=('i686' 'x86_64')
+url="http://www.ohloh.net/p/velox-wm"
+license=('GPL2')
+depends=('xcb-util' 'xcb-util-wm' 'alsa-lib' 'libx11' 'libyaml' 'libmpdclient')
+source=("https://github.com/downloads/michaelforney/$pkgname/$pkgname-$pkgver.tar.bz2"
+        xcb-atom.patch
+        xcb-aux.patch
+        build-fixes.patch)
+md5sums=('0eda26856cdc9fbc68593b6b360970db'
+         'd008e54ee2cc11e69c6d98afed1d5726'
+         '37368fc1b753e4ec6d3a2469f701cd8b'
+         '0e79b777b060ea412b47b4cf52458bf6')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np2 -i "$srcdir/xcb-atom.patch"
+  patch -Np2 -i "$srcdir/xcb-aux.patch"
+  patch -Np2 -i "$srcdir/build-fixes.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh et
diff --git a/build-fixes.patch b/build-fixes.patch
new file mode 100644
index 000000000000..730080f43478
--- /dev/null
+++ b/build-fixes.patch
@@ -0,0 +1,74 @@
+diff -up src/velox-0.0.3/modules/alsa.c.orig src/velox-0.0.3/modules/alsa.c
+--- src/velox-0.0.3/modules/alsa.c.orig	2014-03-27 03:59:31.000000000 -0600
++++ src/velox-0.0.3/modules/alsa.c	2014-03-27 04:00:01.000000000 -0600
+@@ -20,8 +20,8 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <yaml.h>
+-#include <asoundlib.h>
+-#include <mixer.h>
++#include <alsa/asoundlib.h>
++#include <alsa/mixer.h>
+ 
+ #include <velox/velox.h>
+ #include <velox/module.h>
+diff -up src/velox-0.0.3/velox/event.c.orig src/velox-0.0.3/velox/event.c
+--- src/velox-0.0.3/velox/event.c.orig	2014-03-27 03:57:53.000000000 -0600
++++ src/velox-0.0.3/velox/event.c	2014-03-27 03:58:00.000000000 -0600
+@@ -272,7 +272,7 @@ static void unmap_notify(xcb_unmap_notif
+ 
+         xcb_grab_server(c);
+ 
+-        property_values[0] = XCB_WM_STATE_WITHDRAWN;
++        property_values[0] = XCB_ICCCM_WM_STATE_WITHDRAWN;
+         property_values[1] = 0;
+         xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+diff -up src/velox-0.0.3/velox/velox.c.orig src/velox-0.0.3/velox/velox.c
+--- src/velox-0.0.3/velox/velox.c.orig	2014-03-27 03:56:23.000000000 -0600
++++ src/velox-0.0.3/velox/velox.c	2014-03-27 03:57:38.000000000 -0600
+@@ -314,7 +314,7 @@ void show_window(xcb_window_t window_id)
+ 
+     DEBUG_ENTER
+ 
+-    property_values[0] = XCB_WM_STATE_NORMAL;
++    property_values[0] = XCB_ICCCM_WM_STATE_NORMAL;
+     property_values[1] = 0;
+     xcb_change_property(c, XCB_PROP_MODE_REPLACE, window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -327,7 +327,7 @@ void hide_window(xcb_window_t window_id)
+ 
+     DEBUG_ENTER
+ 
+-    property_values[0] = XCB_WM_STATE_WITHDRAWN; // FIXME: Maybe this should be iconic?
++    property_values[0] = XCB_ICCCM_WM_STATE_WITHDRAWN; // FIXME: Maybe this should be iconic?
+     property_values[1] = 0;
+     xcb_change_property(c, XCB_PROP_MODE_REPLACE, window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -766,7 +766,7 @@ void manage(xcb_window_t window_id)
+ 
+         xcb_map_window(c, window->window_id);
+ 
+-        property_values[0] = XCB_WM_STATE_NORMAL;
++        property_values[0] = XCB_ICCCM_WM_STATE_NORMAL;
+         property_values[1] = 0;
+         xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->window_id, WM_STATE, WM_STATE, 32, 2, property_values);
+ 
+@@ -885,7 +885,7 @@ void manage_existing_windows()
+             continue;
+         }
+ 
+-        if (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE || ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_WM_STATE_ICONIC)
++        if (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE || ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_ICCCM_WM_STATE_ICONIC)
+         {
+             manage(children[child]);
+         }
+@@ -894,7 +894,7 @@ void manage_existing_windows()
+     {
+         if (*((xcb_window_t *) xcb_get_property_value(property_replies[child])) &&
+             (window_attributes_replies[child]->map_state == XCB_MAP_STATE_VIEWABLE ||
+-            ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_WM_STATE_ICONIC))
++            ((uint32_t *) xcb_get_property_value(state_replies[child]))[0] == XCB_ICCCM_WM_STATE_ICONIC))
+         {
+             manage(children[child]);
+         }
diff --git a/xcb-atom.patch b/xcb-atom.patch
new file mode 100644
index 000000000000..08cc92663497
--- /dev/null
+++ b/xcb-atom.patch
@@ -0,0 +1,12 @@
+diff -up src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake.orig src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake
+--- src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake.orig	2014-03-27 03:48:31.000000000 -0600
++++ src/velox-0.0.3/cmake/Modules/FindXCB-Atom.cmake	2014-03-27 03:48:42.000000000 -0600
+@@ -16,7 +16,7 @@ find_path(XCB-Atom_INCLUDE_DIR
+ )
+ 
+ find_library(XCB-Atom_LIBRARY
+-    NAMES xcb-atom
++    NAMES xcb-util
+     PATHS ${XCB-Atom_PKGCONF_LIBRARY_DIRS}
+ )
+ 
diff --git a/xcb-aux.patch b/xcb-aux.patch
new file mode 100644
index 000000000000..5c8ea80c7fea
--- /dev/null
+++ b/xcb-aux.patch
@@ -0,0 +1,12 @@
+diff -up src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake.orig src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake
+--- src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake.orig	2014-03-27 03:51:44.000000000 -0600
++++ src/velox-0.0.3/cmake/Modules/FindXCB-Aux.cmake	2014-03-27 03:52:11.000000000 -0600
+@@ -16,7 +16,7 @@ find_path(XCB-Aux_INCLUDE_DIR
+ )
+ 
+ find_library(XCB-Aux_LIBRARY
+-    NAMES xcb-aux
++    NAMES xcb-util
+     PATHS ${XCB-Aux_PKGCONF_LIBRARY_DIRS}
+ )
+