gentoo resync : 06.05.2018

3 files changed, 62 insertions, 1 deletions

diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 686a440e09f0..1778a102aee7 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,3 +1,4 @@
+AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b994dd279a1e5983e14f7786899f479042cc08a4bacbbf3677d46a9265863b59eb567cdabb433a67100f0ea6cbad12f90e0ba96fac6221d9c SHA512 167751a95d33f7a91a8a2cd70d444c31667ad30fa8f99b74f303f9edf699708511d0cdfa0830b07f08191ae4d1e4932cf3e350501e1ca809b255f0a1673d5406
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
-EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 940 BLAKE2B 05e2a87d904d94ddc6327d3ca6966b1909b30ffd30c3527a382ebd015facdcc723a0bec9acb656463fd0f80447cc98939665835cd21a42090668af741cb1a276 SHA512 c4e913b0fdf7d5a205e2bdd7f5252966d1b992a8b9b1f5be1c1f1e486d493c360675260acbb3596829d1210b41ed981b01accc79ba9a775ef776c6ced8d1ec09
+EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 989 BLAKE2B ae0f5110cc8f01ac3075d44cfff8d96c690b43aed7461fb93209f130fc85358541cea687f964d9cc34d6d2ff5769426955198c8e9bee2b956fea19f052541664 SHA512 4e326c996d56c6f963cefa553dd1e383d2cf82f016ff0426d38f8732ca0bde9cbbeea881511235494c17567451ec88cea5c921a61a61d746ef7103164519ae3c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
new file mode 100644
index 000000000000..c0515f1558be
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-majorminor.patch
@@ -0,0 +1,58 @@
+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
+
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
index ebebf4412337..54497d9226f2 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=( "${FILESDIR}/${P}-majorminor.patch" )
+
 pkg_preinst() {
 	gnome2_icon_savelist
 }