diff options
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/Manifest.gz | bin | 8597 -> 8596 bytes | |||
-rw-r--r-- | app-office/calligra/Manifest | 10 | ||||
-rw-r--r-- | app-office/calligra/calligra-3.2.1-r9.ebuild | 203 | ||||
-rw-r--r-- | app-office/calligra/calligra-4.0.1.ebuild | 153 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch | 19 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.2.1-okularpart.patch | 78 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch | 42 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch | 29 | ||||
-rw-r--r-- | app-office/calligra/metadata.xml | 5 | ||||
-rw-r--r-- | app-office/homebank/Manifest | 4 | ||||
-rw-r--r-- | app-office/homebank/homebank-5.8.2.ebuild | 2 | ||||
-rw-r--r-- | app-office/homebank/homebank-5.8.3.ebuild | 45 | ||||
-rw-r--r-- | app-office/libreoffice/Manifest | 2 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 38 |
14 files changed, 217 insertions, 413 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 17d0511680fe..e482ba0ca908 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 7250174e68a6..aaf7197faca5 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,8 +1,4 @@ -AUX calligra-3.2.1-clang-16-configure.patch 642 BLAKE2B b22130de9e56abbac5a7a146ac3296293f1f612846e61fb19b9a1df626ecfe9ee350291cf2e35b4441335297adeb0257c3b93cccac1019a504fd63e94de265a2 SHA512 65053589a8ef5c269fb96b6493141c448189dc45e3f765955731f9cd64be85d86303c949ca494afca1b303952728a2ca6a4d8cffb798c766037cd4e514697c4f -AUX calligra-3.2.1-okularpart.patch 2641 BLAKE2B 50018ab2b855dc88226b2a23b2eeac858882cbfeb9feca0d50202d951e23c315c4d4a2e225efc697584655dfb6421aeda4c7c48b3c279d7a4b60986acf2e8bdf SHA512 5c7de9bb020d750cb1565c49b9aabf41b622563823a7d3b3c923d00de495fc19357bd53d3a6fb87baf16c3a7cc41a05ccaab2cc6e425e53940aa5f2617dfc0f4 -AUX calligra-3.2.1-poppler-24.05.0.patch 2656 BLAKE2B 489d01bde30c24c80970f6073aa58fa785bfd86186aea45cb1a06e1f8907be0a2ef35e44f90eb14b315b5d55800639b52cf9f53748aca972ca0a4c328c2c455e SHA512 ae4a1c5654453827c65a2e49acbe23904db66f1179b76db47bd96106c56aa008440908ce712c6926a0fa99f33c89bd23d995df95f463075608b15295e2c3c6e2 -AUX calligra-3.2.1-use-cmake-FindGSL-module.patch 975 BLAKE2B 8d9750be1f74d0ad099a9d2f258eb8b1fb73f3a891b7cf2e2822c9f50126aa0aaf21188845b95e37c1fdfa00efb33ec49a8b3b824b148d9df29f1e30e299cebd SHA512 e346c71767a07686d18f64849822f54efd5f70f72e871d8537e46b22a646c2d225800632d01b6cde6afa86bae57b1e329991a1d906648c9328f58f4e3ec3c7ea DIST calligra-3.2.1-patchset-1.tar.xz 11924 BLAKE2B 5a71a7960a6d2a4d5e55129f4812fb13a2fb56613283d4582266e1836f107b711be43cb158e29c440fbda6992c03a3f4907f0600d21522fd9ab07c66354234a9 SHA512 26ec818f2415c43b116b716557710361621e1e4446087fe123e29107f82400ec82f19ab3a76dde9b749ed4b9f15da9c05c3fa6137fc814241c48ffc12f5628fc -DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f -EBUILD calligra-3.2.1-r9.ebuild 6142 BLAKE2B 4ba441db86de6ef7cb1f3acce65f7969e53dd031a8cfa94277b83f1f5006e81042f399098456e4b27199d1652dddbef10972805350e98ba67d4e04e765931ee4 SHA512 4d17b3e68d755970323e3d99b3e11adc0676434ff1c51c5952220412a35ff3406a10dc32324e3a582e2b3fa7e0b70d92163cef0263b9acb3d53d6693158a2580 -MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8 +DIST calligra-4.0.1.tar.xz 57780728 BLAKE2B 0ea82f5b21d36e04222db4ee282048b61a6d144630cc26d007d722fa8fc3081ee38e8f54b7256f9e722cccedc7ddc7489e3a3bd7dff34263d81cd5a7081aa6b2 SHA512 79569a1e75d5c70c8b2c3e5c7cf88d26d9b7a81be52c131c932521c65d1712a531829bcd29f7233f1ee7601fa363ca9ce2c4783a76dfdc5abe3c8b04b5741b78 +EBUILD calligra-4.0.1.ebuild 4412 BLAKE2B 8d674795aee91adee63c147ab2c5cb7120df5d6ecaf12c8209a2167948380dce3633e25d7441d5a529ee27e19b9f065402a4da09301a1293c571d037ce3b211f SHA512 82208e79971a96aa60d9e6ab0cc79281eedb7106a8330379508bc6f59ae2e284dc655fb57afab3fcc76d979e416f69c79d18b7951a5c5dfd34b80b8d14cb010e +MISC metadata.xml 1183 BLAKE2B e5638f8f33c220b6c44a10a8ffb8bee7bcb9b1a387a0d69bdaca8778f9700baf6090ae997d4b13acc1702a98b0aaa8ac1aae479125c5386cdc42585ea079738f SHA512 7284037a405494efe0a270a19c39ee45843ccd13ebd44ce633c40cb43ac53fa93795317a4716a7e225ed4106a5518b5167200dfc8219836cb17ac2dfe84e8ba9 diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild deleted file mode 100644 index 0503c3fba007..000000000000 --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CHECKREQS_DISK_BUILD="4G" -CMAKE_REMOVE_MODULES_LIST=( FindGSL ) -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit check-reqs ecm flag-o-matic kde.org - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://calligra.org/" - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - PATCHSET="${P}-patchset-1" - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" -fi - -CAL_FTS=( karbon sheets stage words ) - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms - okular +pdf phonon spacenav +truetype 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-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - sys-libs/zlib - virtual/libiconv - activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 ) - charts? ( dev-libs/kdiagram:5 ) - crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] ) - fontconfig? ( media-libs/fontconfig ) - gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) - 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? ( || ( - media-gfx/okularpart:5 - kde-apps/okular:5 - ) ) - pdf? ( app-text/poppler:=[qt5] ) - phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) - spacenav? ( dev-libs/libspnav ) - truetype? ( media-libs/freetype:2 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) - 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}:5 ) -" -RDEPEND="${COMMON_DEPEND} - calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) - gemini? ( - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" -BDEPEND="sys-devel/gettext" - -PATCHES=( - "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch - "${WORKDIR}"/${PATCHSET}/${P}-cmake-3.16.patch # bug 796224 - "${WORKDIR}"/${PATCHSET}/${P}-{openexr-3,imath-{1,2}}.patch - "${WORKDIR}"/${PATCHSET}/${P}-cxx17-for-poppler-22.patch - "${WORKDIR}"/${PATCHSET}/${P}-cxx17-fixes.patch - "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.03.0-{1,2}.patch - "${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch - "${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch - "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 - "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 - "${FILESDIR}"/${P}-clang-16-configure.patch - "${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490 -) - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - ecm_pkg_setup - check-reqs_pkg_setup -} - -src_prepare() { - if has_version "media-gfx/okularpart:5"; then - eapply "${FILESDIR}/${P}-okularpart.patch" - fi - - ecm_src_prepare - - # Unconditionally disable deprecated deps (required by QtQuick1) - ecm_punt_bogus_dep Qt5 Declarative - ecm_punt_bogus_dep Qt5 OpenGL -} - -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 ) - use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) - - 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 - -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kross=ON - -DPRODUCTSET="${myproducts[*]}" - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package charts KChart) - -DWITH_Qca-qt5=$(usex crypt) - -DWITH_Fontconfig=$(usex fontconfig) - $(cmake_use_find_package gemini Libgit2) - $(cmake_use_find_package gemini Qt5QuickWidgets) - -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 Phonon4Qt5) - -DWITH_LCMS2=$(usex lcms) - -DWITH_Okular5=$(usex okular) - -DWITH_Poppler=$(usex pdf) - -DWITH_Eigen3=$(usex calligra_features_sheets) - -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) - -DWITH_Freetype=$(usex truetype) - ) - - ecm_src_configure -} diff --git a/app-office/calligra/calligra-4.0.1.ebuild b/app-office/calligra/calligra-4.0.1.ebuild new file mode 100644 index 000000000000..f27d1244b2d1 --- /dev/null +++ b/app-office/calligra/calligra-4.0.1.ebuild @@ -0,0 +1,153 @@ +# 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 +crypt +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/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 ) + crypt? ( dev-libs/openssl:= ) + 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) + $(cmake_use_find_package crypt OpenSSL) + -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/calligra/files/calligra-3.2.1-clang-16-configure.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch deleted file mode 100644 index c723eca0b75f..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-clang-16-configure.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://invent.kde.org/office/calligra/-/merge_requests/81 -https://invent.kde.org/office/calligra/-/commit/30c905a6a34ad656446839c844abb78a2aa3f586 - -From 30c905a6a34ad656446839c844abb78a2aa3f586 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Wed, 19 Apr 2023 10:34:25 +0200 -Subject: [PATCH] Avoid implicit declaration of atoi in CMake check - -Future compilers will not support implicit function declarations by -default, so include <stdlib.h> for a declaration of atoi. ---- a/cmake/TestModernZlib.c -+++ b/cmake/TestModernZlib.c -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <string.h> - #include <zlib.h> - --- -GitLab diff --git a/app-office/calligra/files/calligra-3.2.1-okularpart.patch b/app-office/calligra/files/calligra-3.2.1-okularpart.patch deleted file mode 100644 index 75a3b0d05416..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-okularpart.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e3b1fe06a2593edcaf33f106b2f77679cd1ea9c8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 15 Mar 2024 12:39:45 +0100 -Subject: [PATCH] Switch okular headers to okular5 - -Otherwise it will be using okular6's. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - extras/okularodpgenerator/OkularOdpGenerator.cpp | 2 +- - extras/okularodpgenerator/OkularOdpGenerator.h | 6 +++--- - extras/okularodtgenerator/OkularOdtGenerator.cpp | 2 +- - extras/okularodtgenerator/OkularOdtGenerator.h | 6 +++--- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/extras/okularodpgenerator/OkularOdpGenerator.cpp b/extras/okularodpgenerator/OkularOdpGenerator.cpp -index 823d039b3b0..a4614f38f6b 100644 ---- a/extras/okularodpgenerator/OkularOdpGenerator.cpp -+++ b/extras/okularodpgenerator/OkularOdpGenerator.cpp -@@ -33,7 +33,7 @@ - #include <KoDocumentInfo.h> - #include <KoGlobal.h> - --#include <okular/core/page.h> -+#include <okular5/core/page.h> - - #include <KLocalizedString> - -diff --git a/extras/okularodpgenerator/OkularOdpGenerator.h b/extras/okularodpgenerator/OkularOdpGenerator.h -index 9107c52c52b..5564ec7f881 100644 ---- a/extras/okularodpgenerator/OkularOdpGenerator.h -+++ b/extras/okularodpgenerator/OkularOdpGenerator.h -@@ -22,9 +22,9 @@ - - #include "kookulargenerator_odp_export.h" - --#include <okular/core/generator.h> --#include <okular/core/document.h> --#include <okular/core/version.h> -+#include <okular5/core/generator.h> -+#include <okular5/core/document.h> -+#include <okular5/core/version.h> - - class KoPADocument; - -diff --git a/extras/okularodtgenerator/OkularOdtGenerator.cpp b/extras/okularodtgenerator/OkularOdtGenerator.cpp -index 9ba114d6080..bccfb11a068 100644 ---- a/extras/okularodtgenerator/OkularOdtGenerator.cpp -+++ b/extras/okularodtgenerator/OkularOdtGenerator.cpp -@@ -41,7 +41,7 @@ - #include <KoTextLayoutRootArea.h> - #include <KoCharAreaInfo.h> - --#include <okular/core/page.h> -+#include <okular5/core/page.h> - - - OkularOdtGenerator::OkularOdtGenerator( QObject *parent, const QVariantList &args ) -diff --git a/extras/okularodtgenerator/OkularOdtGenerator.h b/extras/okularodtgenerator/OkularOdtGenerator.h -index d3e9692b385..994a81aae2c 100644 ---- a/extras/okularodtgenerator/OkularOdtGenerator.h -+++ b/extras/okularodtgenerator/OkularOdtGenerator.h -@@ -22,9 +22,9 @@ - - #include "kookulargenerator_odt_export.h" - --#include <okular/core/generator.h> --#include <okular/core/document.h> --#include <okular/core/version.h> -+#include <okular5/core/generator.h> -+#include <okular5/core/document.h> -+#include <okular5/core/version.h> - - class KWDocument; - --- -2.44.0 - diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch deleted file mode 100644 index 2ef45d675e3b..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt ---- calligra-3.2.1-orig/CMakeLists.txt 2024-06-05 13:06:55.730007129 +0200 -+++ calligra-3.2.1-dwok/CMakeLists.txt 2024-06-05 13:08:00.587082911 +0200 -@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) - endif() - message(STATUS "Release build: ${RELEASE_BUILD}") - --set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 -+set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04 - - ############ - ############# -diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h ---- calligra-3.2.1-orig/libs/pigment/lut.h 2024-06-05 13:06:55.922010313 +0200 -+++ calligra-3.2.1-dwok/libs/pigment/lut.h 2024-06-05 13:09:24.460474108 +0200 -@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32; - template<> \ - class LutKey<_INT_TYPE_> { \ - public: \ -- LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ -+ LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ - { \ - } \ - public: \ -@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3 - template<> \ - class FullLutKey<_INT_TYPE_> { \ - public: \ -- FullLutKey<_INT_TYPE_>() \ -+ FullLutKey() \ - { \ - } \ - public: \ -@@ -233,7 +233,7 @@ class LutKey<float> { - float f; - }; - public: -- LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) -+ LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) - { - // Those values where computed using the test_linear and setting the shift and then using - // the standard deviation. diff --git a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch deleted file mode 100644 index 07e31a0ed77d..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001 -From: Dan Leinir Turthra Jensen <admin@leinir.dk> -Date: Thu, 29 Apr 2021 13:02:39 +0100 -Subject: [PATCH] Fix GSL find module - -This increases the CMake requirement to 3.2 so we can use the GSL find -module that ships with CMake since then. The custom find module -apparently doesn't work right on Windows, so... ---- - sheets/plugins/solver/CMakeLists.txt | 4 +- - 1 filee changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt -index 41bc4a77ae9..ecd4bd8d218 100644 ---- a/sheets/plugins/solver/CMakeLists.txt -+++ b/sheets/plugins/solver/CMakeLists.txt -@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop) - - - target_link_libraries( sheetssolver -- ${GSL_LIBRARIES} -- ${GSL_CBLAS_LIBRARIES} -+ GSL::gsl -+ GSL::gslcblas - calligrasheetscommon - ) - --- -GitLab diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index b581a8d5393a..e6dded498c02 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -12,15 +12,14 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> <remote-id type="cpe">cpe:/a:calligra:calligra</remote-id> + <remote-id type="kde-invent">office/calligra</remote-id> </upstream> <use> - <flag name="activities">Enable kactivities support</flag> <flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag> - <flag name="gemini">Enable tablet and 2:1 devices support</flag> <flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> <flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag> <flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag> <flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag> - <flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag> + <flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag> </use> </pkgmetadata> diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest index c647eff174f7..04d5ec835866 100644 --- a/app-office/homebank/Manifest +++ b/app-office/homebank/Manifest @@ -1,5 +1,7 @@ DIST homebank-5.8.1.tar.gz 3722739 BLAKE2B 23042c8fc952faf2da039934f4b82c9c5949649647bac1861cf291dc360929911316fa912e676bd1b2d87f7290e0b6a4fdce035b1e7ca6558bf613365f71e8d6 SHA512 900228b813c79bd4a5f1257a51e422e4748c7b7e9945d6d9c72c04097caf2275dd8294fd901a55fa6110c8c75be418e89a3a541a3350d350ef01b052e0cfb1f6 DIST homebank-5.8.2.tar.gz 3771644 BLAKE2B b660ebbab36ce7f42f9db662e0f2dc62fbac425ea91e2335bbcea14bce799f6b2e79fe130a56e47880cf0b55c86095fecc1b9583f91738126122f94e2ba1c241 SHA512 f241a8569209b9504e1a68b3c72168147641666e838a3a0160e56efcf2070c016a1ae906d7fcea8ac26e6785a74f5bf571a3f14f82bd8daa1f0cf33b0c7be983 +DIST homebank-5.8.3.tar.gz 3773027 BLAKE2B 0af8b22b113c1be391cee455666ed767c9edefbba3973cdbdd85ca020611a5a8d992d85ee7b5e39ec56ea6693b4ee147cc05591623cb10d71b17466e7c205db2 SHA512 20b08c2329c7f11a4317b460be3e3b99072dab618965f9c96b21ed9355843e3cbb68730fa1517a5c6c90f9ab9fa53f7ed1e4f6d5af62a32d7d92e82acf342944 EBUILD homebank-5.8.1.ebuild 814 BLAKE2B 8190829b7861628d6b7e9a7269df76741b5ddff1928eb33c7e8d64e8f85d2989208b7c983b79d31ab3417ee0a92276ba79f70b3b6c58f71eae56472255b59580 SHA512 c93fc64735ce523eb460e3a7c4b3c36913412dd008cf345d5debb81b3095e80a9b1f3bc1079c4caee925f6d3cdc77d6d833c3a0d2fdc6975f2aa06e70d6e1148 -EBUILD homebank-5.8.2.ebuild 817 BLAKE2B b0235cee7afa47641e04d45aec669e94fc97cda3fe3f2101dd299a213cbcb7e53867ca985b31266d829f770be434dc16ef07d54640b2c337c42c352f9a75ba38 SHA512 efda2d371b19d611cec5d76cb55fb5f6c4ffa29886d22305d00835fa257e9a229d9587cba8b755dee978b17ec7df53633b0fcf44d6ae8858cb417e057fffcf3f +EBUILD homebank-5.8.2.ebuild 815 BLAKE2B ab095e7a8a69397ac374a0e2122f94aa86ebec12e9f94744793b3e5d5692eea3a045ae634ddcdaea73dbdf96d400e26230da7a17feb78835436f9bb37450d125 SHA512 38d1c64ea0d8bd6f549fb7e063d2ad3f2b6b61bbd1338481e8860439b539ed04274000b3fc5b4704128b5cba4b498aa1e9035d2f6ab6b65534e25678d6955bf4 +EBUILD homebank-5.8.3.ebuild 817 BLAKE2B b0235cee7afa47641e04d45aec669e94fc97cda3fe3f2101dd299a213cbcb7e53867ca985b31266d829f770be434dc16ef07d54640b2c337c42c352f9a75ba38 SHA512 efda2d371b19d611cec5d76cb55fb5f6c4ffa29886d22305d00835fa257e9a229d9587cba8b755dee978b17ec7df53633b0fcf44d6ae8858cb417e057fffcf3f MISC metadata.xml 322 BLAKE2B f0ed3691f77c7dba631ced8827fc442dec42c7cae9c07f66e69304ad862112233defc63cb443c5321b3ffc385976ae3b46165d3e31318e564e35ee01b1875d05 SHA512 449b8694aa9236e7925b62ba3249bff5d567a3710ac8ade8db75a5403dd0bb58380717c15fe42cc082beeee3030aa65ce90d047f18a1d67d19dd50771315f013 diff --git a/app-office/homebank/homebank-5.8.2.ebuild b/app-office/homebank/homebank-5.8.2.ebuild index b794b4f11bfc..6fe8275d16b7 100644 --- a/app-office/homebank/homebank-5.8.2.ebuild +++ b/app-office/homebank/homebank-5.8.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="+ofx" RDEPEND=" diff --git a/app-office/homebank/homebank-5.8.3.ebuild b/app-office/homebank/homebank-5.8.3.ebuild new file mode 100644 index 000000000000..b794b4f11bfc --- /dev/null +++ b/app-office/homebank/homebank-5.8.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="Free, easy, personal accounting for everyone" +HOMEPAGE=" + https://www.gethomebank.org/ + https://launchpad.net/homebank +" +SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+ofx" + +RDEPEND=" + >=dev-libs/glib-2.39:2 + net-libs/libsoup:3.0 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3 + x11-libs/pango + ofx? ( >=dev-libs/libofx-0.8.3:= ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + >=dev-lang/perl-5.8.1 + dev-perl/XML-Parser + >=dev-util/intltool-0.40.5 + sys-devel/gettext + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog README ) + +src_configure() { + econf $(use_with ofx) +} diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 81b758185140..ada16dec87f4 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -49,5 +49,5 @@ EBUILD libreoffice-24.2.5.2.ebuild 20768 BLAKE2B 49000d3394b5f2f947883f5700ef0b1 EBUILD libreoffice-24.2.6.2.ebuild 20722 BLAKE2B e435a02cac7fa1955069e253fb7df0bb12be4a9bb9425bbe2d89a19cf5231b5f093d79e1c62a6c7dd5ac35dbd995a6dfab55f4974e5a0bcbc876116db79e2e58 SHA512 52c5ae38e538ad6ae92fb5b1219f30f5d26ee87aa6a5bb4c1f3c0a4eecbdfc6672cc7a5ebdc2c0ba2f8caef33dc4e87aae8a552d27e035956e06562ced4f799f EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 EBUILD libreoffice-7.6.7.2.ebuild 19802 BLAKE2B eb2f730cbeb5c9b52aa283856836ff3bbafd1c583680b7e66573cecfa70cfe9047a890bfab3a3af44393745627a89b8b85035e0391c5b8237305286749f3ec31 SHA512 1233a6ac0fad591ff2e1f639fda080a34993087f9d3a979dac8c068d35c9302c647401624268d90886d9ef59821f5f48da007e619d0ce7dfb538b54b7a11198f -EBUILD libreoffice-9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 +EBUILD libreoffice-9999.ebuild 19906 BLAKE2B 0b242c2390bec879c05a78e17bab5b1363555bd0473f89927a6736d5a68d0da9c8cad53197a58d82ef4869cfead3838814150f9c7d731f49b0fb4388b177c68b SHA512 b225f0125d7bc88fc5b4b24fc8702641f1169f151a852b8dc3d02e8c54a6f4bfe97198020b219e5155f945d71f086874ac59a2dcd7190b88da6636ac3c75c329 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1360d7d1e65e..a4aacb61b9f0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -91,13 +91,13 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) - kde? ( || ( qt5 qt6 ) ) + kde? ( qt6 ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -209,20 +209,11 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - qt5? ( - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - qt6? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kio:6 - kde-frameworks/kwindowsystem:6 - ) + kde-frameworks/kconfig:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/ki18n:6 + kde-frameworks/kio:6 + kde-frameworks/kwindowsystem:6 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) @@ -231,12 +222,6 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional @@ -473,9 +458,6 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/.." - fi if use qt6; then export QT6DIR="$(qt6_get_bindir)/.." fi @@ -520,6 +502,7 @@ src_configure() { --disable-online-update --disable-openssl --disable-pdfium + --disable-qt5 --with-extra-buildid="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -554,11 +537,11 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) + $(use_enable kde kf6) $(use_enable ldap) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt5) $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) @@ -570,9 +553,6 @@ src_configure() { $(use_with valgrind) ) - use qt5 && myeconfargs+=( $(use_enable kde kf5) ) - use qt6 && myeconfargs+=( $(use_enable kde kf6) ) - if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else |