diff --git a/app-office/libreoffice/libreoffice-24.2.3.1.recipe b/app-office/libreoffice/libreoffice-24.2.3.1.recipe index b3bd7c50b..45c610f97 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.1.recipe +++ b/app-office/libreoffice/libreoffice-24.2.3.1.recipe @@ -17,7 +17,7 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2024 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" CHECKSUM_SHA256="0b86dab5e3fc191ce3ea415eed84e3292029f165dac65178c7f851cc9c8ccd81" @@ -29,26 +29,31 @@ CHECKSUM_SHA256_2="024c8e5f1004f1a759a0929f61f0dd6b3e297ce10b1fad17ea9cdf7b42cbd SOURCE_DIR_2="translations-libreoffice-$portVersion" SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" -SOURCE_URI_3="https://dev-www.libreoffice.org/src/dtoa-20180411.tgz#noarchive" -CHECKSUM_SHA256_3="0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4" +SOURCE_URI_3="https://github.com/LibreOffice/dictionaries/archive/refs/tags/libreoffice-$portVersion.tar.gz" +CHECKSUM_SHA256_3="428d1c3aaf59338d2b96e7a731306cc76254007754ccf284d3d5de3c3b59252e" +SOURCE_DIR_3="dictionaries-libreoffice-$portVersion" +SOURCE_FILENAME_3="dictionaries-libreoffice-$portVersion.tar.gz" -SOURCE_URI_4="https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz#noarchive" -CHECKSUM_SHA256_4="471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e" +SOURCE_URI_4="https://dev-www.libreoffice.org/src/dtoa-20180411.tgz#noarchive" +CHECKSUM_SHA256_4="0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4" -SOURCE_URI_5="https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz#noarchive" -CHECKSUM_SHA256_5="09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384" +SOURCE_URI_5="https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz#noarchive" +CHECKSUM_SHA256_5="471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e" -SOURCE_URI_6="https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz#noarchive" -CHECKSUM_SHA256_6="f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45" +SOURCE_URI_6="https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz#noarchive" +CHECKSUM_SHA256_6="09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384" -SOURCE_URI_7="https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz#noarchive" -CHECKSUM_SHA256_7="77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd" +SOURCE_URI_7="https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz#noarchive" +CHECKSUM_SHA256_7="f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45" -srcGitRevision8="cd5a5ee2cc0e3b3a62a5827d22035752ec7813a3" -SOURCE_URI_8="https://github.com/threedeyes/LibreOfficeLauncher/archive/$srcGitRevision8.tar.gz" -CHECKSUM_SHA256_8="5314962ca770369398599e175dc2c35c685d3fc968c9894390490c737036e528" -SOURCE_DIR_8="LibreOfficeLauncher-$srcGitRevision8" -SOURCE_FILENAME_8="LibreOfficeLauncher-$srcGitRevision8.tar.gz" +SOURCE_URI_8="https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz#noarchive" +CHECKSUM_SHA256_8="77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd" + +srcGitRevision9="cd5a5ee2cc0e3b3a62a5827d22035752ec7813a3" +SOURCE_URI_9="https://github.com/threedeyes/LibreOfficeLauncher/archive/$srcGitRevision9.tar.gz" +CHECKSUM_SHA256_9="5314962ca770369398599e175dc2c35c685d3fc968c9894390490c737036e528" +SOURCE_DIR_9="LibreOfficeLauncher-$srcGitRevision9" +SOURCE_FILENAME_9="LibreOfficeLauncher-$srcGitRevision9.tar.gz" PATCHES="libreoffice-$portVersion.patchset" ADDITIONAL_FILES=" @@ -275,15 +280,18 @@ BUILD() export LDFLAGS=$CFLAGS mkdir -p external/tarballs - cp $sourceDir3/dtoa-20180411.tgz external/tarballs - cp $sourceDir4/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz external/tarballs - cp $sourceDir5/dragonbox-1.1.3.tar.gz external/tarballs - cp $sourceDir6/frozen-1.1.1.tar.gz external/tarballs - cp $sourceDir7/zxcvbn-c-2.5.tar.gz external/tarballs + cp $sourceDir4/dtoa-20180411.tgz external/tarballs + cp $sourceDir5/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz external/tarballs + cp $sourceDir6/dragonbox-1.1.3.tar.gz external/tarballs + cp $sourceDir7/frozen-1.1.1.tar.gz external/tarballs + cp $sourceDir8/zxcvbn-c-2.5.tar.gz external/tarballs rm -rf translations ln -s $sourceDir2 translations + rm -rf dictionaries + cp -R $sourceDir3 dictionaries + pkgconfig_libdir="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" pkgconfig_datadir="`finddir B_SYSTEM_DIRECTORY`/$relativeDataDir/pkgconfig" export PKG_CONFIG_LIBDIR="$pkgconfig_libdir:$pkgconfig_datadir" @@ -325,7 +333,11 @@ BUILD() make $jobArgs - pushd $sourceDir8/src + pushd dictionaries + make + popd + + pushd $sourceDir9/src make popd } @@ -335,8 +347,9 @@ INSTALL() appDir=$appsDir/LibreOffice mkdir -p $appDir cp -r instdir/* $appDir + rm -rf $appDir/share/extensions/dict-{zu,te,sw,si,pt-PT,oc,no,lo,gug,gu,ckb,bo,an} mv $appDir/program/soffice.bin $appDir/program/LibreOffice - cp $sourceDir8/src/LibreOffice\ {Calc,Database,Draw,Impress,Math,Writer} $appDir + cp $sourceDir9/src/LibreOffice\ {Calc,Database,Draw,Impress,Math,Writer} $appDir # make sure we do not copy default profile rm -rf $appDir/user $appDir/share/xdg @@ -358,6 +371,7 @@ INSTALL() files=("${files[@]}" "$appDir/program/resource/${lang/-/_}") files=("${files[@]}" "$appDir/share/autotext/$lang") files=("${files[@]}" "$appDir/share/autocorr/$lang") + files=("${files[@]}" "$appDir/share/extensions/dict-$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")