From 0c7c16db14b83bcd619791a561e52e074a9ce1d8 Mon Sep 17 00:00:00 2001 From: Dan Čermák Date: Feb 18 2020 22:56:25 +0000 Subject: New upstream release 4.18 - Drop custom patches to fix gcc 10 FTBFS --- diff --git a/.gitignore b/.gitignore index f002c57..8c2a6c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /i3-4.*.tar.bz2 /i3-4.17.1.tar.bz2.asc +/i3-4.18.tar.bz2.asc diff --git a/0001-Delete-duplicate-definition-of-ewmh_window.patch b/0001-Delete-duplicate-definition-of-ewmh_window.patch deleted file mode 100644 index 14e674c..0000000 --- a/0001-Delete-duplicate-definition-of-ewmh_window.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d11e862919241bb5738f4e01ef226e0a4135eade Mon Sep 17 00:00:00 2001 -From: Orestis Floros -Date: Sat, 25 Jan 2020 15:47:36 +0100 -Subject: [PATCH 1/4] Delete duplicate definition of ewmh_window - -See #3914 ---- - src/x.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/x.c b/src/x.c -index 43824bbc..8d89eafd 100644 ---- a/src/x.c -+++ b/src/x.c -@@ -14,8 +14,6 @@ - #define MAX(x, y) ((x) > (y) ? (x) : (y)) - #endif - --xcb_window_t ewmh_window; -- - /* Stores the X11 window ID of the currently focused window */ - xcb_window_t focused_id = XCB_NONE; - --- -2.24.1 - diff --git a/0002-libi3-Make-visual_type-extern.patch b/0002-libi3-Make-visual_type-extern.patch deleted file mode 100644 index f2577e8..0000000 --- a/0002-libi3-Make-visual_type-extern.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e9f011397a508b4e3d75fd5fb46e06a87d84348e Mon Sep 17 00:00:00 2001 -From: Orestis Floros -Date: Sat, 25 Jan 2020 15:59:37 +0100 -Subject: [PATCH 2/4] libi3: Make visual_type extern - -See #3914 ---- - i3-config-wizard/main.c | 1 + - i3-input/main.c | 5 +++-- - i3-nagbar/main.c | 5 +++-- - libi3/draw_util.c | 2 +- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c -index 7c1f00a3..f999de30 100644 ---- a/i3-config-wizard/main.c -+++ b/i3-config-wizard/main.c -@@ -68,6 +68,7 @@ - } while (0) - - #include "xcb.h" -+xcb_visualtype_t *visual_type = NULL; - #include "libi3.h" - - #define TEXT_PADDING logical_px(4) -diff --git a/i3-input/main.c b/i3-input/main.c -index f15a74ab..e495fe10 100644 ---- a/i3-input/main.c -+++ b/i3-input/main.c -@@ -8,8 +8,6 @@ - * to i3. - * - */ --#include "libi3.h" -- - #include - #include - #include -@@ -27,6 +25,9 @@ - #include - #include - -+xcb_visualtype_t *visual_type = NULL; -+#include "libi3.h" -+ - #include - - #include "keysym2ucs.h" -diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c -index c7b23da5..5099cf54 100644 ---- a/i3-nagbar/main.c -+++ b/i3-nagbar/main.c -@@ -8,8 +8,6 @@ - * when the user has an error in their configuration file. - * - */ --#include "libi3.h" -- - #include - #include - #include -@@ -32,6 +30,9 @@ - #include - #include - -+xcb_visualtype_t *visual_type = NULL; -+#include "libi3.h" -+ - #define SN_API_NOT_YET_FROZEN 1 - #include - -diff --git a/libi3/draw_util.c b/libi3/draw_util.c -index f88360dc..092ac967 100644 ---- a/libi3/draw_util.c -+++ b/libi3/draw_util.c -@@ -16,7 +16,7 @@ - #include - - /* The default visual_type to use if none is specified when creating the surface. Must be defined globally. */ --xcb_visualtype_t *visual_type; -+extern xcb_visualtype_t *visual_type; - - /* Forward declarations */ - static void draw_util_set_source_color(surface_t *surface, color_t color); --- -2.24.1 - diff --git a/0003-i3bar-Make-header-declarations-extern.patch b/0003-i3bar-Make-header-declarations-extern.patch deleted file mode 100644 index e08062b..0000000 --- a/0003-i3bar-Make-header-declarations-extern.patch +++ /dev/null @@ -1,134 +0,0 @@ -From d14e59b3a766b17ade2d09afcb5c5d572d85a20c Mon Sep 17 00:00:00 2001 -From: Orestis Floros -Date: Sat, 25 Jan 2020 16:26:54 +0100 -Subject: [PATCH 3/4] i3bar: Make header declarations extern - -See #3914 ---- - i3bar/include/common.h | 6 +++--- - i3bar/include/configuration.h | 2 +- - i3bar/include/outputs.h | 2 +- - i3bar/include/xcb.h | 2 +- - i3bar/src/config.c | 1 + - i3bar/src/main.c | 2 ++ - i3bar/src/outputs.c | 1 + - i3bar/src/xcb.c | 3 +++ - 8 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/i3bar/include/common.h b/i3bar/include/common.h -index fe7444a3..222f42dd 100644 ---- a/i3bar/include/common.h -+++ b/i3bar/include/common.h -@@ -17,7 +17,7 @@ - - typedef struct rect_t rect; - --struct ev_loop *main_loop; -+extern struct ev_loop *main_loop; - - struct rect_t { - int x; -@@ -82,8 +82,8 @@ struct status_block { - blocks; - }; - --TAILQ_HEAD(statusline_head, status_block) --statusline_head; -+extern TAILQ_HEAD(statusline_head, status_block) -+ statusline_head; - - #include "child.h" - #include "ipc.h" -diff --git a/i3bar/include/configuration.h b/i3bar/include/configuration.h -index aeb7db19..70167247 100644 ---- a/i3bar/include/configuration.h -+++ b/i3bar/include/configuration.h -@@ -74,7 +74,7 @@ typedef struct config_t { - S_SHOW = 1 } hidden_state; - } config_t; - --config_t config; -+extern config_t config; - - /** - * Start parsing the received bar configuration JSON string -diff --git a/i3bar/include/outputs.h b/i3bar/include/outputs.h -index 29a7bcd3..5bb19c40 100644 ---- a/i3bar/include/outputs.h -+++ b/i3bar/include/outputs.h -@@ -19,7 +19,7 @@ - typedef struct i3_output i3_output; - - SLIST_HEAD(outputs_head, i3_output); --struct outputs_head* outputs; -+extern struct outputs_head* outputs; - - /* - * Start parsing the received JSON string -diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h -index 760ebcdb..0e3ca22d 100644 ---- a/i3bar/include/xcb.h -+++ b/i3bar/include/xcb.h -@@ -53,7 +53,7 @@ struct xcb_color_strings_t { - typedef struct xcb_colors_t xcb_colors_t; - - /* Cached width of the custom separator if one was set */ --int separator_symbol_width; -+extern int separator_symbol_width; - - /* - * Early initialization of the connection to X11: Everything which does not -diff --git a/i3bar/src/config.c b/i3bar/src/config.c -index 26004071..29b0908b 100644 ---- a/i3bar/src/config.c -+++ b/i3bar/src/config.c -@@ -19,6 +19,7 @@ - - #include - -+config_t config; - static char *cur_key; - static bool parsing_bindings; - static bool parsing_tray_outputs; -diff --git a/i3bar/src/main.c b/i3bar/src/main.c -index aa6bdbea..65cb00ff 100644 ---- a/i3bar/src/main.c -+++ b/i3bar/src/main.c -@@ -17,6 +17,8 @@ - #include - #include - -+struct ev_loop *main_loop; -+ - /* - * Having verboselog(), errorlog() and debuglog() is necessary when using libi3. - * -diff --git a/i3bar/src/outputs.c b/i3bar/src/outputs.c -index 4c9ce651..2fa3195c 100644 ---- a/i3bar/src/outputs.c -+++ b/i3bar/src/outputs.c -@@ -252,6 +252,7 @@ static yajl_callbacks outputs_callbacks = { - .yajl_end_map = outputs_end_map_cb, - }; - -+struct outputs_head *outputs; - /* - * Initiate the outputs list - * -diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c -index 6b135e44..7b97beea 100644 ---- a/i3bar/src/xcb.c -+++ b/i3bar/src/xcb.c -@@ -140,6 +140,9 @@ static const int tray_loff_px = 2; - /* Vertical offset between the bar and a separator */ - static const int sep_voff_px = 4; - -+/* Cached width of the custom separator if one was set */ -+int separator_symbol_width; -+ - int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) { - xcb_generic_error_t *err; - if ((err = xcb_request_check(xcb_connection, cookie)) != NULL) { --- -2.24.1 - diff --git a/0004-atoms-Properly-declare-as-global-variables.patch b/0004-atoms-Properly-declare-as-global-variables.patch deleted file mode 100644 index 9fb73f3..0000000 --- a/0004-atoms-Properly-declare-as-global-variables.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2eac53fada7a8ac8fc28b0b9e894c5f2899b8aa2 Mon Sep 17 00:00:00 2001 -From: Orestis Floros -Date: Sat, 1 Feb 2020 17:29:44 +0100 -Subject: [PATCH 4/4] atoms: Properly declare as global variables - -See #3914 ---- - include/xcb.h | 2 +- - src/main.c | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/include/xcb.h b/include/xcb.h -index 53c932bf..32110c7d 100644 ---- a/include/xcb.h -+++ b/include/xcb.h -@@ -56,7 +56,7 @@ - XCB_EVENT_MASK_FOCUS_CHANGE | \ - XCB_EVENT_MASK_ENTER_WINDOW) - --#define xmacro(atom) xcb_atom_t A_##atom; -+#define xmacro(atom) extern xcb_atom_t A_##atom; - #include "atoms.xmacro" - #undef xmacro - -diff --git a/src/main.c b/src/main.c -index 42d15735..e4c6b2c9 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -93,6 +93,11 @@ bool shape_supported = true; - - bool force_xinerama = false; - -+/* Define all atoms as global variables */ -+#define xmacro(atom) xcb_atom_t A_##atom; -+#include "atoms.xmacro" -+#undef xmacro -+ - /* - * This callback is only a dummy, see xcb_prepare_cb. - * See also man libev(3): "ev_prepare" and "ev_check" - customise your event loop --- -2.24.1 - diff --git a/i3.spec b/i3.spec index 7a9ff1d..0fd17e4 100644 --- a/i3.spec +++ b/i3.spec @@ -1,6 +1,6 @@ Name: i3 -Version: 4.17.1 -Release: 4%{?dist} +Version: 4.18 +Release: 1%{?dist} Summary: Improved tiling window manager License: BSD URL: https://i3wm.org @@ -9,11 +9,6 @@ Source1: %{URL}/downloads/%{name}-%{version}.tar.bz2.asc # Michael Stapelberg's GPG key: Source2: gpgkey-424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D.gpg Source3: %{name}-logo.svg -# https://github.com/i3/i3/pull/3918 -Patch0: 0001-Delete-duplicate-definition-of-ewmh_window.patch -Patch1: 0002-libi3-Make-visual_type-extern.patch -Patch2: 0003-i3bar-Make-header-declarations-extern.patch -Patch3: 0004-atoms-Properly-declare-as-global-variables.patch BuildRequires: gcc BuildRequires: autoconf @@ -183,6 +178,10 @@ install -Dpm0644 %{SOURCE3} \ %doc pseudo-doc/doxygen/ %changelog +* Mon Feb 17 2020 Dan Čermák - 4.18-1 +- New upstream release 4.18 +- Drop custom patches to fix gcc 10 FTBFS + * Sat Feb 1 2020 Dan Čermák - 4.17.1-4 - Add upstream patches to fix the build failure with gcc 10 diff --git a/sources b/sources index 23f663b..c7b0476 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (i3-4.17.1.tar.bz2) = af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f -SHA512 (i3-4.17.1.tar.bz2.asc) = bae259414cb60a8c7fb9d9c6907e250ee173c8bec643c327e3ce5401daf6e72d9985a1b8a0eb8b5a823799506dd2d55558b01c77be8b29de6a75246fbf9b3ec4 +SHA512 (i3-4.18.tar.bz2.asc) = 37ebecca30bea3fbe820e3d7742168fb883ccdaa66a76852315354d3e87e3de440e5143a5f81d2d475b936d4f65d3617a24713665f3343dff30162092ea47b4d +SHA512 (i3-4.18.tar.bz2) = 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec