diff options
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 8 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild | 7 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-24.2.7.2.ebuild | 7 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-25.2.1.1.ebuild | 3 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 5 |
5 files changed, 19 insertions, 11 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d433e15a99de..914bba925d47 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -43,8 +43,8 @@ DIST libreoffice-help-25.2.1.1.tar.xz 60009560 BLAKE2B b7eaf634a45032a331f548028 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz 14368844 BLAKE2B 2ed86c0e418474e496e340007f827c14f4340c08fcf4ae6bed299e0550489ada1c1b644a18163fe08b9ddc5d9eaa9e042db20ae7898fb036609df693c8bdebac SHA512 8739b2e8b578accae14928473fb479d7014e9181dc7f363230282d4282f950f1006b2bcd746c12028fb86aeffdfd7d837435d09480cfe94714e81f8365dcf954 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 -EBUILD libreoffice-24.2.7.2-r1.ebuild 19752 BLAKE2B 0831905d1ee2405679dcbd331cb56cdf1631c13d765bdd688857383708c0451465bed8a2c13ace2b81ed4f1736848efaf36a18ee262c014cb55685498348c635 SHA512 97208802ef35470c9893d7d4d91666c3275be2e19199dca4a3e1ec39f022190f7695a32477e4df2a392ac3145497a7665a7fce4c364b2cec4217020a552db8a1 -EBUILD libreoffice-24.2.7.2.ebuild 20853 BLAKE2B 71afdc1cdf38175977cfea3ca74aafd1c5202c0b999ba4737d22b0bd08cab1606ab33eca0fb595c3ab340450f18b2be835feb758dd0046938fb349d85dbbe424 SHA512 1e8fa50c35b265be2c59920baf8b9ecf9666a5f42eabc15e16fd9730bdc29cd741e5e62bf414fbfdf1e4f7b17e31cb445d4c29784551ea50e668fb619156cc91 -EBUILD libreoffice-25.2.1.1.ebuild 21440 BLAKE2B c2eabc63d0d62abb316263d013c74a7cee5de4b429e50dab6827316b3b191555a862f7e01701df264d36f96636d35d25b7ae099af94356542e87f95c8453d59a SHA512 463b96757bf7f1b9f91b3f19951ec821da942c0c234ea781702e8302ba35ffdc38d60c5a0ddc0102f07ecd56af3bc62e48f284b11534620cc61b5188ac8a0c1d -EBUILD libreoffice-9999.ebuild 21440 BLAKE2B c2eabc63d0d62abb316263d013c74a7cee5de4b429e50dab6827316b3b191555a862f7e01701df264d36f96636d35d25b7ae099af94356542e87f95c8453d59a SHA512 463b96757bf7f1b9f91b3f19951ec821da942c0c234ea781702e8302ba35ffdc38d60c5a0ddc0102f07ecd56af3bc62e48f284b11534620cc61b5188ac8a0c1d +EBUILD libreoffice-24.2.7.2-r1.ebuild 19820 BLAKE2B 7778f16a6688b5108af8dd7bcc9a6c7618b517b89902e7303a2384e289aef08481641f56128d2d71fcce2c43cfb409a8220bfdd741597913a543b6b9ffc4707d SHA512 79a9efe944531aaed3f6e62e7d817a3ca14b67e7dfe16547c798600a43d2202437c215988688eb0563272f019525c3e22bf3d1127967f186a1e0af3a0c8a46c2 +EBUILD libreoffice-24.2.7.2.ebuild 20921 BLAKE2B a4b898a5a10cb865aca063965c3323c17d7fb30dbc63a09942346dd1d716aa49ad667fd563a1648d18c6860c652f2619d1ce179dcf8cea300a8584cedd73e2ac SHA512 86a9b4898ea1d95fbf16a0d6ecaedcfecef2938d7a97bb2d29208f1baed5a175418c6acfd45d9fbdb4fa408d9a32f3c2de244ea5173f1e20ed35f0470d111758 +EBUILD libreoffice-25.2.1.1.ebuild 21572 BLAKE2B 2be31d8bc7918cb517b87537988725ffe6b2bdf78aaad458b37f984846006473e0cbb71466960db1825503459d8142d4020b126b350e2024da91d3ee409564c7 SHA512 df61e4437d22383b26e775e8ec80c36058abef7550ec7f988237314873f7d55805fca80fa28f6a73139435607fe2b10f5f4ac988d97ac34f8ede34ff9625ad95 +EBUILD libreoffice-9999.ebuild 21572 BLAKE2B 830445f184124d6f57ea5fe13fbfba9438780fb105a9b590556cc009680a3c5a9a5522d44cd7bbfab90e9027069e730791865d1aada588aec65fdc39d2b643ec SHA512 ff7f2f3c513a5d8ec8a6f23036204e112778f31e6da650e0371e3573afc19583a09123f6ca2764e7930879649b0618496af2c73aa448698a0b0d7f37f249e096 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild index b1e492d38a7f..855a2250d08e 100644 --- a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild @@ -412,9 +412,6 @@ src_configure() { RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" - # Workaround for bug #907905 - filter-lto - # Not implemented by Clang, bug #903889 filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch else @@ -431,6 +428,10 @@ src_configure() { sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die fi + # ODR violations (not just in skia/vulkan): bug #916435 + # Runtime crashes with Clang: bug #907905 + filter-lto + if use custom-cflags ; then elog "USE=custom-cflags has been selected. You are on your own to make sure that" elog "the build succeeds. Good luck!" diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild index 1d23a5c8bf96..55225b6e3690 100644 --- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild @@ -442,9 +442,6 @@ src_configure() { RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" - # Workaround for bug #907905 - filter-lto - # Not implemented by Clang, bug #903889 filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch else @@ -461,6 +458,10 @@ src_configure() { sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die fi + # ODR violations (not just in skia/vulkan): bug #916435 + # Runtime crashes with Clang: bug #907905 + filter-lto + if use custom-cflags ; then elog "USE=custom-cflags has been selected. You are on your own to make sure that" elog "the build succeeds. Good luck!" diff --git a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild index 40944770c7f7..53bd4a8178d4 100644 --- a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi tc-is-lto && myeconfargs+=( --enable-lto ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 40944770c7f7..bde82a65e131 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -227,7 +227,7 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 + dev-util/mdds:1/3.0 media-libs/glm x11-base/xorg-proto x11-libs/libXt @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi tc-is-lto && myeconfargs+=( --enable-lto ) |