commit: b67543f8bb06015c098c3adea74641e27d531045 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 29 12:35:05 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 29 12:46:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67543f8
app-office/calligra: Drop unused KF5Kross dep, use patchset See also: https://invent.kde.org/office/calligra/-/merge_requests/79 Bug: https://bugs.gentoo.org/903532 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/calligra/Manifest | 1 + app-office/calligra/calligra-3.2.1-r5.ebuild | 20 +- ...ra-3.2.1-r5.ebuild => calligra-3.2.1-r6.ebuild} | 25 +- .../files/calligra-3.1.89-no-arch-detection.patch | 17 - .../files/calligra-3.2.1-clang-16-c++17.patch | 359 ----------------- .../calligra/files/calligra-3.2.1-cmake-3.16.patch | 86 ---- .../files/calligra-3.2.1-cxx17-fixes.patch | 443 --------------------- .../calligra-3.2.1-cxx17-for-poppler-22.patch | 31 -- .../calligra/files/calligra-3.2.1-imath-1.patch | 30 -- .../calligra/files/calligra-3.2.1-imath-2.patch | 25 -- .../calligra/files/calligra-3.2.1-openexr-3.patch | 93 ----- .../files/calligra-3.2.1-poppler-22.03.0-1.patch | 73 ---- .../files/calligra-3.2.1-poppler-22.03.0-2.patch | 94 ----- .../files/calligra-3.2.1-poppler-22.04.0.patch | 25 -- 14 files changed, 26 insertions(+), 1296 deletions(-) diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 351fbb7e9b7c..d7c2d4419fe5 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1 +1,2 @@ +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 diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index c9290de8b5ac..2acce0b09496 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -14,7 +14,9 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + 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 ~ppc64 ~riscv x86" fi @@ -115,14 +117,14 @@ RDEPEND="${COMMON_DEPEND} BDEPEND="sys-devel/gettext" PATCHES=( - "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch - "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224 - "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch - "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch - "${FILESDIR}"/${P}-cxx17-fixes.patch - "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch - "${FILESDIR}"/${P}-poppler-22.04.0.patch - "${FILESDIR}"/${P}-clang-16-c++17.patch + "${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 ) pkg_pretend() { diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r6.ebuild similarity index 87% copy from app-office/calligra/calligra-3.2.1-r5.ebuild copy to app-office/calligra/calligra-3.2.1-r6.ebuild index c9290de8b5ac..4d434a0c1d25 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r6.ebuild @@ -14,8 +14,10 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64 ~riscv x86" + 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 ~ppc64 ~riscv ~x86" fi CAL_FTS=( karbon sheets stage words ) @@ -62,7 +64,6 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kross-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 @@ -115,14 +116,15 @@ RDEPEND="${COMMON_DEPEND} BDEPEND="sys-devel/gettext" PATCHES=( - "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch - "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224 - "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch - "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch - "${FILESDIR}"/${P}-cxx17-fixes.patch - "${FILESDIR}"/${P}-poppler-22.03.0-{1,2}.patch - "${FILESDIR}"/${P}-poppler-22.04.0.patch - "${FILESDIR}"/${P}-clang-16-c++17.patch + "${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 ) pkg_pretend() { @@ -162,6 +164,7 @@ src_configure() { -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) diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch deleted file mode 100644 index f4efa3d81a48..000000000000 --- a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. - -Gentoo-bug: 584118 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -617,10 +617,6 @@ - endif() - endmacro() - -- if (NOT PACKAGERS_BUILD) -- # Optimize the whole Calligra for current architecture -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") -- endif () - endif() - set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) - diff --git a/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch b/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch deleted file mode 100644 index d826e006249d..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-clang-16-c++17.patch +++ /dev/null @@ -1,359 +0,0 @@ -Fixed in upstream master but in a far larger patch. - -C++ 17 removes 'register'. GCC allows it as an extension (for now?) but Clang -16 which defaults to -std=c++17 doesn't. - -Further, we have to use C++17 for Poppler, so we can't just force e.g. c++14. - -https://bugs.gentoo.org/883067#c4 -https://bugs.gentoo.org/894578 ---- a/sheets/part/Digest.cpp -+++ b/sheets/part/Digest.cpp -@@ -250,8 +250,8 @@ typedef struct digest_impl_st { - */ - static void __rtl_digest_swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen) - { -- register sal_uInt32 *X; -- register int i, n; -+ sal_uInt32 *X; -+ int i, n; - - X = pData; - n = nDatLen; -@@ -465,10 +465,10 @@ static void __rtl_digest_initSHA( - */ - static void __rtl_digest_updateSHA(DigestContextSHA *ctx) - { -- register sal_uInt32 A, B, C, D, E, T; -- register sal_uInt32 *X; -+ sal_uInt32 A, B, C, D, E, T; -+ sal_uInt32 *X; - -- register DigestSHA_update_t *U; -+ DigestSHA_update_t *U; - U = ctx->m_update; - - A = ctx->m_nA; -@@ -577,10 +577,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) - static const sal_uInt8 end[4] = { - 0x80, 0x00, 0x00, 0x00 - }; -- register const sal_uInt8 *p = end; -+ const sal_uInt8 *p = end; - -- register sal_uInt32 *X; -- register int i; -+ sal_uInt32 *X; -+ int i; - - X = ctx->m_pData; - i = (ctx->m_nDatLen >> 2); ---- a/sheets/ui/CellToolBase_p.cpp -+++ b/sheets/ui/CellToolBase_p.cpp -@@ -246,7 +246,7 @@ void CellToolBase::Private::processArrowKey(QKeyEvent *event) - /* NOTE: hitting the tab key also calls this function. Don't forget - to account for it - */ -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - if (!sheet) - return; - -@@ -300,7 +300,7 @@ void CellToolBase::Private::processEscapeKey(QKeyEvent * event) - - bool CellToolBase::Private::processHomeKey(QKeyEvent* event) - { -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - if (!sheet) - return false; - -@@ -355,7 +355,7 @@ bool CellToolBase::Private::processHomeKey(QKeyEvent* event) - - bool CellToolBase::Private::processEndKey(QKeyEvent *event) - { -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - if (!sheet) - return false; - -@@ -438,7 +438,7 @@ bool CellToolBase::Private::processNextKey(QKeyEvent *event) - - void CellToolBase::Private::processOtherKey(QKeyEvent *event) - { -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - - // No null character ... - if (event->text().isEmpty() || !q->selection()->activeSheet()->map()->isReadWrite() || -@@ -456,7 +456,7 @@ void CellToolBase::Private::processOtherKey(QKeyEvent *event) - - bool CellToolBase::Private::processControlArrowKey(QKeyEvent *event) - { -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - if (!sheet) - return false; - -@@ -801,7 +801,7 @@ QRect CellToolBase::Private::moveDirection(Calligra::Sheets::MoveTo direction, b - { - debugSheetsUI << "Canvas::moveDirection"; - -- register Sheet * const sheet = q->selection()->activeSheet(); -+ Sheet * const sheet = q->selection()->activeSheet(); - if (!sheet) - return QRect(); - ---- a/sheets/part/Headers.cpp -+++ b/sheets/part/Headers.cpp -@@ -102,7 +102,7 @@ void RowHeader::mousePress(KoPointerEvent * _ev) - if (!m_cellToolIsActive) - return; - -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -192,7 +192,7 @@ void RowHeader::mouseRelease(KoPointerEvent * _ev) - - m_bMousePressed = false; - -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -295,7 +295,7 @@ void RowHeader::mouseDoubleClick(KoPointerEvent*) - { - if (!m_cellToolIsActive) - return; -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -317,7 +317,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev) - return; - } - -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -379,7 +379,7 @@ void RowHeader::mouseMove(KoPointerEvent* _ev) - - void RowHeader::paint(QPainter* painter, const QRectF& painterRect) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -545,7 +545,7 @@ void ColumnHeader::mousePress(KoPointerEvent * _ev) - m_pCanvas->enableAutoScroll(); - } - -- const register Sheet * const sheet = m_pCanvas->activeSheet(); -+ const Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -682,7 +682,7 @@ void ColumnHeader::mouseRelease(KoPointerEvent * _ev) - - m_bMousePressed = false; - -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -794,7 +794,7 @@ void ColumnHeader::mouseDoubleClick(KoPointerEvent*) - { - if (!m_cellToolIsActive) - return; -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -813,7 +813,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev) - if (!m_cellToolIsActive) - return; - -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - - if (!sheet) - return; -@@ -911,7 +911,7 @@ void ColumnHeader::mouseMove(KoPointerEvent* _ev) - - void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -929,7 +929,7 @@ void ColumnHeader::resize(const QSizeF& size, const QSizeF& oldSize) - - void ColumnHeader::paint(QPainter* painter, const QRectF& painterRect) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - ---- a/sheets/part/CanvasBase.cpp -+++ b/sheets/part/CanvasBase.cpp -@@ -230,7 +230,7 @@ bool CanvasBase::eventFilter(QObject *o, QEvent *e) - - void CanvasBase::validateSelection() - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) - return; - #if 0 -@@ -443,7 +443,7 @@ void CanvasBase::paint(QPainter* painter, const QRectF& painterRect) - if (doc()->map()->isLoading() || isViewLoading()) - return; - -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) - return; - -@@ -513,7 +513,7 @@ bool CanvasBase::dragEnter(const QMimeData* mimeData) - - bool CanvasBase::dragMove(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source) - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) { - return false; - } -@@ -596,7 +596,7 @@ void CanvasBase::dragLeave() - - bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const QObject *source) - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - // FIXME Sheet protection: Not all cells have to be protected. - if (!sheet || sheet->isProtected()) { - return false; -@@ -656,7 +656,7 @@ bool CanvasBase::drop(const QMimeData* mimeData, const QPointF& eventPos, const - - QRect CanvasBase::viewToCellCoordinates(const QRectF& viewRect) const - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) - return QRect(); - -@@ -685,7 +685,7 @@ QRect CanvasBase::visibleCells() const - - QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) - return QRectF(); - -@@ -706,7 +706,7 @@ QRectF CanvasBase::cellCoordinatesToView(const QRect& cellRange) const - - void CanvasBase::showToolTip(const QPoint& p) - { -- register Sheet * const sheet = activeSheet(); -+ Sheet * const sheet = activeSheet(); - if (!sheet) - return; - SheetView * const sheetView = this->sheetView(sheet); ---- a/sheets/part/HeaderItems.cpp -+++ b/sheets/part/HeaderItems.cpp -@@ -161,7 +161,7 @@ void RowHeaderItem::wheelEvent(QGraphicsSceneWheelEvent* _ev) - - void RowHeaderItem::paintSizeIndicator(int mouseY) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -216,7 +216,7 @@ void RowHeaderItem::removeSizeIndicator() - - void RowHeaderItem::updateRows(int from, int to) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -324,7 +324,7 @@ void ColumnHeaderItem::resizeEvent(QGraphicsSceneResizeEvent* _ev) - - void ColumnHeaderItem::paintSizeIndicator(int mouseX) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -389,7 +389,7 @@ void ColumnHeaderItem::removeSizeIndicator() - - void ColumnHeaderItem::updateColumns(int from, int to) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - ---- a/sheets/part/HeaderWidgets.cpp -+++ b/sheets/part/HeaderWidgets.cpp -@@ -155,7 +155,7 @@ void RowHeaderWidget::wheelEvent(QWheelEvent* _ev) - - void RowHeaderWidget::paintSizeIndicator(int mouseY) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -209,7 +209,7 @@ void RowHeaderWidget::removeSizeIndicator() - - void RowHeaderWidget::updateRows(int from, int to) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -314,7 +314,7 @@ void ColumnHeaderWidget::resizeEvent(QResizeEvent* _ev) - - void ColumnHeaderWidget::paintSizeIndicator(int mouseX) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - -@@ -379,7 +379,7 @@ void ColumnHeaderWidget::removeSizeIndicator() - - void ColumnHeaderWidget::updateColumns(int from, int to) - { -- register Sheet * const sheet = m_pCanvas->activeSheet(); -+ Sheet * const sheet = m_pCanvas->activeSheet(); - if (!sheet) - return; - ---- a/sheets/ui/CellToolBase.cpp -+++ b/sheets/ui/CellToolBase.cpp -@@ -987,7 +987,7 @@ void CellToolBase::mouseDoubleClickEvent(KoPointerEvent* event) - - void CellToolBase::keyPressEvent(QKeyEvent* event) - { -- register Sheet * const sheet = selection()->activeSheet(); -+ Sheet * const sheet = selection()->activeSheet(); - if (!sheet) { - return; - } diff --git a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch b/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch deleted file mode 100644 index 7e1fd9d41eab..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-cmake-3.16.patch +++ /dev/null @@ -1,86 +0,0 @@ -From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <[email protected]> -Date: Tue, 8 Jun 2021 05:13:23 +0000 -Subject: [PATCH] Partial update of Commit 62f51070 to make it compileable - again - -Cmake to 3.16 -Fix Fontconfig's FOUND variable -Fix Fontconfig's include_dirs variable -Use Correct Target to link FontConfig and Freetype ---- - CMakeLists.txt | 14 +++++--------- - libs/text/CMakeLists.txt | 4 ++-- - 2 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ce210ebe01..71272ffef2d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.16) - - project(calligra) - -@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET}) - ## Look for ECM, Qt, KF5 ## - ########################### - ########################## -+set(REQUIRED_KF5_VERSION "5.7.0") -+set(REQUIRED_QT_VERSION "5.3.0") - - find_package(ECM 5.19 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage) - include(MacroEnsureVersion) - include(MacroDesktopToJson) - -- --set(REQUIRED_KF5_VERSION "5.7.0") -- - find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - COMPONENTS - Archive -@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0") - set(CALLIGRA_OLD_PLUGIN_METADATA TRUE) - endif() - -- --set(REQUIRED_QT_VERSION "5.3.0") -- - find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED - COMPONENTS - Core -@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE) - ) - endif() - --if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND) -- set(FONTCONFIG_INCLUDE_DIR "") -+if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND) -+ set(Fontconfig_INCLUDE_DIRS "") - set(FREETYPE_INCLUDE_DIRS "") - else() - add_definitions( -DSHOULD_BUILD_FONT_CONVERSION ) -diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt -index 16d7e066fa2..429afe79704 100644 ---- a/libs/text/CMakeLists.txt -+++ b/libs/text/CMakeLists.txt -@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF ) - endif() - - if( FONTCONFIG_FOUND ) -- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig) - endif() - - if( FREETYPE_FOUND ) -- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES}) -+ target_link_libraries(kotext PRIVATE Freetype::Freetype) - endif() - - --- -GitLab - diff --git a/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.patch b/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.patch deleted file mode 100644 index 127dcda34795..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-cxx17-fixes.patch +++ /dev/null @@ -1,443 +0,0 @@ -From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001 -From: Pierre Ducroquet <[email protected]> -Date: Sun, 28 Feb 2021 23:23:02 +0100 -Subject: [PATCH] Fix some more warnings - ---- - filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 + - filters/sheets/csv/csvimport.cc | 2 +- - filters/sheets/excel/sidewinder/excel.cpp | 1 + - filters/sheets/excel/sidewinder/formulas.cpp | 2 +- - filters/sheets/gnumeric/gnumericexport.cc | 5 ++--- - filters/sheets/html/htmlexport.cc | 2 -- - filters/sheets/latex/export/latexexport.cc | 1 - - filters/sheets/latex/export/table.cc | 1 + - filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 - - filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +- - filters/words/msword-odf/texthandler.cpp | 2 ++ - filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++- - filters/words/msword-odf/wv2/src/styles.cpp | 4 +--- - filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++--- - gemini/lib/GeminiMainWindow.cpp | 2 ++ - libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +- - plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++---- - plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +- - plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +-- - plugins/vectorshape/VectorShape.cpp | 1 + - sheets/functions/datetime.cpp | 1 + - sheets/part/Digest.cpp | 8 ++++---- - sheets/shape/TableToolFactory.h | 2 +- - sheets/tests/TestSort.cpp | 4 ++-- - 24 files changed, 38 insertions(+), 32 deletions(-) - -diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -index 14b08531262..14fc6ab9a71 100644 ---- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -+++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp -@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) { - case AlgorithmAtom::UnknownAlg: - warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm."; - // fall through and use the composite-algorithm -+ // fall through - case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break; - case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break; - case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break; -diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc -index 89fb7162e00..1008d186f18 100644 ---- a/filters/sheets/csv/csvimport.cc -+++ b/filters/sheets/csv/csvimport.cc -@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt - return KoFilter::FileNotFound; - } - -- QString csv_delimiter; - // ###### FIXME: disabled for now -+ //QString csv_delimiter; - //if (!config.isNull()) - // csv_delimiter = config[0]; - -diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp -index ab592225ca6..7fa5633d433 100644 ---- a/filters/sheets/excel/sidewinder/excel.cpp -+++ b/filters/sheets/excel/sidewinder/excel.cpp -@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename) - } else { - bytes_read = combObjStream->read( buffer, markerOrLength ); - QString ansiString = readByteString(buffer, markerOrLength); -+ Q_UNUSED(ansiString); - //TODO... - //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() ); - } -diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp -index 62747469a49..0132d39e024 100644 ---- a/filters/sheets/excel/sidewinder/formulas.cpp -+++ b/filters/sheets/excel/sidewinder/formulas.cpp -@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg - if (!stack) return; - if (stack->size() < count) return; - -- QString s1, s2; -+ QString s1; - - while (count) { - count--; -diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc -index 1256c68bc74..2468548edb3 100644 ---- a/filters/sheets/gnumeric/gnumericexport.cc -+++ b/filters/sheets/gnumeric/gnumericexport.cc -@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - i = 0; - } - -- QString line; - for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) { - QDomElement cell_contents; - Cell cell(table, currentcolumn, currentrow); - -- QString text, style; -+ QString text; - QDomDocument domLink; - QDomElement domRoot; -- QDomNode domNode; - QDomNodeList childNodes; - - if (!cell.isDefault() && !cell.isEmpty()) { -@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const - text = domNode.toElement().text(); - - while (!domNode.isNull()) { -+ QString style; - style = domNode.toElement().tagName(); - - if (style == "b") -diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc -index 2d116e0608c..bf41a6f743e 100644 ---- a/filters/sheets/html/htmlexport.cc -+++ b/filters/sheets/html/htmlexport.cc -@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i - i = 0; - } - -- QString separators; - QString line; - unsigned int nonempty_cells = 0; - -@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns) - int iUsedColumn = 0; - for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) { - cell = Cell(sheet, currentcolumn, currentrow); -- QString text; - if (!cell.isDefault() && !cell.isEmpty()) { - iUsedColumn = currentcolumn; - } -diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc -index 8d0698a3420..4f8caf235d9 100644 ---- a/filters/sheets/latex/export/latexexport.cc -+++ b/filters/sheets/latex/export/latexexport.cc -@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) : - - KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to) - { -- QString config; - - if (to != "text/x-tex" || from != "application/x-kspread") - return KoFilter::NotImplemented; -diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc -index 8d8b6701a39..e58827dfbc7 100644 ---- a/filters/sheets/latex/export/table.cc -+++ b/filters/sheets/latex/export/table.cc -@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node) - - /* borders */ - QDomNode border = getChild(node, "borders"); -+ Q_UNUSED(border); - setBorderRight(getAttr(node, "right").toLong()); - setBorderLeft(getAttr(node, "left").toLong()); - setBorderBottom(getAttr(node, "bottom").toLong()); -diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -index 782a5914729..eda8ffc6b47 100644 ---- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -+++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp -@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting() - while (index < m_conditionalIndices.size()) { - QString conditionalArea; - Condition examinedCondition = m_conditionalIndices.at(index); -- QString sqrefOriginal = sqref; - int areaIndex = 0; - Condition previousCond; - -diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp -index 4cf86aea8c8..11b5ad266b9 100644 ---- a/filters/stage/pptx/PptxXmlDocumentReader.cpp -+++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp -@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId() - - QString slideMasterPath, slideMasterFile; - MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile); -- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); -+ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster"); - - // Delay the reading of a tableStyle until we find a table as we need the - // clrMap from the master slide -diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp -index e167d86e028..89ef678961a 100644 ---- a/filters/words/msword-odf/texthandler.cpp -+++ b/filters/words/msword-odf/texthandler.cpp -@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data, - } - case msonfcUCLetter: - letter = 'A'; -+ // fall through - case msonfcLCLetter: - { - while (noteNumber / 25 > 0) { -@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtr<cons - break; - case UNSUPPORTED: - warnMsDoc << "Warning: Fld data missing, ignoring!"; -+ // fall through - default: - warnMsDoc << "Warning: unrecognized field type, ignoring!"; - m_fld->m_type = UNSUPPORTED; -diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp -index 9a6d1606ce9..e5d7d14691c 100644 ---- a/filters/words/msword-odf/wv2/src/parser9x.cpp -+++ b/filters/words/msword-odf/wv2/src/parser9x.cpp -@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position& - // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1 - case CELL_MARK: - m_cellMarkFound = true; -- // Fall-through intended. A row/cell end is also a paragraph end. -+ // A row/cell end is also a paragraph end. -+ // fall through - case PARAGRAPH_MARK: - { - // No "index - start + 1" here, as we don't want to copy the -@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtr<co - if (m_subDocument == Main) { - emitAnnotation( UString(character), globalCP, chp ); - } -+ break; - } - case TextHandler::FieldEscapeChar: - wvlog << "Found an escape character ++++++++++++++++++++?" << endl; -diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp -index f47c3dd8d51..d2c96e3d92b 100644 ---- a/filters/words/msword-odf/wv2/src/styles.cpp -+++ b/filters/words/msword-odf/wv2/src/styles.cpp -@@ -42,7 +42,6 @@ STD::STD() - } - - STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos ) --throw(InvalidFormatException) - { - clearInternal(); - if (!read( baseSize, totalSize, stream, preservePos )) { -@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs ) - } - - bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos ) --throw(InvalidFormatException) - { - U16 shifterU16; - S32 startOffset=stream->tell(); // address where the STD starts -@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version ) - } - - --StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException) -+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) - : m_udsNum(0) - { - WordVersion version = Word8; -diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h -index ba02def6845..41c8278dd21 100644 ---- a/filters/words/msword-odf/wv2/src/styles.h -+++ b/filters/words/msword-odf/wv2/src/styles.h -@@ -58,8 +58,9 @@ struct STD - STD(); - /** - * Simply calls read(...) -+ * @throw InvalidFormatException - */ -- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ); - /** - * Attention: This struct allocates memory on the heap - */ -@@ -74,8 +75,9 @@ struct STD - * false the state of stream will be changed! - * - * @return true - success, false - failed -+ * @throw InvalidFormatException - */ -- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException); -+ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ); - - /** - * Same as reading :) -@@ -365,7 +367,10 @@ private: - class WV2_EXPORT StyleSheet - { - public: -- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException); -+ /** -+ * @throw InvalidFormatException -+ */ -+ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ); - ~StyleSheet(); - - /** -diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp -index 3d05f6461e0..eb5f120c0f7 100644 ---- a/gemini/lib/GeminiMainWindow.cpp -+++ b/gemini/lib/GeminiMainWindow.cpp -@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState) - } - - -+ - void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState) - { -+ Q_UNUSED(lockNewState); - d->syncObject = new GeminiModeSynchronisationObject; - - if(centralWidget()) { -diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -index 92c6dfd4cb4..068501c8af1 100644 ---- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp -+++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp -@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList<KoPAPage - KoPAPage * p = static_cast<KoPAPage *>( page ); - masterPages.insert( p->masterPage() ); - } -- m_masterPages = masterPages.toList(); -+ m_masterPages = masterPages.values(); - } - } - -diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h -index b9056ac98c1..ecd696e415f 100644 ---- a/plugins/spacenavigator/SpaceNavigatorDevice.h -+++ b/plugins/spacenavigator/SpaceNavigatorDevice.h -@@ -31,10 +31,8 @@ public: - explicit SpaceNavigatorDevice(QObject *parent); - virtual ~SpaceNavigatorDevice(); - -- /// reimplemented from KoInputDeviceHandler -- virtual bool start(); -- /// reimplemented from KoInputDeviceHandler -- virtual bool stop(); -+ virtual bool start() override; -+ virtual bool stop() override; - private Q_SLOTS: - void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons ); - void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type ); -diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h -index 73751ec88ff..76ee8e2f880 100644 ---- a/plugins/spacenavigator/SpaceNavigatorEvent.h -+++ b/plugins/spacenavigator/SpaceNavigatorEvent.h -@@ -33,7 +33,7 @@ public: - void setPosition( int x, int y, int z ); - void setRotation( int rx, int ry, int rz ); - -- virtual KoPointerEvent * pointerEvent(); -+ virtual KoPointerEvent * pointerEvent() override; - - private: - int m_x, m_y, m_z; -diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -index 62c4de8ab73..67d59177021 100644 ---- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h -+++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h -@@ -39,8 +39,7 @@ Q_SIGNALS: - - protected: - -- /// reimplemented from QThread -- virtual void run(); -+ virtual void run() override; - - private: - bool m_stopped; -diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp -index a25ab3fc561..9acbd251c94 100644 ---- a/plugins/vectorshape/VectorShape.cpp -+++ b/plugins/vectorshape/VectorShape.cpp -@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const - break; - case VectorTypeSvg: - mimeType = "image/svg+xml"; -+ break; - default: - // FIXME: What here? - mimeType = "application/x-what"; -diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp -index 9f59fe2cf75..6157b0996c1 100644 ---- a/sheets/functions/datetime.cpp -+++ b/sheets/functions/datetime.cpp -@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *) - // Function: CURRENTTIME - Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *) - { -+ Q_UNUSED(calc); - return Value(QTime::currentTime()); - } - -diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp -index 8cd972db989..e9246ce6e7d 100644 ---- a/sheets/part/Digest.cpp -+++ b/sheets/part/Digest.cpp -@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx) - } - - switch (ctx->m_nDatLen & 0x03) { -- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; -- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; -- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; -- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; -+ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */ -+ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */ -+ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */ -+ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */ - } - - __rtl_digest_swapLong(X, i + 1); -diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h -index 679bfe14b8e..9412d8ffdc5 100644 ---- a/sheets/shape/TableToolFactory.h -+++ b/sheets/shape/TableToolFactory.h -@@ -34,7 +34,7 @@ public: - TableToolFactory(); - ~TableToolFactory(); - -- KoToolBase* createTool(KoCanvasBase* canvas); -+ KoToolBase* createTool(KoCanvasBase* canvas) override; - }; - - } // namespace Sheets -diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp -index b3f1e35169d..6354d79abc5 100644 ---- a/sheets/tests/TestSort.cpp -+++ b/sheets/tests/TestSort.cpp -@@ -68,7 +68,7 @@ void TestSort::AscendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - -@@ -121,7 +121,7 @@ void TestSort::DescendingOrder() - command->setSheet(sheet); - - // Parameters. -- command->setSortRows(Qt::Vertical); -+ command->setSortRows(true); - command->setSkipFirst(false); - command->setCopyFormat(false); - --- -GitLab - diff --git a/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch b/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch deleted file mode 100644 index 288c72b61558..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 175b92c26637a08be4093c9579128f2f89253090 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Fri, 7 Jan 2022 14:00:05 +0100 -Subject: [PATCH] Fix build with >=app-text/poppler-22.01.0 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71272ffef2d..bdd9ed74406 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,12 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) - endif() - message(STATUS "Release build: ${RELEASE_BUILD}") - --# use CPP-11 --if (CMAKE_VERSION VERSION_LESS "3.1") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") --else () -- set (CMAKE_CXX_STANDARD 11) --endif () -+set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 - - ############ - ############# --- -2.34.1 - diff --git a/app-office/calligra/files/calligra-3.2.1-imath-1.patch b/app-office/calligra/files/calligra-3.2.1-imath-1.patch deleted file mode 100644 index 62a2daa2f5dc..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-imath-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c52eb33f20a66acb648b725e2eee3ed977eae896 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <[email protected]> -Date: Tue, 3 Aug 2021 10:41:09 +0200 -Subject: [PATCH] Only link to Imath when OpenEXR version is >= 3.0 - -Since OpenEXR 3.0, Imath is in a separate, independently released library. Since that's the only library that Calligra needs, there's no need to link to the full OpenEXR ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cdcc02f0236..91c72882d3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -338,9 +338,9 @@ endif () - ## Check for OpenEXR - ## - --macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET) --if(TARGET OpenEXR::OpenEXR) -- set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) -+macro_optional_find_package(Imath 3.0 CONFIG QUIET) -+if(TARGET Imath::Imath) -+ set(OPENEXR_LIBRARIES Imath::Imath) - else() - macro_optional_find_package(OpenEXR) - endif() --- -GitLab - diff --git a/app-office/calligra/files/calligra-3.2.1-imath-2.patch b/app-office/calligra/files/calligra-3.2.1-imath-2.patch deleted file mode 100644 index 113e885726f4..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-imath-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d42f7b414f9cf15051509a80fd8ecdd745b989c Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <[email protected]> -Date: Mon, 20 Dec 2021 18:46:33 +0100 -Subject: [PATCH] Fixup Imath 3.0 support - -OpenEXR_FOUND needs to be set to true in order to compile it. ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a77c4be50b..89636205c2b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -341,6 +341,7 @@ endif () - macro_optional_find_package(Imath 3.0 CONFIG QUIET) - if(TARGET Imath::Imath) - set(OPENEXR_LIBRARIES Imath::Imath) -+ set(OpenEXR_FOUND TRUE) - else() - macro_optional_find_package(OpenEXR) - endif() --- -GitLab - diff --git a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch deleted file mode 100644 index d9175a63ce6b..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch +++ /dev/null @@ -1,93 +0,0 @@ -From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <[email protected]> -Date: Sat, 24 Apr 2021 11:19:52 +0200 -Subject: [PATCH] Support building with OpenEXR 3 - -Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR ---- - CMakeLists.txt | 9 +++++++-- - libs/pigment/CMakeLists.txt | 2 +- - plugins/colorengines/lcms2/CMakeLists.txt | 6 +++--- - plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +- - 4 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8955357ff97..ea56c84bb11 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -363,8 +363,13 @@ endif () - ## Check for OpenEXR - ## - --macro_optional_find_package(OpenEXR) --macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR) -+macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET) -+if(TARGET OpenEXR::OpenEXR) -+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) -+else() -+ macro_optional_find_package(OpenEXR) -+endif() -+macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR) - - ## - ## Test for GNU Scientific Library -diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt -index a039251e2ad..6eb6a8e70b6 100644 ---- a/libs/pigment/CMakeLists.txt -+++ b/libs/pigment/CMakeLists.txt -@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR}) - - set(FILE_OPENEXR_SOURCES) - set(LINK_OPENEXR_LIB) --if(OPENEXR_FOUND) -+if(OpenEXR_FOUND) - include_directories(${OPENEXR_INCLUDE_DIR}) - set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) - add_definitions(${OPENEXR_DEFINITIONS}) -diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt -index 77807ff9702..920adbeaf87 100644 ---- a/plugins/colorengines/lcms2/CMakeLists.txt -+++ b/plugins/colorengines/lcms2/CMakeLists.txt -@@ -31,7 +31,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles - ) - --if (HAVE_LCMS24 AND OPENEXR_FOUND) -+if (HAVE_LCMS24 AND OpenEXR_FOUND) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16 - ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16 -@@ -41,7 +41,7 @@ endif () - - set(FILE_OPENEXR_SOURCES) - set(LINK_OPENEXR_LIB) --if(OPENEXR_FOUND) -+if(OpenEXR_FOUND) - include_directories(${OPENEXR_INCLUDE_DIR}) - set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES}) - add_definitions(${OPENEXR_DEFINITIONS}) -@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS - LcmsEnginePlugin.cpp - ) - --if (HAVE_LCMS24 AND OPENEXR_FOUND) -+if (HAVE_LCMS24 AND OpenEXR_FOUND) - set ( lcmsengine_SRCS - ${lcmsengine_SRCS} - colorspaces/gray_f16/GrayF16ColorSpace.cpp -diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt -index 2540acc834c..77bd0b3fe4a 100644 ---- a/plugins/colorengines/lcms2/tests/CMakeLists.txt -+++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt -@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16 - ../colorprofiles - .. - ) --if(OPENEXR_FOUND) -+if(OpenEXR_FOUND) - include_directories(${OPENEXR_INCLUDE_DIR}) - endif() - include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} ) --- -GitLab - diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch deleted file mode 100644 index 2d308371a0a7..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 63ae4ecc780ba42901e6934302b75bd18d3bc5eb Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Wed, 13 Apr 2022 01:25:44 +0200 -Subject: [PATCH 1/3] PdfImport: Fix compile with newer poppler - -Brings a dependency on poppler-qt5 to be able to include the version -header, honestly it's not strictly needed, one could do a -check_cxx_source_compiles, but I don't care about Calligra enough to -spend more time making it compile while it's using poppler the wrong -way. ---- - CMakeLists.txt | 1 + - filters/karbon/pdf/CMakeLists.txt | 2 +- - filters/karbon/pdf/PdfImport.cpp | 9 +++++++++ - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bdd9ed74406..d8c86810b54 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -998,6 +998,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG - calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG - NOT_WIN "not supported on Windows" - PopplerXPDFHeaders_FOUND "poppler xpdf headers not found" -+ Poppler_FOUND "poppler qt5 headers not found" - ) - - calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 94d4071da3d..ef360f44359 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -19,7 +19,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop) - --target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core) -+target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index 286f5fa78bc..c171c754116 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -30,6 +30,10 @@ - - #include <kpluginfactory.h> - -+#include <poppler-version.h> -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -73,8 +77,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; --- -2.35.1 - diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch deleted file mode 100644 index f39304e04c82..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0-2.patch +++ /dev/null @@ -1,94 +0,0 @@ -From feb28e5fbd4e3b41c74da1220bc14826bcf9b3c7 Mon Sep 17 00:00:00 2001 -From: Dag Andersen <[email protected]> -Date: Wed, 13 Apr 2022 14:45:33 +0200 -Subject: [PATCH 2/3] PdfImport: Fix compile with newer poppler - -Also fixes odg2pdf filter. - -Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a -by [email protected]. ---- - filters/karbon/pdf/CMakeLists.txt | 2 +- - filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++ - filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++ - 3 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index ef360f44359..849baa70f12 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -29,6 +29,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp) - add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS}) - calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop) - --target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core) -+target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5) - - install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) -diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp -index 745239c9c21..b5f3722b320 100644 ---- a/filters/karbon/pdf/Pdf2OdgImport.cpp -+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp -@@ -40,6 +40,8 @@ - - #include <kpluginfactory.h> - -+#include <poppler-version.h> -+ - // Don't show this warning: it's an issue in poppler - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wunused-parameter" -@@ -49,6 +51,8 @@ - #include <PDFDoc.h> - #include <GlobalParams.h> - -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json", - registerPlugin<Pdf2OdgImport>();) - -@@ -86,8 +90,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const - if (! globalParams) - return KoFilter::NotImplemented; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); -+#else -+ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()); -+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); -+#endif - if (! pdfDoc) { - #ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index b980fdf60f6..76b909e3b69 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -35,6 +35,10 @@ - #include <QPen> - #include <QImage> - -+#include <poppler-version.h> -+ -+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) -+ - class SvgOutputDev::Private - { - public: -@@ -410,7 +414,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - if (s->getLength() == 0) - return; - -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) - GfxFont * font = state->getFont(); -+#else -+ std::shared_ptr<GfxFont> font = state->getFont(); -+#endif -+ - - QString str; - --- -2.35.1 - diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch deleted file mode 100644 index f76ef92d8fcf..000000000000 --- a/app-office/calligra/files/calligra-3.2.1-poppler-22.04.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2dd2c02094ab9dfd964b2363039527d414db3b28 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Wed, 13 Apr 2022 21:30:14 +0200 -Subject: [PATCH 3/3] SvgOutputDev: Fix ifdef version for getFont API change - ---- - filters/karbon/pdf/SvgOutputDev.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 76b909e3b69..588cda8ecbe 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -414,7 +414,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - if (s->getLength() == 0) - return; - --#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) -+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 04, 0) - GfxFont * font = state->getFont(); - #else - std::shared_ptr<GfxFont> font = state->getFont(); --- -2.35.1 -
