| 1 |
commit: 930e6e34f710e76e6e176ed28509bb56ed1c6a38 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Mar 1 17:37:04 2019 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 4 03:12:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930e6e34 |
| 7 |
|
| 8 |
xfce-extra/xfce4-diskperf-plugin: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 12 |
|
| 13 |
.../xfce4-diskperf-plugin-2.6.1-majorminor.patch | 58 ---------------------- |
| 14 |
1 file changed, 58 deletions(-) |
| 15 |
|
| 16 |
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index c0515f1558b..00000000000 |
| 19 |
--- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,58 +0,0 @@ |
| 22 |
-From: Nico R. <n-roeser@×××.net> |
| 23 |
-Date: Sun, 28 Jan 2018 15:15:07 +0100 |
| 24 |
-Subject: [PATCH] work around glibc namespace pollution |
| 25 |
- |
| 26 |
---- |
| 27 |
- panel-plugin/devperf.c | 12 ++++++------ |
| 28 |
- 1 file changed, 6 insertions(+), 6 deletions(-) |
| 29 |
- |
| 30 |
-diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c |
| 31 |
-index 29bcb87..95d2f0e 100644 |
| 32 |
---- a/panel-plugin/devperf.c |
| 33 |
-+++ b/panel-plugin/devperf.c |
| 34 |
-@@ -69,7 +69,7 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) |
| 35 |
- iMinorNo = minor(p_iDevice); |
| 36 |
- struct timeval oTimeStamp; |
| 37 |
- FILE *pF; |
| 38 |
-- unsigned int major, minor, rsect, wsect, ruse, wuse, use; |
| 39 |
-+ unsigned int majorNo, minorNo, rsect, wsect, ruse, wuse, use; |
| 40 |
- int running; |
| 41 |
- char acStats[128]; |
| 42 |
- int c, n; |
| 43 |
-@@ -80,10 +80,10 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) |
| 44 |
- return (-1); |
| 45 |
- } |
| 46 |
- while (1) { |
| 47 |
-- n = fscanf (pF, "%u %u", &major, &minor); |
| 48 |
-+ n = fscanf (pF, "%u %u", &majorNo, &minorNo); |
| 49 |
- if (n != 2) |
| 50 |
- goto Error; |
| 51 |
-- if ((major != iMajorNo) || (minor != iMinorNo)) { |
| 52 |
-+ if ((majorNo != iMajorNo) || (minorNo != iMinorNo)) { |
| 53 |
- while ((c = fgetc (pF)) && (c != '\n')); /* Goto next line */ |
| 54 |
- continue; |
| 55 |
- } |
| 56 |
-@@ -126,7 +126,7 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) |
| 57 |
- iMinorNo = p_iDevice & 0xFF; |
| 58 |
- struct timeval oTimeStamp; |
| 59 |
- FILE *pF; |
| 60 |
-- unsigned int major, minor, rsect, wsect, ruse, wuse, use; |
| 61 |
-+ unsigned int majorNo, minorNo, rsect, wsect, ruse, wuse, use; |
| 62 |
- int running; |
| 63 |
- int c, n; |
| 64 |
- |
| 65 |
-@@ -138,9 +138,9 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) |
| 66 |
- while ((c = fgetc (pF)) && (c != '\n')); /* Skip the header line */ |
| 67 |
- while ((n = fscanf (pF, |
| 68 |
- "%u %u %*u %*s %*u %*u %u %u %*u %*u %u %u %d %u %*u", |
| 69 |
-- &major, &minor, &rsect, &ruse, &wsect, |
| 70 |
-+ &majorNo, &minorNo, &rsect, &ruse, &wsect, |
| 71 |
- &wuse, &running, &use)) == 8) |
| 72 |
-- if ((major == iMajorNo) && (minor == iMinorNo)) { |
| 73 |
-+ if ((majorNo == iMajorNo) && (minorNo == iMinorNo)) { |
| 74 |
- fclose (pF); |
| 75 |
- gettimeofday (&oTimeStamp, 0); |
| 76 |
- p_poPerf->timestamp_ns = |
| 77 |
--- |
| 78 |
-2.16.1 |
| 79 |
- |
Archives