gentoo auto-resync : 29:03:2023 - 15:53:38

14 files changed, 207 insertions, 1297 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 21e2f32d3224..595d46b8d385 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,14 +1,5 @@
-AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
-AUX calligra-3.2.1-clang-16-c++17.patch 11578 BLAKE2B 397815898c7b3f3859a811e9502f9cf14a37975e3f466114f79dcc8b8ac20a74d60ae972814d760be90e9291a3b22b24cff2fe62e9ec3c631feadad484caaf16 SHA512 7e7b93431c2e379765db71757e5706182ac3842c23055cdf5c541a1d724292cfab8da46b8fa7b1db5a94eb9de24a028e4394f771d160c30b8fe567e0c7dca8ad
-AUX calligra-3.2.1-cmake-3.16.patch 2484 BLAKE2B 7a3aad5be9c793e027b9dcd2344f86622ddfbe0272ae0ff5ed624cbf030168148704dad5d225a8930ba3c7e5d18cabe9493603ffe16c47511f10deb064c47f08 SHA512 8dd6498dd5b225a630f69da37e5e53f513c9d4bc764e3ddedfb06b6403faca298358340264366972953ca5cc4ec3c2eb59fe76fb7fc0d924653a5c885f2a5e4f
-AUX calligra-3.2.1-cxx17-fixes.patch 19375 BLAKE2B 86a926340eecef0793caf16e4cffd04a8e78635b35b3255a3e614afd2f56190973b1e27df17240495b73e87c4402f40a29c5a4ab407a42cfc034815fd931834b SHA512 29015d101103a707ccd09d91656d41146fba6d1a38257a7ff961fcbd8c9e297064587cd34bb1a00fc60d69c1c56247de5bc1e5ea0a0e3171891543cf9473ba51
-AUX calligra-3.2.1-cxx17-for-poppler-22.patch 857 BLAKE2B f4ce16863c99be4681e6a2bc70d6b2ada2d69a15669fb2d0cdf567ef03af3e304b1eeccda88cb7af2e8c7f4791c52391e7f68549e6efe303cd2090a3bf9795f0 SHA512 d30a064fdddab8c067612700d777be283100242a4142f6c550f9a4467ee7d5d534f3db9fc70ca969616535d9a3d42c3527765be4f65ca3ccf32b29386dace5ad
-AUX calligra-3.2.1-imath-1.patch 971 BLAKE2B 10686e8aa72d7a6953393863123ca42f3cfaa3bad50e3a38876418d564f917a7f9b1009f972330a6e1abe4ef0e2e40ddeb02a62dc05c52ecbb94718beb468e51 SHA512 3ed2f1e92519baec97f110bb07c8a47fad14779c6dcc30ad4fa2bd13b18867258b9bf08a2e99ae732cdc4372dd462b0872abaebb5eef0e093934a70140c46591
-AUX calligra-3.2.1-imath-2.patch 688 BLAKE2B a991405acd4f9bc1b496cac0cfd969764e6145dec5bd682a2bdafc245c3ea21e369a8b595b6c60991a1c082bc65cf3681de5bcd66953fd4480e5895b45a9ae71 SHA512 08cc502599136db86b501be4793cdbc2aa0debced9dce0ac3a470b977595241b1d4eb32252095d644cf13661f04e9bd1f33fef43f506e567eed67f69d2548213
-AUX calligra-3.2.1-openexr-3.patch 3188 BLAKE2B 221e8925f86418ef491a2e43c0e2981be4962b2afcb74465a93f3af22ad6cedfd36119006831d89af8b05dfd5b833f3a5ba0f4593559377b5e20d0479c981e22 SHA512 4ad40876e68317fab59dfc7f5672ef850e40edf636dd6ed996a8239850fd4705825e18db86f132d4d0f06540e804c66d86b1954702187f57b90fd811d2c59bf5
-AUX calligra-3.2.1-poppler-22.03.0-1.patch 3030 BLAKE2B c919e410dd252a3fefed1ca05c5c2bbc16deff583e8225dcd7d942a0846e378ba662f35b8983601b0d99f691f9f55d855e2a65a4bc274a6a0895c50fc25336be SHA512 11f660e5a097a25bd718503d2f46676b3c8647f30e6b5920184ccb8314faa1d22ac9a62ecf97f75391f59fc435422e6c33ff87cb8045c74299f1cfa4f847ad7f
-AUX calligra-3.2.1-poppler-22.03.0-2.patch 3453 BLAKE2B 02967036156934898862c9fe157033d0f946f78858ffd8d9a75fb7cca0d93e62c4d1a5fb8fed74de190addede37e32c07915e4b60da04634417e99d13bd35f20 SHA512 3322c81a2b596d3b1e49a0af4c0f13934f6674cdb0dfa7f9c5552117cfc4858ea2a7720c6a405c18b121a61c9bdce62b575703c58a9137addeed3906d210a518
-AUX calligra-3.2.1-poppler-22.04.0.patch 897 BLAKE2B 27619f10b4902da729f9e5d99c872e95bb61953de7c2a27d760e463b3d27e950cf113515671d9fb15ff5fcdd51c30c6d266e7166fdf64499f445afa02120c7f2 SHA512 9ec649c29051d5ca9faf9e6f84b6ba2cfe2ba600c5d84feaa0f87df1b1656fe5616be4ff3413ae985894f68cc2dceb7eca344f2642bc3e9b429915e506994009
+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-r5.ebuild 5562 BLAKE2B 5e46aad452be85eb22f3667f6d6f697ad83b2128ef1dfe3cde07d0d29d253eac7c05877ecde77b0218273703ad16279d397e4d512a10b0ebf16d611572883a9c SHA512 79e297a2d6e3866765cd922c4df735a1d0913dfdfafacad0a21a53f61fb0045a1f0cb0571b6b361da46497baca4b476acb34c23fcc032304e03ce1d3fa81c492
+EBUILD calligra-3.2.1-r5.ebuild 5740 BLAKE2B eee68fd25820fc31aec3ad18ec302b077e1801eef3236d204084047165ca58db1508ac1cbe0a58d8db1775a1515547459bf3153a67356b3f0ac1b220854b9cd3 SHA512 7b06e50abd506e5e1ba761bc1281bbaed0ebb3a42f078bae0f84abdedda00ba0065280fb0ecc96507a88e74559dff235b86032ddd55eee825d93866753e15a4a
+EBUILD calligra-3.2.1-r6.ebuild 5815 BLAKE2B a6c220c4f7c635f54a00018281d746f3a37b55d27dfc207bca2f327ed69839a2878a79db7ce5c2e056b6b0325bebde3f13530e702f2ccd4372bdd602f6f3de46 SHA512 e95971201c4578e034cc9aa06acb109bc0e8a793181c17326eb2c6b121bbb481079c389991461b9f0f4743e867ca81e6831dcca31f66cdac494d4fd1783e526c
 MISC metadata.xml 1279 BLAKE2B a815b1fb41dea6bd2da248722708606b3bb56b4e3df2036e141f0f53bc432a3a40f26cc0edff1425965f72f3b9d4cd8bf3397b538598d248145fd195481a282b SHA512 b59cd1b0469cdc8aa4354bb918152fe66535ca1ed9c3b83178b1753f04128f8ce5fc64a0daab36b8b1aa92568ef5ae9d298539b40a82fa8a974536a55150f5e8
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-r6.ebuild b/app-office/calligra/calligra-3.2.1-r6.ebuild
new file mode 100644
index 000000000000..4d434a0c1d25
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r6.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 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=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 ~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/qtscript-${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-frameworks/kactivities-${KFMIN}:5 )
+	charts? ( dev-libs/kdiagram:5 )
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+	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? ( kde-apps/okular:5 )
+	pdf? ( app-text/poppler:=[qt5] )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	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
+)
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	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/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?= <omerusta@gmail.com>
-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 <pinaraf@pinaraf.info>
-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 <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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 <arojas@archlinux.org>
-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 <arojas@archlinux.org>
-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 <arojas@archlinux.org>
-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 <aacid@kde.org>
-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 <dag.andersen@kdemail.net>
-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 accid@kde.org.
----
- 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 <aacid@kde.org>
-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
-