gentoo resync : 25.11.2020

3 files changed, 27 insertions, 3 deletions

diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
index fda795ad437d..745b98c74218 100644
--- a/x11-misc/e16menuedit2/Manifest
+++ b/x11-misc/e16menuedit2/Manifest
@@ -1,4 +1,5 @@
+AUX e16menuedit2-no-common.patch 725 BLAKE2B 48a150bc33e3baac1a8bbc2f18d560ffe0a67a5a65a57633e7255c554fa9eed9f4201e775742416163ae0af4a805d0a113b6c0be2730091376d61cb9916da1ef SHA512 d99db1bd84c47369f98f2caff216cbdd9c2e10d35eed243ed0971c2f533ed26aa3a93d09a01f4fdce4c15a80416892f74f94d5168d74fa5183aacb6ddb8cea1a
 AUX e16menuedit2-no-default-docs.patch 461 BLAKE2B 87453feb85cff012e821ca86c477bd413e416dffc5893fe1f98121e6090ac73f28d47a8fe1bfb8d93388fc39373433544f988bfa52f62e322a2b261a90d9f717 SHA512 64b115434428a5632f9a2d0c28159a65136cbb106060275e57401018d9c574e68a461dca4f31e4949d089a92c86bca37433c5c0e660b085a495f8baa0f001088
 DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
-EBUILD e16menuedit2-0.0.3.ebuild 705 BLAKE2B a6571e4fda94fc85de53823fb2104306f75195d5f7e621b446c1e1927f8b549358af0db3b7145dee9d6cd8ebcc13978eda820f08eb0cb016e26b486f1e748931 SHA512 1dc4104b494c3291512c91ad562ad2dbd1f37022707805115c4cbfcb75256ce0c764d2e0ec11b1512197ce6373c232a738261c80feefceecd1a5eef5b7b065d1
+EBUILD e16menuedit2-0.0.3.ebuild 743 BLAKE2B 7e65d1af263553478aeb2e29e4588bcad58a10c69a1388580b980671627cc5392d03ae0bff989fe288a37d4d511d7ab01337fde2afb4222b99ad1b118dabfdb7 SHA512 2449d10ba1aed5e85c1568b25afd29641acc6bf72c88584533b4ca27561a9a19694a082b25ba25afde1d424b183f288d2103add7a51d837c6d5143df6bc6844f
 MISC metadata.xml 343 BLAKE2B 295618490636872ce0aff5266028733087db75ec585d604a9908afe1cfa49e4101778badbc3dded2717e733fa76b879a4fbb58070b3e2e1e09268a871eb7bb8c SHA512 200efaf51e5c6746fa854a10d1d63348695db4da86091cd50ef01a9fd4b7d46cda9c79f257fdf337911d276fc2f95ca17dc05070a252f7eaa1fc3bb9eb2c1071
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index e0d251548c59..9c379752fcbb 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 000000000000..4ac213b101f9
--- /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)
+ {