From 56fe14c1df18031174b0a7fd4ededb8f39d9fb51 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Wed, 7 Aug 2013 23:55:02 +0200
Subject: tint2: fixed battery power_now support (Thanks to Oleksii Tkachuk)

---
 tint2/.md5sum                     |  1 +
 tint2/Pkgfile                     |  7 +++++--
 tint2/add-power-now-support.patch | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 tint2/add-power-now-support.patch

(limited to 'tint2')

diff --git a/tint2/.md5sum b/tint2/.md5sum
index 634709ce9..6a758da88 100644
--- a/tint2/.md5sum
+++ b/tint2/.md5sum
@@ -1 +1,2 @@
+6cfcad028f1bd2f69812167f5395f890  add-power-now-support.patch
 6fc5731e7425125fa84a2add5cef4bff  tint2-0.11.tar.bz2
diff --git a/tint2/Pkgfile b/tint2/Pkgfile
index 6e117e17b..616159036 100644
--- a/tint2/Pkgfile
+++ b/tint2/Pkgfile
@@ -6,12 +6,15 @@
 
 name=tint2
 version=0.11
-release=1
-source=(http://$name.googlecode.com/files/$name-$version.tar.bz2)
+release=2
+source=(http://$name.googlecode.com/files/$name-$version.tar.bz2 \
+        add-power-now-support.patch)
 
 build() {
   cd $name-$version
 
+  patch -p0 -i $SRC/add-power-now-support.patch
+
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_BATTERY=ON \
diff --git a/tint2/add-power-now-support.patch b/tint2/add-power-now-support.patch
new file mode 100644
index 000000000..5057043df
--- /dev/null
+++ b/tint2/add-power-now-support.patch
@@ -0,0 +1,19 @@
+diff -rup ../tint2-0.11.orig/src/battery/battery.c ./src/battery/battery.c
+--- ../tint2-0.11.orig/src/battery/battery.c	2010-12-02 23:56:11.313403140 +0100
++++ ./src/battery/battery.c	2010-12-02 23:57:22.266956142 +0100
+@@ -184,8 +184,14 @@ void init_battery()
+ 		}
+ 		g_free(path2);
+ 	}
+-	if (path_energy_now && path_energy_full) {
++
++	path_current_now = g_build_filename(battery_dir, "power_now", NULL);
++	if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
++		g_free(path_current_now);
+ 		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
++	}
++
++	if (path_energy_now && path_energy_full) {
+ 		path_status = g_build_filename(battery_dir, "status", NULL);
+ 
+ 		// check file
-- 
cgit v1.2.3