diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/Manifest.gz | bin | 8436 -> 8436 bytes | |||
| -rw-r--r-- | app-office/calligra/Manifest | 2 | ||||
| -rw-r--r-- | app-office/calligra/calligra-4.0.1-r1.ebuild | 152 | ||||
| -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 |
8 files changed, 19 insertions, 165 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 05332c62e4ff..315adeefb014 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 4a18a216e21a..0a41b06322b3 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,6 +1,4 @@ DIST calligra-24.12.2.tar.xz 57908508 BLAKE2B a3ec522b4ecfbc93bca2b147bc4302c64c3132c1d01916a8501ddac8df2972ef8688f42afe57eaf86cd6fde64841b3c22ba05dca98fef5a3a9dcd7f327d10e23 SHA512 54a59d4cbd3d22e3834a50a53693211689234158ff1a95732820c4b939a214e295bf7b51e07494f3d3df1defb5e6789ab70801717d578d54fa2fa71efd65b9e9 DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc -DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78 EBUILD calligra-24.12.2.ebuild 4212 BLAKE2B 864a6105a4db5aeae00ad83c66453a6bb0462d3d1f8547820249d7ab3dc1d0edbaa4d7440533901ad41ca49f211929a1e012cba1736c24f50d36e271ea1670e2 SHA512 f88c1369735be12307065b9e4f92816ca5568c8a568fc762e9711b3d1abbba952c433c1e1d3b6d4364c69ce07e1abeb0312b2a228180993e2c77eb248827850e -EBUILD calligra-4.0.1-r1.ebuild 4352 BLAKE2B d878f1ca636b9ea88db9b3b6fcabe7614906a60ff402eebbc151bde9319a4b42a1b810c0ad1596a7cf1a6b6c7f80e368f9d20cfdd751573ca6d2fa54f915f9ef SHA512 c8532c2b8ee4e2cc6e7c5dddcefbbbeeaab8f114f689d6cdf85ce091940ccd8768cf5ed904099017a6c96af79eaf2ef591995ccedc7d4c480827ffdab6e2c828 MISC metadata.xml 1183 BLAKE2B e5638f8f33c220b6c44a10a8ffb8bee7bcb9b1a387a0d69bdaca8778f9700baf6090ae997d4b13acc1702a98b0aaa8ac1aae479125c5386cdc42585ea079738f SHA512 7284037a405494efe0a270a19c39ee45843ccd13ebd44ce633c40cb43ac53fa93795317a4716a7e225ed4106a5518b5167200dfc8219836cb17ac2dfe84e8ba9 diff --git a/app-office/calligra/calligra-4.0.1-r1.ebuild b/app-office/calligra/calligra-4.0.1-r1.ebuild deleted file mode 100644 index 1455b0a69e42..000000000000 --- a/app-office/calligra/calligra-4.0.1-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CHECKREQS_DISK_BUILD="4G" -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit check-reqs ecm kde.org - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://calligra.org/" - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -PATCHSET="${PN}-3.2.1-patchset-1" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - -CAL_FTS=( karbon sheets stage words ) - -LICENSE="GPL-2" -SLOT="0" -IUSE="+charts +fontconfig gsl +import-filter +lcms okular +pdf phonon - +truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" - -RESTRICT="test" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -COMMON_DEPEND=" - dev-lang/perl - dev-libs/openssl:= - >=dev-libs/qtkeychain-0.14.2:=[qt6(-)] - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=dev-qt/qtsvg-${QTMIN}:6 - >=dev-qt/qttools-${QTMIN}:6[designer] - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/sonnet-${KFMIN}:6 - sys-libs/zlib - virtual/libiconv - charts? ( dev-libs/kdiagram:6 ) - fontconfig? ( media-libs/fontconfig ) - gsl? ( sci-libs/gsl:= ) - import-filter? ( - app-text/libetonyek - app-text/libodfgen - app-text/libwpd:* - app-text/libwpg:* - >=app-text/libwps-0.4 - dev-libs/librevenge - media-libs/libvisio - ) - lcms? ( media-libs/lcms:2 ) - okular? ( kde-apps/okular:6 ) - pdf? ( app-text/poppler:=[qt6] ) - phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] ) - truetype? ( media-libs/freetype:2 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) - calligra_features_sheets? ( dev-cpp/eigen:3 ) - calligra_features_words? ( dev-libs/libxslt ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - lcms? ( dev-libs/imath:3 ) - test? ( >=kde-frameworks/threadweaver-${KFMIN}:6 ) -" -RDEPEND="${COMMON_DEPEND} - !${CATEGORY}/${PN}:5 - calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - ecm_pkg_setup - check-reqs_pkg_setup -} - -src_configure() { - local cal_ft myproducts - - # applications - for cal_ft in ${CAL_FTS[@]}; do - use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) - done - - use lcms && myproducts+=( PLUGIN_COLORENGINES ) - use okular && myproducts+=( OKULAR ) - - local mycmakeargs=( - -DPACKAGERS_BUILD=OFF - -DRELEASE_BUILD=ON - -DWITH_Iconv=ON - -DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace - -DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON - -DPRODUCTSET="${myproducts[*]}" - $(cmake_use_find_package charts KChart6) - -DWITH_Fontconfig=$(usex fontconfig) - -DWITH_GSL=$(usex gsl) - -DWITH_LibEtonyek=$(usex import-filter) - -DWITH_LibOdfGen=$(usex import-filter) - -DWITH_LibRevenge=$(usex import-filter) - -DWITH_LibVisio=$(usex import-filter) - -DWITH_LibWpd=$(usex import-filter) - -DWITH_LibWpg=$(usex import-filter) - -DWITH_LibWps=$(usex import-filter) - $(cmake_use_find_package phonon Phonon4Qt6) - -DWITH_LCMS2=$(usex lcms) - -DWITH_Okular6=$(usex okular) - -DWITH_Poppler=$(usex pdf) - -DWITH_Eigen3=$(usex calligra_features_sheets) - -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) - -DWITH_Freetype=$(usex truetype) - $(cmake_use_find_package webengine Qt6WebEngineWidgets) - ) - - ecm_src_configure -} 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 ) |