Package: xneur
Version: 0.20.0-2
Followup-For: Bug #957991
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/gcc-10.patch: Fix compilation with GCC 10.
Thanks for considering the patch.
Logan
diff -Nru xneur-0.20.0/debian/patches/gcc-10.patch
xneur-0.20.0/debian/patches/gcc-10.patch
--- xneur-0.20.0/debian/patches/gcc-10.patch 1969-12-31 19:00:00.000000000
-0500
+++ xneur-0.20.0/debian/patches/gcc-10.patch 2021-01-07 21:50:23.000000000
-0500
@@ -0,0 +1,40 @@
+--- a/lib/main/program.c
++++ b/lib/main/program.c
+@@ -315,7 +315,7 @@
+
+ p->buffer->save_and_clear(p->buffer, p->last_window);
+ p->correction_buffer->clear(p->correction_buffer);
+- p->correction_action = ACTION_NONE;
++ p->correction_action = CORRECTION_NONE;
+
+ if (status == FOCUS_NONE)
+ return;
+@@ -426,7 +426,7 @@
+ p->correction_buffer =
buffer_init(xconfig->handle, main_window->keymap);
+ p->correction_buffer->handle = xconfig->handle;
+ p->correction_buffer->keymap =
main_window->keymap;
+- p->correction_action = ACTION_NONE;
++ p->correction_action = CORRECTION_NONE;
+
+ //log_message (DEBUG, _("Now layouts count
%d"), xconfig->handle->total_languages);
+ log_message(LOG, _("Keyboard layouts present in
system:"));
+@@ -609,7 +609,7 @@
+ //{
+
p->buffer->save_and_clear(p->buffer, p->focus->owner_window);
+
p->correction_buffer->clear(p->correction_buffer);
+- p->correction_action =
ACTION_NONE;
++ p->correction_action =
CORRECTION_NONE;
+ if
((Window)p->focus->get_focused_window(p->focus) !=
(Window)p->focus->owner_window)
+ {
+ p->update(p);
+--- a/lib/lib/xneur.h
++++ b/lib/lib/xneur.h
+@@ -32,7 +32,7 @@
+ # include <enchant/enchant.h>
+ #endif
+
+-struct _window *main_window;
++extern struct _window *main_window;
+
+ struct _xneur_language
+ {
diff -Nru xneur-0.20.0/debian/patches/series xneur-0.20.0/debian/patches/series
--- xneur-0.20.0/debian/patches/series 2016-12-03 19:51:50.000000000 -0500
+++ xneur-0.20.0/debian/patches/series 2021-01-07 21:49:26.000000000 -0500
@@ -1 +1,2 @@
01-fix-arg-parsing.patch
+gcc-10.patch
