- rediff patches

diff --git a/fio-guasi.patch b/fio-guasi.patch
index f004bb6d1503eb6da2e0320ca24af5892dc49bcd..53bfbe54916ffe5eab6df120a75e0fddf97a2d97 100644 (file)
--- a/fio-guasi.patch
+++ b/fio-guasi.patch
@@ -1,6 +1,7 @@
---- fio-2.8/configure.orig     2016-03-15 17:10:37.000000000 +0100
-+++ fio-2.8/configure  2016-04-10 11:00:51.982001795 +0200
-@@ -890,7 +890,8 @@
+diff -urNp -x '*.orig' fio-3.23.org/configure fio-3.23/configure
+--- fio-3.23.org/configure     2020-09-06 18:45:11.000000000 +0200
++++ fio-3.23/configure 2021-10-09 23:26:34.042251668 +0200
+@@ -1325,7 +1325,8 @@ int main(int argc, char **argv)
    return 0;
  }
  EOF
@@ -9,4 +10,4 @@
 +  LIBS="$LIBS -lguasi"
    guasi="yes"
  fi
- echo "GUASI                         $guasi"
+ print_config "GUASI" "$guasi"

diff --git a/fio-no-common.patch b/fio-no-common.patch
index c122570547768958da068a9c733180f6bc9dbecd..f65c72a88a69cf21a66c941da46a2641551a5c6a 100644 (file)
--- a/fio-no-common.patch
+++ b/fio-no-common.patch
@@ -1,6 +1,18 @@
---- fio-3.20/gfio.h.orig       2020-05-23 19:14:14.000000000 +0200
-+++ fio-3.20/gfio.h    2020-05-31 07:38:31.099999894 +0200
-@@ -53,7 +53,7 @@
+diff -urNp -x '*.orig' fio-3.23.org/gfio.c fio-3.23/gfio.c
+--- fio-3.23.org/gfio.c        2020-09-06 18:45:11.000000000 +0200
++++ fio-3.23/gfio.c    2021-10-09 23:26:34.305584665 +0200
+@@ -40,6 +40,7 @@
+ 
+ struct gui main_ui;
+ 
++struct gui main_ui;
+ static bool gfio_server_running;
+ static unsigned int gfio_graph_limit = 100;
+ 
+diff -urNp -x '*.orig' fio-3.23.org/gfio.h fio-3.23/gfio.h
+--- fio-3.23.org/gfio.h        2020-09-06 18:45:11.000000000 +0200
++++ fio-3.23/gfio.h    2021-10-09 23:26:34.305584665 +0200
+@@ -53,7 +53,7 @@ struct gfio_graphs {
  /*
   * Main window widgets and data
   */
@@ -9,13 +21,3 @@
        GtkUIManager *uimanager;
        GtkRecentManager *recentmanager;
        GtkActionGroup *actiongroup;
---- fio-3.20/gfio.c.orig       2020-05-23 19:14:14.000000000 +0200
-+++ fio-3.20/gfio.c    2020-05-31 07:40:17.605364061 +0200
-@@ -38,6 +38,7 @@
- #include "gclient.h"
- #include "graph.h"
- 
-+struct gui main_ui;
- static bool gfio_server_running;
- static unsigned int gfio_graph_limit = 100;
-