* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2017-03-16 21:49 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2017-03-16 21:49 UTC (permalink / raw
To: gentoo-commits
commit: a79414398ba07ee1a776dafed0ebb86170fb4955
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 21:47:51 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 21:49:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7941439
app-benchmarks/i7z: Fix building GUI with GCC 5 (Funtoo bug FL-3617)
I wasn't able to reproduce this (possibly affects <gcc-5.4?) but
angry_vincent provided the patch and it doesn't hurt to apply it.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
app-benchmarks/i7z/files/gcc5.patch | 40 ++++++++++++++++++++++++++++++
app-benchmarks/i7z/i7z-93_p20131012.ebuild | 3 ++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/app-benchmarks/i7z/files/gcc5.patch b/app-benchmarks/i7z/files/gcc5.patch
new file mode 100644
index 00000000000..dd3ed99a1c7
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc5.patch
@@ -0,0 +1,40 @@
+diff -Nuar i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp
+i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp
+--- i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp 2013-10-12 20:59:19.000000000 +0000
++++ i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp 2017-03-06 18:27:54.825756111 +0000
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <math.h>
++#include <cmath>
+
+ #include <QApplication>
+ #include <QPushButton>
+@@ -382,7 +382,7 @@
+
+ //C1_time[i] -= C3_time[i] + C6_time[i];
+ C1_time[i] = c1_time - (C3_time[i] + C6_time[i]) ;
+- if (!isnan(c1_time) && !isinf(c1_time)) {
++ if (!std::isnan(c1_time) && !std::isinf(c1_time)) {
+ if (C1_time[i] <= 0) {
+ C1_time[i]=0;
+ }
+@@ -642,13 +642,13 @@
+
+ for (i = 0; i < (int)numCPUs; i++)
+ {
+- if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!isnan(mythread->FREQ[i])) &&
+- (!isinf(mythread->FREQ[i])) && (socket_list[i] == socket_0.socket_num) ) {
++ if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!std::isnan(mythread->FREQ[i])) &&
++ (!std::isinf(mythread->FREQ[i])) && (socket_list[i] == socket_0.socket_num) ) {
+ Max_Freq_socket0 = mythread->FREQ[i];
+ num_socket0_cpus++;
+ }
+- if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!isnan(mythread->FREQ[i])) &&
+- (!isinf(mythread->FREQ[i])) && (socket_list[i] == socket_1.socket_num) ) {
++ if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!std::isnan(mythread->FREQ[i])) &&
++ (!std::isinf(mythread->FREQ[i])) && (socket_list[i] == socket_1.socket_num) ) {
+ Max_Freq_socket1 = mythread->FREQ[i];
+ num_socket1_cpus++;
+ }
diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
index f5ae2dfa5ac..e8ec6d12e91 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/i7z-0.27.2-ncurses.patch
"${FILESDIR}"/qt5.patch
+ "${FILESDIR}"/gcc5.patch
)
S="${WORKDIR}/${PN}-${COMMIT}"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2020-05-31 12:42 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2020-05-31 12:42 UTC (permalink / raw
To: gentoo-commits
commit: 9eda907a2533811b443338bb02428561a5f9e5b5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 11:39:00 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 31 12:42:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda907a
app-benchmarks/i7z: Fix for gcc10 and some typos
(from Debian)
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
app-benchmarks/i7z/files/gcc-10.patch | 17 +++++++++++++++++
app-benchmarks/i7z/files/typos.patch | 25 +++++++++++++++++++++++++
app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 5 ++---
3 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/app-benchmarks/i7z/files/gcc-10.patch b/app-benchmarks/i7z/files/gcc-10.patch
new file mode 100644
index 00000000000..206b2c14340
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc-10.patch
@@ -0,0 +1,17 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix FTBFS with gcc-10
+ gcc-10 defaults to -fno-common
+ see https://gcc.gnu.org/gcc-10/porting_to.html
+Bug-Debian: https://bugs.debian.org/957351
+
+--- a/i7z_Dual_Socket.c
++++ b/i7z_Dual_Socket.c
+@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num);
+ extern struct program_options prog_options;
+ FILE *fp_log_file;
+
+-struct timespec global_ts;
++extern struct timespec global_ts;
+ extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2;
+
+ extern char* CPU_FREQUENCY_LOGGING_FILE_single;
diff --git a/app-benchmarks/i7z/files/typos.patch b/app-benchmarks/i7z/files/typos.patch
new file mode 100644
index 00000000000..9b1f3b95216
--- /dev/null
+++ b/app-benchmarks/i7z/files/typos.patch
@@ -0,0 +1,25 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix typos found by Lintian
+
+--- a/helper_functions.c
++++ b/helper_functions.c
+@@ -528,7 +528,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+ n=`expr $n + 1`; \
+ done; \
+ ");
+- printf ("i7z DEBUG: modprobbing for msr\n");
++ printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DO NOT have root privileges, mknod to create device entries won't work out\n");
+--- a/perfmon-i7z/helper_functions.cpp
++++ b/perfmon-i7z/helper_functions.cpp
+@@ -484,7 +484,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+ n=`expr $n + 1`; \
+ done; \
+ ");
+- printf ("i7z DEBUG: modprobbing for msr\n");
++ printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DONOT have root privileges, mknod to create device entries won't work out\n");
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 47b4c7b42ec..c2e8656b7af 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -36,14 +36,13 @@ PATCHES=(
"${FILESDIR}"/install-i7z_rw_registers.patch
"${FILESDIR}"/use_stdbool.patch
"${FILESDIR}"/nehalem.patch
+ "${FILESDIR}"/gcc-10.patch
+ "${FILESDIR}"/typos.patch
)
S="${WORKDIR}/${PN}-${COMMIT}"
src_configure() {
- # Workaround to build with gcc-10 until I find a patch
- append-cflags -fcommon
-
tc-export CC PKG_CONFIG
cd GUI || die
use qt5 && eqmake5 ${PN}_GUI.pro
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/
@ 2025-01-16 14:16 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2025-01-16 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 6b519a41ff8dbb81b407142252891e2053bcae72
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 14:13:40 2025 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 14:16:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b519a41
app-benchmarks/i7z: Migrate to qt6
By the way, also provide a working desktop file for regular desktop
users to more easily launch i7z gui.
Thanks-to: Andreas Sturmlechner
Closes: https://bugs.gentoo.org/947627
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
app-benchmarks/i7z/files/i7z_GUI.policy | 18 +++++++
app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild | 71 +++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/app-benchmarks/i7z/files/i7z_GUI.policy b/app-benchmarks/i7z/files/i7z_GUI.policy
new file mode 100644
index 000000000000..03756867650a
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z_GUI.policy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+ <vendor>i7z</vendor>
+ <vendor_url>https://github.com/ajaiantilal/i7z</vendor_url>
+ <icon_name>i7z</icon_name>
+ <action id="i7z_GUI">
+ <description>Run i7z_GUI as root</description>
+ <message>Authentication is required to run i7z GUI as root</message>
+ <defaults>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/i7z_GUI</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
new file mode 100644
index 000000000000..b4f65ba24612
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils toolchain-funcs
+
+COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="https://github.com/ajaiantilal/i7z"
+SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="policykit qt6"
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ qt6? (
+ policykit? ( sys-auth/polkit )
+ dev-qt/qtbase:6[gui,widgets]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/i7z-0.27.2-ncurses.patch
+ "${FILESDIR}"/qt5.patch
+ "${FILESDIR}"/gcc5.patch
+
+ # From Debian
+ "${FILESDIR}"/fix-insecure-tempfile.patch
+ "${FILESDIR}"/fix_cpuid_asm.patch
+ "${FILESDIR}"/hyphen-used-as-minus-sign.patch
+ "${FILESDIR}"/install-i7z_rw_registers.patch
+ "${FILESDIR}"/use_stdbool.patch
+ "${FILESDIR}"/nehalem.patch
+ "${FILESDIR}"/gcc-10.patch
+ "${FILESDIR}"/typos.patch
+)
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+ cd GUI || die
+ use qt6 && eqmake6 ${PN}_GUI.pro
+}
+
+src_compile() {
+ default
+
+ if use qt6; then
+ emake -C GUI clean
+ emake -C GUI
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
+
+ if use qt6; then
+ dosbin GUI/i7z_GUI
+ if use policykit; then
+ insinto /usr/share/polkit-1/actions
+ doins "${FILESDIR}/i7z_GUI.policy"
+ make_desktop_entry "pkexec --disable-internal-agent /usr/sbin/i7z_GUI" i7z kcmprocessor
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-16 14:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-16 14:16 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-05-31 12:42 Pacho Ramos
2017-03-16 21:49 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox