diff --git a/app-office/libreoffice/libreoffice-6.2.4.1.recipe b/app-office/libreoffice/libreoffice-6.2.4.2.recipe similarity index 85% rename from app-office/libreoffice/libreoffice-6.2.4.1.recipe rename to app-office/libreoffice/libreoffice-6.2.4.2.recipe index acd41eaab..07adbd2ac 100644 --- a/app-office/libreoffice/libreoffice-6.2.4.1.recipe +++ b/app-office/libreoffice/libreoffice-6.2.4.2.recipe @@ -21,11 +21,12 @@ REVISION="1" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" -CHECKSUM_SHA256="7c6ec58d0b35f0791aa6771a98e9e45bbb8abed0a782fbbe0e3dea0ffc44266b" +CHECKSUM_SHA256="0c67e692fd2f87d73c6de5ffd44028c7e89d22e8cdcc93204bd0b9629e65085a" -#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" -#CHECKSUM_SHA256_2="4e7d6943c1ab8350cf9300825c69d95592d3b066ee78738e02581977fbde1d3f" -#SOURCE_DIR_2="translations-libreoffice-$portVersion" +SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" +CHECKSUM_SHA256_2="a1dd07cc8acf0ccf295b425c9a1799488d25cb00abc33ecc609f97c02ee9e89a" +SOURCE_DIR_2="translations-libreoffice-$portVersion" +SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" PATCHES="libreoffice-$portVersion.patchset" ADDITIONAL_FILES=" @@ -41,6 +42,7 @@ SECONDARY_ARCHITECTURES="x86" fi boostMinimumVersion=1.65.1 +libreofficeLanguages="ru de es fr it pl ja" PROVIDES=" libreoffice$secondaryArchSuffix = $portVersion @@ -138,12 +140,15 @@ REQUIRES=" # libreoffice$secondaryArchSuffix == $portVersion base #" # -#PROVIDES_lang=" -# libreoffice${secondaryArchSuffix}_lang = $portVersion -# " -#REQUIRES_lang=" -# libreoffice$secondaryArchSuffix == $portVersion base -#" + +for lang in $libreofficeLanguages; do +eval "PROVIDES_$lang=\"\ + libreoffice${secondaryArchSuffix}_${lang} = $portVersion\ + \"; \ +REQUIRES_$lang=\"\ + libreoffice$secondaryArchSuffix == $portVersion base\ + \"" +done BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -260,16 +265,14 @@ BUILD() cd .. ; mv core-libreoffice-$portVersion core ln -s core core-libreoffice-$portVersion; cd core - #rm -rf translations - #ln -s $sourceDir2 translations + rm -rf translations + ln -s $sourceDir2 translations pkgconfig_libdir="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" pkgconfig_datadir="`finddir B_SYSTEM_DIRECTORY`/$relativeDataDir/pkgconfig" export PKG_CONFIG_LIBDIR="$pkgconfig_libdir:$pkgconfig_datadir" - #--enable-symbols \ - #--with-lang=ALL - runConfigure ./autogen.sh \ + ./autogen.sh \ --with-distro=LibreOfficeHaiku \ --enable-kde5 \ --enable-qt5 \ @@ -296,7 +299,8 @@ BUILD() --without-doxygen \ --without-helppack-integration \ --without-java \ - --without-system-jars + --without-system-jars \ + --with-lang="$libreofficeLanguages" make $jobArgs build-nocheck } @@ -310,31 +314,47 @@ INSTALL() # make sure we do not copy default profile rm -rf $appDir/user - rm -rf $appDir/share/xdg # packageEntries galleries \ # $appDir/share/gallery $appDir/presets/gallery -# -# langs=`ls $appDir/program/resource` -# declare -a files -# declare -a filesToPackage -# for lang in $langs; do -# files=("${files[@]}" "$appDir/program/resource/$lang") -# files=("${files[@]}" "$appDir/share/autotext/$lang") -# files=("${files[@]}" "$appDir/share/autocorr/$lang") -# files=("${files[@]}" "$appDir/share/registry/res/registry_$lang.xcd") -# files=("${files[@]}" "$appDir/share/registry/res/fcfg_langpack_$lang.xcd") -# files=("${files[@]}" "$appDir/share/registry/Langpack_$lang.xcd") -# files=("${files[@]}" "$appDir/readme/README_$lang") -# for f in $files; do -# if [ -f $f ]; then -# filesToPackage=("${filesToPackage[@]}" "$f") -# fi -# done -# done -# -# packageEntries lang ${filesToPackage[@]} + + allLanguages=`ls $appDir/program/resource` + + declare -a files + declare -a filesToPackage + for lang in $libreofficeLanguages; do + unset files + unset filesToPackage + + files=("${files[@]}" "$appDir/program/resource/$lang") + files=("${files[@]}" "$appDir/share/autotext/$lang") + files=("${files[@]}" "$appDir/share/autocorr/$lang") + files=("${files[@]}" "$appDir/share/registry/res/registry_$lang.xcd") + files=("${files[@]}" "$appDir/share/registry/res/fcfg_langpack_$lang.xcd") + files=("${files[@]}" "$appDir/share/registry/Langpack_$lang.xcd") + files=("${files[@]}" "$appDir/readme/README_$lang") + + needToPackage=0 + for item in $allLanguages; do + if [ "$item" = "$lang" ]; then + needToPackage=1 + break + fi + done + + for f in ${files[@]}; do + if [ -f $f ] || [ -d $f ]; then + filesToPackage=("${filesToPackage[@]}" "$f") + fi + done + + if [ "$needToPackage" = "1" ]; then + packageEntries $lang ${filesToPackage[@]} + else + rm -rf ${filesToPackage[@]} + fi + done mkdir -p $postInstallDir cp $portDir/additional-files/create_buildid.sh $postInstallDir diff --git a/app-office/libreoffice/patches/libreoffice-6.2.4.1.patchset b/app-office/libreoffice/patches/libreoffice-6.2.4.2.patchset similarity index 100% rename from app-office/libreoffice/patches/libreoffice-6.2.4.1.patchset rename to app-office/libreoffice/patches/libreoffice-6.2.4.2.patchset