commit: 8fd7de97020b73c49ca170d5929bdb32429514b9 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Wed Oct 29 16:31:40 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Wed Oct 29 16:31:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd7de97
media-plugins/vdr-systeminfo: remove unused patch Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../files/vdr-systeminfo-0.1.4_gcc11.patch | 35 ---------------------- 1 file changed, 35 deletions(-) diff --git a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch deleted file mode 100644 index 76f70289e6df..000000000000 --- a/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/787707 - -fix declaring of max/min - -Signed-off-by: Joerg Bornkessel <[email protected]> (02 Mar 2021) -diff -Naur systeminfo-0.1.4.orig/displayinfo.c systeminfo-0.1.4/displayinfo.c ---- systeminfo-0.1.4.orig/displayinfo.c 2021-05-02 17:41:51.702653108 +0200 -+++ systeminfo-0.1.4/displayinfo.c 2021-05-02 17:43:41.404653108 +0200 -@@ -173,7 +173,7 @@ - if (fval1 == 0.0) - osdline = cString::sprintf("%s:\t%.1f GB / %.1f GB", pname, fval1, fval2); - else { -- int frac = min(BARLEN,max(0, int((fval1-fval2)*BARLEN/fval1))); -+ int frac = std::min(BARLEN,std::max(0, int((fval1-fval2)*BARLEN/fval1))); - memset(progressbar + 1,'|',frac); - memset(progressbar + 1 + frac ,' ', BARLEN - frac); - -@@ -188,7 +188,7 @@ - if (fval1 == 0.0) - osdline = cString::sprintf("%s:\t%.1f kB / %.1f kB", pname, fval1, fval2); - else { -- int frac = min(BARLEN,max(0, int((fval1-fval2)*BARLEN/fval1))); -+ int frac = std::min(BARLEN,std::max(0, int((fval1-fval2)*BARLEN/fval1))); - memset(progressbar + 1,'|',frac); - memset(progressbar + 1 + frac ,' ', BARLEN - frac); - -@@ -209,7 +209,7 @@ - // check for CPU% - else if (1 == sscanf(systeminfo, "%a[a-zA-Z,/0-9 ]: CPU%%", &pname) && NULL != strstr(systeminfo, "CPU%")) { - fval2 = GetCpuPct(); -- int frac = min(BARLEN,max(0, int(fval2*BARLEN/100.0))); -+ int frac = std::min(BARLEN,std::max(0, int(fval2*BARLEN/100.0))); - memset(progressbar + 1,'|',frac); - memset(progressbar + 1 + frac ,' ', BARLEN - frac); -
