pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 764601 from Base:System

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

OBS-URL: https://build.opensuse.org/request/show/764601
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2020-01-18 11:15:21 +00:00 committed by Git OBS Bridge
commit a5ccbc2ca9
3 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
mc-no-common.patch Normal file
View File

@ -0,0 +1,71 @@
commit 093571938a6c31706f918b011335b8ab30602336
Author: Andrew Borodin <aborodin@vmail.ru>
Date: Sat Nov 23 17:41:58 2019 +0300
Ticket #4035: fix compile failure on OS X 10.9.
Fix duplication of menu_map definition.
Move menu_map definition to lib/widget/menu.c.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
diff --git a/lib/widget/menu.c b/lib/widget/menu.c
index b7476b62b..68ae6f6ce 100644
--- a/lib/widget/menu.c
+++ b/lib/widget/menu.c
@@ -46,7 +46,7 @@
/*** global variables ****************************************************************************/
-const global_keymap_t *menu_map;
+const global_keymap_t *menu_map = NULL;
/*** file scope macro definitions ****************************************************************/
diff --git a/lib/widget/menu.h b/lib/widget/menu.h
index c522a16c8..fad6fa639 100644
--- a/lib/widget/menu.h
+++ b/lib/widget/menu.h
@@ -39,6 +39,8 @@ typedef struct WMenuBar
/*** global variables defined in .c file *********************************************************/
+extern const global_keymap_t *menu_map;
+
/*** declarations of public functions ************************************************************/
menu_entry_t *menu_entry_create (const char *name, long command);
diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c
index 10ba341ee..0ba4840df 100644
--- a/src/keybind-defaults.c
+++ b/src/keybind-defaults.c
@@ -28,7 +28,7 @@
#include <config.h>
#include "lib/global.h"
-#include "lib/widget.h" /* dialog_map, input_map, listbox_map */
+#include "lib/widget.h" /* dialog_map, input_map, listbox_map, menu_map */
#include "keybind-defaults.h"
@@ -56,7 +56,6 @@ GArray *diff_keymap = NULL;
const global_keymap_t *main_map = NULL;
const global_keymap_t *main_x_map = NULL;
const global_keymap_t *panel_map = NULL;
-const global_keymap_t *menu_map = NULL;
const global_keymap_t *tree_map = NULL;
const global_keymap_t *help_map = NULL;
diff --git a/src/keybind-defaults.h b/src/keybind-defaults.h
index edb05c67f..6b7266589 100644
--- a/src/keybind-defaults.h
+++ b/src/keybind-defaults.h
@@ -35,7 +35,6 @@ extern GArray *diff_keymap;
extern const global_keymap_t *main_map;
extern const global_keymap_t *main_x_map;
extern const global_keymap_t *panel_map;
-extern const global_keymap_t *menu_map;
extern const global_keymap_t *tree_map;
extern const global_keymap_t *help_map;

5
mc.changes
View File

@ -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>

4
mc.spec
View File

@ -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