diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /xfce-extra/xfce4-diskperf-plugin | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'xfce-extra/xfce4-diskperf-plugin')
| -rw-r--r-- | xfce-extra/xfce4-diskperf-plugin/Manifest | 1 | ||||
| -rw-r--r-- | xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest index 2a2179bbd2e6..08c8b29b5020 100644 --- a/xfce-extra/xfce4-diskperf-plugin/Manifest +++ b/xfce-extra/xfce4-diskperf-plugin/Manifest @@ -1,4 +1,3 @@ -AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b994dd279a1e5983e14f7786899f479042cc08a4bacbbf3677d46a9265863b59eb567cdabb433a67100f0ea6cbad12f90e0ba96fac6221d9c SHA512 167751a95d33f7a91a8a2cd70d444c31667ad30fa8f99b74f303f9edf699708511d0cdfa0830b07f08191ae4d1e4932cf3e350501e1ca809b255f0a1673d5406 AUX xfce4-diskperf-plugin-2.6.1-sysmacros.patch 626 BLAKE2B 116648fa6b865abd4e9a1ec2f42cc6d3efb8c5f1380fdd197722a50206460573e3a4c6eeee61f3f1005962c36d1cbc8371112204c4745ab4c816a1c108f01d0a SHA512 d2e42cb9c5b430d20996ca912504bbce949c4153bff12f6be72ed6b73e891194ce2d1de0f3ed8e1cefca0d7740732a01e8dd38b522deb0b29ff6b35f32341626 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1058 BLAKE2B 32df565ba5cdebdd438d8278e26ddf1ac3ce5f9a50a93a4592d9ba5a7b3e7cda160ef8bbf5e5eacf3eee083d59de8be54dc68a897f4ebf910464afe85dc64493 SHA512 6b5a984d997d3bb6b48f2a4e172d465dc19434fbc836a7d9ac6212246c00a1f5ff890a5f737f47040026cc2dd949c3ef4a5a6fd0546bc828c2b2e81f479fc780 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 deleted file mode 100644 index c0515f1558be..000000000000 --- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Nico R. <n-roeser@gmx.net> -Date: Sun, 28 Jan 2018 15:15:07 +0100 -Subject: [PATCH] work around glibc namespace pollution - ---- - panel-plugin/devperf.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c -index 29bcb87..95d2f0e 100644 ---- a/panel-plugin/devperf.c -+++ b/panel-plugin/devperf.c -@@ -69,7 +69,7 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) - iMinorNo = minor(p_iDevice); - struct timeval oTimeStamp; - FILE *pF; -- unsigned int major, minor, rsect, wsect, ruse, wuse, use; -+ unsigned int majorNo, minorNo, rsect, wsect, ruse, wuse, use; - int running; - char acStats[128]; - int c, n; -@@ -80,10 +80,10 @@ static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) - return (-1); - } - while (1) { -- n = fscanf (pF, "%u %u", &major, &minor); -+ n = fscanf (pF, "%u %u", &majorNo, &minorNo); - if (n != 2) - goto Error; -- if ((major != iMajorNo) || (minor != iMinorNo)) { -+ if ((majorNo != iMajorNo) || (minorNo != iMinorNo)) { - while ((c = fgetc (pF)) && (c != '\n')); /* Goto next line */ - continue; - } -@@ -126,7 +126,7 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) - iMinorNo = p_iDevice & 0xFF; - struct timeval oTimeStamp; - FILE *pF; -- unsigned int major, minor, rsect, wsect, ruse, wuse, use; -+ unsigned int majorNo, minorNo, rsect, wsect, ruse, wuse, use; - int running; - int c, n; - -@@ -138,9 +138,9 @@ static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) - while ((c = fgetc (pF)) && (c != '\n')); /* Skip the header line */ - while ((n = fscanf (pF, - "%u %u %*u %*s %*u %*u %u %u %*u %*u %u %u %d %u %*u", -- &major, &minor, &rsect, &ruse, &wsect, -+ &majorNo, &minorNo, &rsect, &ruse, &wsect, - &wuse, &running, &use)) == 8) -- if ((major == iMajorNo) && (minor == iMinorNo)) { -+ if ((majorNo == iMajorNo) && (minorNo == iMinorNo)) { - fclose (pF); - gettimeofday (&oTimeStamp, 0); - p_poPerf->timestamp_ns = --- -2.16.1 - |