From 1ecea12d64caca42036ae16519ce8fb3cb7d935d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Fri, 21 Aug 2015 08:58:34 +0200
Subject: [PATCH] ulatencyd: fix subtle + unbreak build

---
 srcpkgs/ulatencyd/files/subtle.conf           |  3 +++
 srcpkgs/ulatencyd/files/subtle.lua            |  4 +--
 srcpkgs/ulatencyd/files/ulatencyd/run         |  2 +-
 ...s.cmake-find-package-with-pkg-config.patch | 26 +++++++++++++++++++
 ...002-ulatency.h-remove-PROC_FILLWCHAN.patch | 26 +++++++++++++++++++
 srcpkgs/ulatencyd/template                    |  6 ++++-
 6 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/ulatencyd/files/subtle.conf
 create mode 100644 srcpkgs/ulatencyd/patches/0001-FindProcps.cmake-find-package-with-pkg-config.patch
 create mode 100644 srcpkgs/ulatencyd/patches/0002-ulatency.h-remove-PROC_FILLWCHAN.patch

diff --git a/srcpkgs/ulatencyd/files/subtle.conf b/srcpkgs/ulatencyd/files/subtle.conf
new file mode 100644
index 00000000000..52e0258bb11
--- /dev/null
+++ b/srcpkgs/ulatencyd/files/subtle.conf
@@ -0,0 +1,3 @@
+# subtle
+
+subtle                       user.ui
diff --git a/srcpkgs/ulatencyd/files/subtle.lua b/srcpkgs/ulatencyd/files/subtle.lua
index 70c01204260..0e526446375 100644
--- a/srcpkgs/ulatencyd/files/subtle.lua
+++ b/srcpkgs/ulatencyd/files/subtle.lua
@@ -18,7 +18,7 @@ SubtleWM = {
 	end
 }
 
-AwesomeFix = RunnerFix.new("SubtleWM", {"subtle"})
+SubtleFix = RunnerFix.new("SubtleWM", {"subtle"})
 
 -- on start we have to fix all processes that have descented from kde
 local function cleanup_awesome_mess()
@@ -27,4 +27,4 @@ local function cleanup_awesome_mess()
 end
 
 ulatency.add_timeout(cleanup_awesome_mess, 1000)
-ulatency.register_filter(AwesomeUI)
+ulatency.register_filter(SubtleWM)
diff --git a/srcpkgs/ulatencyd/files/ulatencyd/run b/srcpkgs/ulatencyd/files/ulatencyd/run
index b33d02d5479..861863bc7ff 100644
--- a/srcpkgs/ulatencyd/files/ulatencyd/run
+++ b/srcpkgs/ulatencyd/files/ulatencyd/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 sv check consolekit >/dev/null || exit 1
-exec ulatencyd 2>&1
+exec ulatencyd 1>&2
diff --git a/srcpkgs/ulatencyd/patches/0001-FindProcps.cmake-find-package-with-pkg-config.patch b/srcpkgs/ulatencyd/patches/0001-FindProcps.cmake-find-package-with-pkg-config.patch
new file mode 100644
index 00000000000..bc68a6252d6
--- /dev/null
+++ b/srcpkgs/ulatencyd/patches/0001-FindProcps.cmake-find-package-with-pkg-config.patch
@@ -0,0 +1,26 @@
+From eb036c64a2a999de0eebb6f0b285dcd67e3366b1 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Fri, 21 Aug 2015 11:30:36 +0200
+Subject: [PATCH 7/7] FindProcps.cmake: find package with pkg-config
+
+---
+ cmake/Modules/FindProcps.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindProcps.cmake b/cmake/Modules/FindProcps.cmake
+index 93747fd..f1c3a43 100644
+--- a/cmake/Modules/FindProcps.cmake
++++ b/cmake/Modules/FindProcps.cmake
+@@ -627,8 +627,7 @@ if(found_lib)
+   unset(PROCPS_${libtype}_VERSION_STRING CACHE) # check eachtime
+ 
+   execute_process(
+-              COMMAND "strings" "${PROCPS_${libtype}_LIBRARY}"
+-              COMMAND "sed" "-n" "${ver_rexp}"
++              COMMAND "pkg-config" "--modversion" "libprocps"
+               OUTPUT_VARIABLE PROCPS_${libtype}_VERSION_STRING
+               ERROR_QUIET )
+ 
+-- 
+2.5.0
+
diff --git a/srcpkgs/ulatencyd/patches/0002-ulatency.h-remove-PROC_FILLWCHAN.patch b/srcpkgs/ulatencyd/patches/0002-ulatency.h-remove-PROC_FILLWCHAN.patch
new file mode 100644
index 00000000000..970993d947e
--- /dev/null
+++ b/srcpkgs/ulatencyd/patches/0002-ulatency.h-remove-PROC_FILLWCHAN.patch
@@ -0,0 +1,26 @@
+From f39b6bae2aec5ef624061c9b579db8ed8b29afce Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Fri, 21 Aug 2015 10:27:25 +0200
+Subject: [PATCH 2/2] ulatency.h: remove PROC_FILLWCHAN
+
+---
+ src/ulatency.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/ulatency.h b/src/ulatency.h
+index 64ff88f..38749a7 100644
+--- a/src/ulatency.h
++++ b/src/ulatency.h
+@@ -63,8 +63,7 @@ extern gint U_log_level; //!< Current log level
+ //FIXME enable PROC_FILLSUPGRP once adapted to the new libprocps
+ 
+ #define OPENPROC_FLAGS (PROC_FILLMEM | \
+-  PROC_FILLUSR | PROC_FILLGRP | PROC_FILLSTATUS | PROC_FILLSTAT | \
+-  PROC_FILLWCHAN /*| PROC_FILLSUPGRP*/)
++  PROC_FILLUSR | PROC_FILLGRP | PROC_FILLSTATUS | PROC_FILLSTAT)
+ 
+ #define OPENPROC_FLAGS_MINIMAL (PROC_FILLSTATUS)
+ 
+-- 
+2.5.0
+
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index 17bd7ea115f..86224f85df4 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -1,7 +1,7 @@
 # Template file for 'ulatencyd'
 pkgname=ulatencyd
 version=0.6.0
-revision=2
+revision=3
 _subrelease=alpha.2.1
 wrksrc="${pkgname}-${version}-${_subrelease}"
 build_style=cmake
@@ -42,6 +42,7 @@ conf_files="
 /etc/ulatencyd/rules/xfce.lua
 /etc/ulatencyd/rules/io.lua
 /etc/ulatencyd/ulatencyd.conf
+/etc/ulatencyd/simple.d/subtle.conf
 /etc/ulatencyd/simple.d/isolate.conf
 /etc/ulatencyd/simple.d/games.conf
 /etc/ulatencyd/simple.d/lxde.conf
@@ -63,10 +64,13 @@ conf_files="
 /etc/ulatencyd/simple.d/unity.conf
 /etc/ulatencyd/simple.d/media.conf"
 
+patch_args='-Np1'
+
 post_install() {
 	vsv ulatencyd
 
 	vinstall ${FILESDIR}/subtle.lua 644 etc/ulatencyd/rules
+	vinstall ${FILESDIR}/subtle.conf 644 etc/ulatencyd/simple.d
 
 	vmkdir usr/share
 	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share