diff options
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/Manifest.gz | bin | 37211 -> 37226 bytes | |||
-rw-r--r-- | kde-apps/kdepim-addons/Manifest | 6 | ||||
-rw-r--r-- | kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch | 79 | ||||
-rw-r--r-- | kde-apps/kdepim-addons/kdepim-addons-22.08.3-r1.ebuild (renamed from kde-apps/kdepim-addons/kdepim-addons-22.08.3.ebuild) | 4 | ||||
-rw-r--r-- | kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild | 87 | ||||
-rw-r--r-- | kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild (renamed from kde-apps/kdepim-addons/kdepim-addons-22.12.1.ebuild) | 4 | ||||
-rw-r--r-- | kde-apps/okular/Manifest | 4 | ||||
-rw-r--r-- | kde-apps/okular/okular-22.08.3-r2.ebuild (renamed from kde-apps/okular/okular-22.08.3-r1.ebuild) | 4 | ||||
-rw-r--r-- | kde-apps/okular/okular-22.12.1-r1.ebuild (renamed from kde-apps/okular/okular-22.12.1.ebuild) | 2 |
9 files changed, 180 insertions, 10 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex d891c3a2145d..210dd3e89043 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest index 18cc506a8fe9..a9a5fe11c9bd 100644 --- a/kde-apps/kdepim-addons/Manifest +++ b/kde-apps/kdepim-addons/Manifest @@ -1,5 +1,7 @@ +AUX kdepim-addons-22.08.3-spamassassin-4.patch 2287 BLAKE2B 378da71f00f434ad8b6689063289f4f3a54f283c0e5a825ecc024d796be2339a5006530c32ffba13000cc46a70b2a9239113770a673087d937137d290f4d9612 SHA512 c1c795fc22f09a8cea95e776634c5bcc8966bc8ccee5af7736fe011412c9bf1694b17473f640ba29b39dd8e0a6cc79a700b6faa9a7ad532cbe8f18934e0e2111 DIST kdepim-addons-22.08.3.tar.xz 2301376 BLAKE2B 9e7cc90f8962b963e240cdf705301e399f409547396a77e3d5f506332c9897d9e89743f57bf725a21f348fe23f0b9d51e09552dbf5db88aaf7b2307a1d307671 SHA512 6e05806a5e1810c41e5af54cbf5aeef9345f4a168f520f0ed2a91552b4b786e0cfe9be98c127869640d2ed5f342a03da189fc60913c313517de4ff19ff66f1fb DIST kdepim-addons-22.12.1.tar.xz 2663620 BLAKE2B 0d9ce3785330b013699fea72fcb4440e03ec57b16dddc002402c15d06328a3875228bade66de5ef732f08438c240e56416a122d7b20e0ef652b222c48e1b2c90 SHA512 3d8c715e72a8b71139cb3dd21a54a6e88c0ecd31345f9db3f23d30dd91acfaaefb78754dcf6aaeb7434b8555b7fdd0f7393a08cee51ba350b6a45ce6cb643785 -EBUILD kdepim-addons-22.08.3.ebuild 2435 BLAKE2B 131b6da19a6ed9b81f676cc92af695c52153511dba5b78b2b66db60bb1b327f74ae516ad402c771cabf74a9f7a96a0405ec28ae57e41721095c4e093be098fd2 SHA512 947dea697a35e2c12049547d1edb5f872a46713b016f16bd5e8717f94ab8a0d8f2c9fdab18cda2ddc2d687ad0e064707ab887d83748b4e20632cae347679d20c -EBUILD kdepim-addons-22.12.1.ebuild 2439 BLAKE2B 6f0a09ea845c2a0c69c6aa5f8f82e2af8da95aae12a1fa7235a15bc02adac96812641924d5dd526f4be2fb9d0bad4df1c34f440eafc83358bbb751c7a43eb9cd SHA512 d4543ba241f89af98afe33645821f62ad90a531ea0d049aa7fbb1c2718d5a23c72784a9ac66acc24f0b8917a56566f8657a3166bceb0ac40947cf88386765407 +EBUILD kdepim-addons-22.08.3-r1.ebuild 2437 BLAKE2B a19e5c689c83ca3505bd42f328fb5e78b75c247489f73ce7585ceff92acbfad66475cb0400958b229eb565365872048cdbb21cdf1366c717e98597b7459ad83b SHA512 84bd181a8cfa8f7a97c63a3f428593c4f1203c47f6777505779c5facf8d3710059e1b43b24f10f3c676f19b4f7d7d882d0237aa763168f18ec53e95d92828481 +EBUILD kdepim-addons-22.08.3-r2.ebuild 2493 BLAKE2B 5b90ad0f6fdc85a8558ca90149f3fbf4e9ece8932c99406cc253f3bad58ee01d5d3bb5f4a56fb50ca6f82c503f781a3d909bc5340c67d2ee851d2797f4e8bf37 SHA512 5cba1cf9d292ba3b7787485912fa55a04c9e07b96a77581ace2283605fa054c927b5a16c617b734407bba8921140fbfbf9ec438bf491d3b5b4fa9e55907c4994 +EBUILD kdepim-addons-22.12.1-r2.ebuild 2503 BLAKE2B 7e4b811a0a2606afa4aa6e47adc46a309201a88b469d5fabba1056a22df24145ef27036b4abe384026edc7f556fb8f13d4bf17071d691d359c28e776db006bf7 SHA512 098aba0aef93cdfe603108ce267b0cf17bd54f4dda19fe177bbbefda90a2dfcaaa981f0e4f06a248efdc5426aca18f23dfed0d9f0be06c5e2c6b7e2d935d5968 MISC metadata.xml 535 BLAKE2B 372b4b81f73cab00c89c12fb43fbb4edeea2521a7f443c70bdd68269780b82ed98e71d5a1b16cab55827f11fefbd70c65fbf860e3d6b73b39647bc02256edaf1 SHA512 a4a82c962488e785ecc5b36711c5730955f0352d7fcc184facfc351668dd22ba82247b9608ca39fac48f6260f29283b3c95e967ab0d887421f5849b425aa7b4d diff --git a/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch b/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch new file mode 100644 index 000000000000..ef9436f0548f --- /dev/null +++ b/kde-apps/kdepim-addons/files/kdepim-addons-22.08.3-spamassassin-4.patch @@ -0,0 +1,79 @@ +From e9eda87eaf8838d5ee29860129817e5b90afd78e Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Sun, 29 Jan 2023 16:32:01 +0100 +Subject: [PATCH] Fix kdepim-addons: support Spamassassin 4.0.0 with Kmail + +BUG: 464973 +FIXED-IN: 5.22.2 +--- + kmail/plugins/common/kmail.antispamrc | 52 ++++++++++++++++++++++++++- + 1 file changed, 51 insertions(+), 1 deletion(-) + +diff --git a/kmail/plugins/common/kmail.antispamrc b/kmail/plugins/common/kmail.antispamrc +index 67f920b85..acdf1c205 100644 +--- a/kmail/plugins/common/kmail.antispamrc ++++ b/kmail/plugins/common/kmail.antispamrc +@@ -1,5 +1,5 @@ + [General] +-tools=12 ++tools=14 + + [Spamtool #1] + Ident=spamassassin +@@ -258,3 +258,53 @@ ScoreHeader=X-Spamd-Result + ScoreType=Adjusted + ScoreValueRegexp=\\[([\\d\\.-]+)[^\\d\\.] + ScoreThresholdRegexp= \\/ ([\\d\\.-]+)[^\\d\\.] ++ ++[Spamtool #13] ++Ident=spamassassin ++Version=1 ++Priority=42 ++VisibleName=SpamAssassin 4.x (Perl) ++Executable=spamassassin -V | grep "SpamAssassin version 4" ++URL=https://spamassassin.apache.org/ ++PipeFilterName=SpamAssassin Check ++PipeCmdDetect=spamassassin -L ++PipeCmdNoSpam=spamassassin -d ++ExecCmdSpam=sa-learn -L --spam --no-sync ++ExecCmdHam=sa-learn -L --ham --no-sync ++DetectionHeader=X-Spam-Flag ++DetectionPattern=(yes)|(YES) ++DetectionPattern2= ++DetectionOnly=0 ++UseRegExp=1 ++SupportsBayes=1 ++SupportsUnsure=0 ++ScoreName=Spamassassin ++ScoreHeader=X-Spam-Status ++ScoreType=Adjusted ++ScoreValueRegexp=(?:hits|score)=([\\d\\.-]+)[^\\d\\.] ++ScoreThresholdRegexp=required=([\\d\\.-]+)[^\\d\\.] ++ ++[Spamtool #14] ++Ident=spamd ++Version=1 ++Priority=46 ++VisibleName=SpamAssassin 4.x (Daemon) ++Executable=echo "From: test" | spamc -x && spamassassin -V | grep "SpamAssassin version 4" ++URL=https://spamassassin.apache.org/ ++PipeFilterName=SpamAssassin Service Check ++PipeCmdDetect=spamc ++PipeCmdNoSpam=spamassassin -d ++ExecCmdSpam=sa-learn -L --spam --no-sync --single ++ExecCmdHam=sa-learn -L --ham --no-sync --single ++DetectionHeader=X-Spam-Flag ++DetectionPattern=(yes)|(YES) ++DetectionPattern2= ++DetectionOnly=0 ++UseRegExp=1 ++SupportsBayes=1 ++SupportsUnsure=0 ++ScoreName=Spamassassin ++ScoreHeader=X-Spam-Status ++ScoreType=Adjusted ++ScoreValueRegexp=(?:hits|score)=([\\d\\.-]+)[^\\d\\.] ++ScoreThresholdRegexp=required=([\\d\\.-]+)[^\\d\\.] +-- +GitLab + diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r1.ebuild index 253d0f82a089..b669a0282cf4 100644 --- a/kde-apps/kdepim-addons/kdepim-addons-22.08.3.ebuild +++ b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,7 +64,7 @@ RDEPEND=" >=kde-frameworks/prison-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 ) - markdown? ( app-text/discount ) + markdown? ( app-text/discount:= ) " DEPEND="${RDEPEND}" diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild new file mode 100644 index 000000000000..378814b81d41 --- /dev/null +++ b/kde-apps/kdepim-addons/kdepim-addons-22.08.3-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.96.0 +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm gear.kde.org optfeature + +DESCRIPTION="Plugins for KDE Personal Information Management Suite" +HOMEPAGE="https://apps.kde.org/kontact/" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="importwizard markdown" + +RESTRICT="test" + +RDEPEND=" + >=app-crypt/gpgme-1.16.0:=[cxx,qt5] + >=dev-libs/grantlee-5.2.0:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-apps/akonadi-${PVCUT}:5 + >=kde-apps/akonadi-contacts-${PVCUT}:5 + >=kde-apps/akonadi-notes-${PVCUT}:5 + >=kde-apps/calendarsupport-${PVCUT}:5 + >=kde-apps/eventviews-${PVCUT}:5 + >=kde-apps/grantleetheme-${PVCUT}:5 + >=kde-apps/incidenceeditor-${PVCUT}:5 + >=kde-apps/kaddressbook-${PVCUT}:5 + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kimap-${PVCUT}:5 + >=kde-apps/kitinerary-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/kpkpass-${PVCUT}:5 + >=kde-apps/libkdepim-${PVCUT}:5 + >=kde-apps/libkleo-${PVCUT}:5 + >=kde-apps/libksieve-${PVCUT}:5 + >=kde-apps/libktnef-${PVCUT}:5 + >=kde-apps/mailcommon-${PVCUT}:5 + >=kde-apps/messagelib-${PVCUT}:5 + >=kde-apps/pimcommon-${PVCUT}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/prison-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 ) + markdown? ( app-text/discount:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-spamassassin-4.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package importwizard KPimImportWizard) + $(cmake_use_find_package markdown Discount) + ) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor + fi + ecm_pkg_postinst +} diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild index 4402d2c94965..4db31e0d4b3b 100644 --- a/kde-apps/kdepim-addons/kdepim-addons-22.12.1.ebuild +++ b/kde-apps/kdepim-addons/kdepim-addons-22.12.1-r2.ebuild @@ -64,10 +64,12 @@ RDEPEND=" >=kde-frameworks/prison-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 ) - markdown? ( app-text/discount ) + markdown? ( app-text/discount:= ) " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${PN}-22.08.3-spamassassin-4.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package importwizard KPimImportWizard) diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 966a34858f25..915b832dbcd6 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -3,6 +3,6 @@ AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419 AUX okular-22.08.3-drop-broken-kf-version-check.patch 1116 BLAKE2B 6a136da55db35ac83416d5dffacd22e3f6468fa829eb5a4d31d2c90fde9d7d4cfd11b9d90dc63539565b16311daa4a18a0c2deea3e4988d92638f89569c034b0 SHA512 a9db6f222a2ed64ac82f3c3967340bde40784c0b1e76cdd87d23dce535d1c2b8772a86e65f871739c623f690f363bf394234b8a0adb5b0bbb954206e03e97208 DIST okular-22.08.3.tar.xz 8225824 BLAKE2B 1a8a9bd669173a941ef337ecdaeded4fd9df30e2df693afb012f85fda8d06e588385264ca7134dcf39466f0f2730a1ce70c0434e292033b8a67585eb9a386a1f SHA512 c2d8384e6b0eba4a477e5b0bb1e8046ed10b28162fee9e902e0cc1409a982187244e46a51f0e79e5ba292ea57440ac55005984d31148462787a040308571b69a DIST okular-22.12.1.tar.xz 8378384 BLAKE2B 410369762e3799e9dc105c5446cd0edf73d87d595742879ebc302507c2ae51d9e1f2504a3b78b5f7c47bef22f48ae37f1295b56a4335c13a116f0a43273ff667 SHA512 848d0eb7b34eeba5bcccf25a067d6ab86551eddc767d4d62408b5adc0af25d83f747f74b68a6b0c4dcf36df9b610b090de0fcd3a16a524cb3bca27552d9192e4 -EBUILD okular-22.08.3-r1.ebuild 3569 BLAKE2B d9a183e7ac85f3897f2a9b1d71e459d308f7ff72711045f92ad36ecb794430c8163337ffc4a1513030fe9b58be2789087adac4e270748845698da5110cc19279 SHA512 6570b8878f11e858571bcea07e0c638ff4e2f2923b9060e22db75925c98dcebcead8540df9ab0b32dadc567b158a7adb415af40d11972e7168a5e1760cb2e52b -EBUILD okular-22.12.1.ebuild 3580 BLAKE2B 8d84bc8b0cae4d13f69bc420a94c917dcbd9d67b9285c3551542f07985c8afc99c0e86602e5f1bdfd63968558669320e08ba892dc5bb1079345eda846d1a8b64 SHA512 7761daf916bc226a463cc9c5348c1ff2c1c374b6eef39b41f1404c03914c5bd41806d5354b11beed9454a0cfcea85fe4aa14e27e8ee70e990977e576f975e6bd +EBUILD okular-22.08.3-r2.ebuild 3571 BLAKE2B 1188a13f701fbbfc7b0b2be3a780330752a87690735c832e2696e3f64946c221ff3af84b7e3daf0445e90d4b729e354eeaa7cc20da779c4cfd455015f46a77ea SHA512 bcbcd466e967c416d942455131538e030488b689c23708b2bdffc7a4327ada21c78daca1d17912d018433d0d298cc04e096c30ddfbccbfcfca89a0c388873115 +EBUILD okular-22.12.1-r1.ebuild 3582 BLAKE2B 4f57fe8b12133eefd0127769c8dbda309107933687e689afb6fc9edeace0004e676223d9a06a12fb4b4129da2d25eebedc653d9d1bf7c14935d389177868ad3f SHA512 b488465e3591efdb11e6d2056b047381710aa21f61ff7e9a6fde5fe4d7d9136ddc025d51f62eee33a020b9d1e6affa56cffe7713b62a28f88829305a3f8909fb MISC metadata.xml 1134 BLAKE2B d2bf9a6b378094bfd999f9e4bc3f1ca40d0c9014e247d2df308ddd413999e7a9ffd2dbca3cecff50f696435b16e8be83a3167ed51e5bac737f1720f4502f02f0 SHA512 8dabf09a40eb2cf7c2e0be18d33020b6ccf777115e7c047bfc4791ad0e23554ac25e6ed8da8528281e067b71567dad3407634562273aedae419759bab4e0d416 diff --git a/kde-apps/okular/okular-22.08.3-r1.ebuild b/kde-apps/okular/okular-22.08.3-r2.ebuild index 28bccacbb618..26b840981dad 100644 --- a/kde-apps/okular/okular-22.08.3-r1.ebuild +++ b/kde-apps/okular/okular-22.08.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,7 +50,7 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] >=kde-apps/libkexiv2-${PVCUT}:5 ) - markdown? ( >=app-text/discount-2.2.7-r1 ) + markdown? ( >=app-text/discount-2.2.7-r1:= ) mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) plucker? ( media-libs/libjpeg-turbo:= ) diff --git a/kde-apps/okular/okular-22.12.1.ebuild b/kde-apps/okular/okular-22.12.1-r1.ebuild index d8ac8d37d82c..b53a5f62b2fd 100644 --- a/kde-apps/okular/okular-22.12.1.ebuild +++ b/kde-apps/okular/okular-22.12.1-r1.ebuild @@ -52,7 +52,7 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] >=kde-apps/libkexiv2-${PVCUT}:5 ) - markdown? ( >=app-text/discount-2.2.7-r1 ) + markdown? ( >=app-text/discount-2.2.7-r1:= ) mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) plucker? ( media-libs/libjpeg-turbo:= ) |