Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/
Date: Sun, 29 Aug 2021 22:42:21
Message-Id: 1630276813.a5c1c77702d036ff2884a9fa27ceccbd646e2619.conikost@gentoo
1 commit: a5c1c77702d036ff2884a9fa27ceccbd646e2619
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Aug 28 19:26:07 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 29 22:40:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c1c777
7
8 sys-block/fio: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22144
11 Package-Manager: Portage-3.0.22, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 sys-block/fio/files/fio-3.20-fno-common.patch | 51 ---------------------------
16 1 file changed, 51 deletions(-)
17
18 diff --git a/sys-block/fio/files/fio-3.20-fno-common.patch b/sys-block/fio/files/fio-3.20-fno-common.patch
19 deleted file mode 100644
20 index f7306bd6a09..00000000000
21 --- a/sys-block/fio/files/fio-3.20-fno-common.patch
22 +++ /dev/null
23 @@ -1,51 +0,0 @@
24 -From 63a4b9cca4ba3aa4101051402cbbe946ced17a49 Mon Sep 17 00:00:00 2001
25 -From: Jens Axboe <axboe@××××××.dk>
26 -Date: Tue, 2 Jun 2020 08:20:03 -0600
27 -Subject: [PATCH] gfio: don't have multiple versions of main_ui
28 -
29 -Also comment a fall-through case appropriately, so newer GCC
30 -don't warn.
31 -
32 -Signed-off-by: Jens Axboe <axboe@××××××.dk>
33 ----
34 - gfio.c | 4 +++-
35 - gfio.h | 4 +++-
36 - 2 files changed, 6 insertions(+), 2 deletions(-)
37 -
38 -diff --git a/gfio.c b/gfio.c
39 -index 280539685..734651b67 100644
40 ---- a/gfio.c
41 -+++ b/gfio.c
42 -@@ -38,6 +38,8 @@
43 - #include "gclient.h"
44 - #include "graph.h"
45 -
46 -+struct gui main_ui;
47 -+
48 - static bool gfio_server_running;
49 - static unsigned int gfio_graph_limit = 100;
50 -
51 -@@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
52 - switch (ge->state) {
53 - default:
54 - gfio_report_error(ge, "Bad client state: %u\n", ge->state);
55 -- /* fall through to new state */
56 -+ /* fall-through */
57 - case GE_STATE_NEW:
58 - connect_state = 1;
59 - edit_state = 1;
60 -diff --git a/gfio.h b/gfio.h
61 -index aa14e3c7d..2bf0ea242 100644
62 ---- a/gfio.h
63 -+++ b/gfio.h
64 -@@ -78,7 +78,9 @@ struct gui {
65 - int handler_running;
66 -
67 - GHashTable *ge_hash;
68 --} main_ui;
69 -+};
70 -+
71 -+extern struct gui main_ui;
72 -
73 - enum {
74 - GE_STATE_NEW = 1,