ulatencyd: fix subtle + unbreak build

This commit is contained in:
Andrea Brancaleoni 2015-08-21 08:58:34 +02:00
parent 596145d601
commit 1ecea12d64
6 changed files with 63 additions and 4 deletions

View file

@ -0,0 +1,3 @@
# subtle
subtle user.ui

View file

@ -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)

View file

@ -1,3 +1,3 @@
#!/bin/sh
sv check consolekit >/dev/null || exit 1
exec ulatencyd 2>&1
exec ulatencyd 1>&2

View file

@ -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

View file

@ -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

View file

@ -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