From 34e34694a26d853712ec942638e6768444985982 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 19 Dec 2020 12:15:53 +1000
Subject: [PATCH] LibreOffice: fix build 6.4.7.2 version (6.x for 32bit only)

---
 ....7.2.recipe => libreoffice-6.4.7.2.recipe} | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
 rename app-office/libreoffice/{libreoffice6-6.4.7.2.recipe => libreoffice-6.4.7.2.recipe} (96%)

diff --git a/app-office/libreoffice/libreoffice6-6.4.7.2.recipe b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
similarity index 96%
rename from app-office/libreoffice/libreoffice6-6.4.7.2.recipe
rename to app-office/libreoffice/libreoffice-6.4.7.2.recipe
index 50106ab3d..50e76ecdc 100644
--- a/app-office/libreoffice/libreoffice6-6.4.7.2.recipe
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
@@ -17,7 +17,7 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2020 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="1"
+REVISION="2"
 
 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"
@@ -42,16 +42,15 @@ ADDITIONAL_FILES="
 	"
 
 POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh"
+# Build for secondary arch only
 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
-fi
 
 boostMinimumVersion=1.69.0
 libreofficeLanguages="af ar be bg bn br brx bs ca ca-valencia cs cy da de dsb el en-GB en-ZA eo es et eu fa fi fr fy ga gd gl he hi hr hu id is it ja ka kk kmr-Latn ko lb lt lv mk mn nb ne nl nn pl pt pt-BR ro ru sa-IN sd sk sl sq sr sr-Latn sv szl tg th tr tt ug uk uz vi zh-CN zh-TW"
 
 PROVIDES="
-	libreoffice6$secondaryArchSuffix = $portVersion
+	libreoffice$secondaryArchSuffix = $portVersion
 	app:LibreOffice$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
@@ -141,20 +140,20 @@ REQUIRES="
 
 ARCHITECTURES_galleries="any"
 PROVIDES_galleries="
-	libreoffice6${secondaryArchSuffix}_galleries = $portVersion
+	libreoffice${secondaryArchSuffix}_galleries = $portVersion
 	"
 REQUIRES_galleries="
-	libreoffice6$secondaryArchSuffix == $portVersion base
+	libreoffice$secondaryArchSuffix == $portVersion base
 	"
 
 for lang in $libreofficeLanguages; do
 typeset -l langcode
 langcode=${lang/-/_}
 eval "PROVIDES_${langcode}=\"\
-	libreoffice6${secondaryArchSuffix}_${langcode} = $portVersion\
+	libreoffice${secondaryArchSuffix}_${langcode} = $portVersion\
 	\"; \
 REQUIRES_${langcode}=\"\
-	libreoffice6$secondaryArchSuffix == $portVersion base\
+	libreoffice$secondaryArchSuffix == $portVersion base\
 	\"; \
 DESCRIPTION_${langcode}=\"Translations for the Libreoffice suite ($lang)\"; \
 ARCHITECTURES_${langcode}=\"any\""
@@ -325,8 +324,9 @@ INSTALL()
 	mv $sourceDir3/src/LibreOffice\ {Calc,Database,Draw,Impress,Math,Writer} $appDir
 
 	# make sure we do not copy default profile
-	rm -rf $appDir/user
-	rm -rf $appDir/share/xdg
+	rm -rf $appDir/user $appDir/share/xdg
+
+	mkdir -p "$dataDir/deskbar/menu/Applications/LibreOffice"
 
 	packageEntries galleries \
 		$appDir/share/gallery $appDir/presets/gallery
@@ -376,6 +376,7 @@ INSTALL()
 
 	addResourcesToBinaries $sourceDir/../core/libreoffice.rdef \
 		$appDir/program/LibreOffice
+	mimeset -f $appDir/program/LibreOffice
 
 	addAppDeskbarSymlink $appDir/program/LibreOffice "LibreOffice/LibreOffice"
 	addAppDeskbarSymlink "$appDir/LibreOffice Calc" "LibreOffice/LibreOffice Calc"