- mc-no-common.patch: fix compilation on Tumbleweed (bsc#1160401)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=128

mc-no-common.patch

@@ -0,0 +1,26 @@
+When compiled with -fno-common
+
+[   98s] /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lt50-menu.o (symbol from plugin): in function `destroy_menu':
+[   98s] (.text+0x0): multiple definition of `menu_map'; keybind-defaults.o (symbol from plugin):(.text+0x0): first defined here
+
+
+Index: mc-4.8.23/lib/widget/menu.c
+===================================================================
+--- mc-4.8.23.orig/lib/widget/menu.c
++++ mc-4.8.23/lib/widget/menu.c
+@@ -40,14 +40,11 @@
+ #include "lib/skin.h"
+ #include "lib/tty/key.h"        /* key macros */
+ #include "lib/keybind.h"        /* global_keymap_t */
++#include "src/keybind-defaults.h"
+ #include "lib/strutil.h"
+ #include "lib/widget.h"
+ #include "lib/event.h"          /* mc_event_raise() */
+ 
+-/*** global variables ****************************************************************************/
+-
+-const global_keymap_t *menu_map;
+-
+ /*** file scope macro definitions ****************************************************************/
+ 
+ #define MENUENTRY(x) ((menu_entry_t *)(x))

mc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 15 10:11:03 UTC 2020 - Adam Majer <adam.majer@suse.de>
+
+- mc-no-common.patch: fix compilation on Tumbleweed (bsc#1160401)
+
 -------------------------------------------------------------------
 Thu Aug  1 07:21:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 

mc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mc
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -58,6 +58,7 @@ Patch69:        mc-extd-xdg.patch
 Patch71:        mc-ext-audio.patch
 Patch100:       xls2csv_update.patch
 Patch101:       sftp_interactive_password.patch
+Patch102:       mc-no-common.patch
 BuildRequires:  audiofile-devel
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gettext >= 0.18.1
@@ -114,6 +115,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64`  %{SOU
 %patch60 -p1
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
 
 %build
 autoreconf -fvi