diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
| commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
| tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch')
| -rw-r--r-- | media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch | 35 |
1 files changed, 35 insertions, 0 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 new file mode 100644 index 000000000000..76f70289e6df --- /dev/null +++ b/media-plugins/vdr-systeminfo/files/vdr-systeminfo-0.1.4_gcc11.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/787707 + +fix declaring of max/min + +Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (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); + |