Remove unnecessary nabia patches

helpers/DATA/mate-menus/nabia_mate-menus_fix_based_on_39c1188.patch

-From 39c11887c2fc8098eff2fa77163f85b90df6212a Mon Sep 17 00:00:00 2001
-From: rbuj <robert.buj@gmail.com>
-Date: Mon, 2 Mar 2020 11:08:07 +0100
-Subject: [PATCH] Do not collect the translation for Icon
-
----
- desktop-directories/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
-index 042899d..4e166bf 100644
---- a/desktop-directories/Makefile.am
-+++ b/desktop-directories/Makefile.am
-@@ -29,7 +29,7 @@ directory_in_files = \
- directory_DATA = $(directory_in_files:.directory.in=.directory)
- 
- %.directory: %.directory.in
--	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- EXTRA_DIST= $(directory_in_files)
- 

helpers/DATA/mate-panel/nabia_mate-panel_fix_based_on_6749f0b.patch

-From 6749f0b63fbbb49f15b2591e37a24e2199897d03 Mon Sep 17 00:00:00 2001
-From: rbuj <robert.buj@gmail.com>
-Date: Mon, 2 Mar 2020 10:03:36 +0100
-Subject: [PATCH] Do not collect the translation for Icon
-
----
- applets/clock/Makefile.am             | 2 +-
- applets/fish/Makefile.am              | 2 +-
- applets/notification_area/Makefile.am | 2 +-
- applets/wncklet/Makefile.am           | 2 +-
- mate-panel/Makefile.am                | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
-index 5247f63ac..55f94e935 100644
---- a/applets/clock/Makefile.am
-+++ b/applets/clock/Makefile.am
-@@ -136,7 +136,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
- 		$< > $@
- 
- $(applet_DATA): $(applet_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- if !CLOCK_INPROCESS
- servicedir       = $(datadir)/dbus-1/services
-diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
-index f5cfbf78e..814d5d8cb 100644
---- a/applets/fish/Makefile.am
-+++ b/applets/fish/Makefile.am
-@@ -51,7 +51,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
- 		$< > $@
- 
- $(applet_DATA): $(applet_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- if !FISH_INPROCESS
- servicedir       = $(datadir)/dbus-1/services
-diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
-index f7b681103..539db550b 100644
---- a/applets/notification_area/Makefile.am
-+++ b/applets/notification_area/Makefile.am
-@@ -74,7 +74,7 @@ applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.deskto
- applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
- 
- $(applet_DATA): $(applet_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- $(applet_in_files): $(applet_in_files).in Makefile
- 	$(AM_V_GEN)sed \
-diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
-index 199238785..b933f81b9 100644
---- a/applets/wncklet/Makefile.am
-+++ b/applets/wncklet/Makefile.am
-@@ -60,7 +60,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
- 		$< > $@
- 
- $(applet_DATA): $(applet_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- if !WNCKLET_INPROCESS
- servicedir       = $(datadir)/dbus-1/services
-diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
-index 91edecf1d..0c6415837 100644
---- a/mate-panel/Makefile.am
-+++ b/mate-panel/Makefile.am
-@@ -291,7 +291,7 @@ desktopdir = $(datadir)/applications
- desktop_in_files = mate-panel.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- $(desktop_DATA): $(desktop_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --template $< -d $(top_srcdir)/po -o $@
- 
- EXTRA_DIST = \
- 	$(ui_FILES) \

helpers/make-mate-menus

@@ -24,9 +24,6 @@ COMPONENT=main
 
 cp $DATA/applications.menu layout/mate-applications.menu
 
-#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
-patch -p1 < $DATA/nabia_mate-menus_fix_based_on_39c1188.patch
-
 changelog "Default layout adapted for Trisquel"
 
 compile

helpers/make-mate-panel

@@ -121,9 +121,6 @@ debian/mate-panel-layout-update.desktop etc/xdg/autostart
 debian/layout-reset usr/share/mate-panel
 EOF
 
-#Fix LP:1891891 Broken icons on localization MATE (only for nabia)
-patch -p1 < $DATA/nabia_mate-panel_fix_based_on_6749f0b.patch
-
 changelog "Changed default layout"
 
 compile