Patch core.cc to correctly detect cpus

See https://github.com/brndnmtthws/conky/issues/93

3 files changed, 41 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fdd84b7f267..789e5f0758f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = conky-lua-nv
 	pkgdesc = An advanced system monitor for X based on torsmo with lua and nvidia enabled
 	pkgver = 1.10.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/brndnmtthws/conky
 	install = conky-lua-nv.install
 	arch = i686
@@ -38,10 +38,12 @@ pkgbase = conky-lua-nv
 	source = ascii.patch
 	source = ipv6.patch
 	source = curl.patch
+	source = cpu_count.patch
 	sha1sums = d5863420150150002947180d0ee96c9ef56c43b1
 	sha1sums = 96cdbc38e8706c8a3120601983df5c7265716128
 	sha1sums = a0899973483d0ad664b60e58b3ba899ba88712af
 	sha1sums = 1c066b439a1e7166d733fb710faa9bf08b81ce4c
+	sha1sums = a0e8c2fb9f262ff8dbea17917dc15eaa2023c3c5
 
 pkgname = conky-lua-nv
 
diff --git a/PKGBUILD b/PKGBUILD
index f3aff3909e96..5f06626a0e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=conky-lua-nv
 _pkgname=conky
 pkgver=1.10.0
-pkgrel=5
+pkgrel=6
 pkgdesc="An advanced system monitor for X based on torsmo with lua and nvidia enabled"
 arch=('i686' 'x86_64')
 url="https://github.com/brndnmtthws/conky"
@@ -24,11 +24,13 @@ optdepends=('nvidia: for GT4xx and newer GPUs',
 source=(https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz
         ascii.patch
         ipv6.patch
-        curl.patch)
+        curl.patch
+        cpu_count.patch)
 sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1'
           '96cdbc38e8706c8a3120601983df5c7265716128'
           'a0899973483d0ad664b60e58b3ba899ba88712af'
-          '1c066b439a1e7166d733fb710faa9bf08b81ce4c')
+          '1c066b439a1e7166d733fb710faa9bf08b81ce4c'
+          'a0e8c2fb9f262ff8dbea17917dc15eaa2023c3c5')
 options=('!strip' 'debug')
 install=('conky-lua-nv.install')
 
@@ -37,6 +39,7 @@ prepare() {
   patch -p1 -i ../ascii.patch
   patch -p1 -i ../ipv6.patch
   patch -p1 -i ../curl.patch
+  patch -p1 -i ../cpu_count.patch
 
   cd cmake
   # -lXext must come *after* -lXNVCtrl
diff --git a/cpu_count.patch b/cpu_count.patch
new file mode 100644
index 000000000000..f4993cc48bf5
--- /dev/null
+++ b/cpu_count.patch
@@ -0,0 +1,32 @@
+diff --git a/src/core.cc b/src/core.cc
+index e39eefd..56eb820 100644
+--- a/src/core.cc
++++ b/src/core.cc
+@@ -571,23 +571,27 @@ struct text_object *construct_text_object(char *s, const char *arg,
+ 		__var = 0; \
+ }
+ 	END OBJ(cpu, &update_cpu_usage)
++		get_cpu_count();
+ 		SCAN_CPU(arg, obj->data.i);
+ 		obj->callbacks.percentage = &cpu_percentage;
+ 		DBGP2("Adding $cpu for CPU %d", obj->data.i);
+ #ifdef BUILD_X11
+ 	END OBJ(cpugauge, &update_cpu_usage)
++		get_cpu_count();
+ 		SCAN_CPU(arg, obj->data.i);
+ 		scan_gauge(obj, arg, 1);
+ 		obj->callbacks.gaugeval = &cpu_barval;
+ 		DBGP2("Adding $cpugauge for CPU %d", obj->data.i);
+ #endif
+ 	END OBJ(cpubar, &update_cpu_usage)
++		get_cpu_count();
+ 		SCAN_CPU(arg, obj->data.i);
+ 		scan_bar(obj, arg, 1);
+ 		obj->callbacks.barval = &cpu_barval;
+ 		DBGP2("Adding $cpubar for CPU %d", obj->data.i);
+ #ifdef BUILD_X11
+ 	END OBJ(cpugraph, &update_cpu_usage)
++		get_cpu_count();
+ 		char *buf = 0;
+ 		SCAN_CPU(arg, obj->data.i);
+ 		buf = scan_graph(obj, arg, 1);