* [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-diskperf-plugin/files/, xfce-extra/xfce4-diskperf-plugin/
@ 2018-05-04 17:57 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2018-05-04 17:57 UTC (permalink / raw
To: gentoo-commits
commit: a78bbc4236ed08c205b57be153c900f9f6e7d32c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 17:57:15 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 4 17:57:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78bbc42
xfce-extra/xfce4-diskperf-plugin: Add patch to avoid name clash, bug 611418
Patch by Nico R.
Closes: https://bugs.gentoo.org/611418
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../xfce4-diskperf-plugin-2.6.1-majorminor.patch | 58 ++++++++++++++++++++++
.../xfce4-diskperf-plugin-2.6.1.ebuild | 2 +
2 files changed, 60 insertions(+)
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 00000000000..c0515f1558b
--- /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 ebebf441233..54497d9226f 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-diskperf-plugin/files/, xfce-extra/xfce4-diskperf-plugin/
@ 2018-09-24 16:49 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-09-24 16:49 UTC (permalink / raw
To: gentoo-commits
commit: a57c85880af3b8d5696dbf5a0067e28d3d70873d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 16:45:24 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 16:49:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57c8588
xfce-extra/xfce4-diskperf-plugin: Apply proper sysmacros.h fix
Closes: https://bugs.gentoo.org/661994
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../xfce4-diskperf-plugin-2.6.1-sysmacros.patch | 24 +++++++++++++
.../xfce4-diskperf-plugin-2.6.1-r1.ebuild | 40 ++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
new file mode 100644
index 00000000000..13a8df73bfe
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
@@ -0,0 +1,24 @@
+From dd62d6dae6ad77b586af69faf8fdee8d7c87051b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 21 Oct 2017 00:14:32 +0200
+Subject: [PATCH] Add <sys/sysmacros.h> include required for glibc-2.25+
+
+---
+ panel-plugin/devperf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
+index 175fd44..9348c9e 100644
+--- a/panel-plugin/devperf.c
++++ b/panel-plugin/devperf.c
+@@ -35,6 +35,7 @@
+ #include <sys/time.h>
+ /* for major() and minor() */
+ #define _BSD_SOURCE
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+
+
+--
+2.15.0.rc1
+
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
new file mode 100644
index 00000000000..6484f9ed605
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A panel plug-in for disk usage and performance statistics"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+ >=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=(
+ # https://bugzilla.xfce.org/show_bug.cgi?id=13940
+ # (simpler Linux-only version; portable version merged as 0787a89)
+ "${FILESDIR}"/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
+)
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-diskperf-plugin/files/, xfce-extra/xfce4-diskperf-plugin/
@ 2019-10-20 10:24 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2019-10-20 10:24 UTC (permalink / raw
To: gentoo-commits
commit: f0c8bbf813f2e9721cc93f67952938b6eeea6473
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:27:45 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 10:24:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c8bbf8
xfce-extra/xfce4-diskperf-plugin: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
| 1 -
.../xfce4-diskperf-plugin-2.6.1-sysmacros.patch | 24 -------------
.../xfce4-diskperf-plugin-2.6.1-r1.ebuild | 40 ----------------------
3 files changed, 65 deletions(-)
--git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 7f9fc68dd3c..6f6d22636dc 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
DIST xfce4-diskperf-plugin-2.6.2.tar.bz2 347244 BLAKE2B 82ef114b6ac445627d05ed99b34f128391061e5028192aaaa47e8b87f17cb89842d541585e77da4b6ec319fc50f242fe6d1fcb510048497e2b1184a8e3dfcadb SHA512 e91a888a9936f8a0279a062801d16ebe03159df479413087a01e20c15913df781378e4b4c91ecba94d71afa813c6d3a5367b11c1c6d3d62bf10fea78c4853031
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
deleted file mode 100644
index 13a8df73bfe..00000000000
--- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dd62d6dae6ad77b586af69faf8fdee8d7c87051b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 Oct 2017 00:14:32 +0200
-Subject: [PATCH] Add <sys/sysmacros.h> include required for glibc-2.25+
-
----
- panel-plugin/devperf.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
-index 175fd44..9348c9e 100644
---- a/panel-plugin/devperf.c
-+++ b/panel-plugin/devperf.c
-@@ -35,6 +35,7 @@
- #include <sys/time.h>
- /* for major() and minor() */
- #define _BSD_SOURCE
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
-
---
-2.15.0.rc1
-
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
deleted file mode 100644
index 3d8b6c40f95..00000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plug-in for disk usage and performance statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
- >=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- # https://bugzilla.xfce.org/show_bug.cgi?id=13940
- # (simpler Linux-only version; portable version merged as 0787a89)
- "${FILESDIR}"/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
-)
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-20 10:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-04 17:57 [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-diskperf-plugin/files/, xfce-extra/xfce4-diskperf-plugin/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2018-09-24 16:49 Michał Górny
2019-10-20 10:24 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox