commit: a1ae67275707d149aaf6daba5387dcbb2d94325c Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> AuthorDate: Sun Oct 11 08:19:51 2020 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Sun Oct 11 08:19:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ae6727
x11-misc/e16menuedit2: fix build with -fno-common Closes: https://bugs.gentoo.org/707426 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild | 7 +++++-- .../e16menuedit2/files/e16menuedit2-no-common.patch | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild index e0d251548c5..9c379752fcb 100644 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-no-default-docs.patch" + "${FILESDIR}/${PN}-no-common.patch" +) src_prepare() { sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch new file mode 100644 index 00000000000..4ac213b101f --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch @@ -0,0 +1,20 @@ +--- e16menuedit2-0.0.3/src/e16menu.h.orig 2020-10-11 10:41:36.827021380 +0300 ++++ e16menuedit2-0.0.3/src/e16menu.h 2020-10-11 10:51:27.043070842 +0300 +@@ -45,6 +45,6 @@ + gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer user_data); + +-gchar *menu_file[MAX_RECURSION]; ++extern gchar *menu_file[MAX_RECURSION]; + + #endif /* _E16MENU_H */ +--- e16menuedit2-0.0.3/src/e16menu.c.orig 2005-02-18 15:09:55.000000000 +0300 ++++ e16menuedit2-0.0.3/src/e16menu.c 2020-10-11 10:51:52.615152314 +0300 +@@ -34,6 +34,7 @@ + #include "treeview.h" + + extern struct global_variables gv; ++gchar *menu_file[MAX_RECURSION]; + + GtkTreeModel *load_menus_from_disk (void) + {
