Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-apps/pimcommon
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/pimcommon')
-rw-r--r--kde-apps/pimcommon/Manifest3
-rw-r--r--kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch131
-rw-r--r--kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch38
-rw-r--r--kde-apps/pimcommon/pimcommon-23.08.5.ebuild (renamed from kde-apps/pimcommon/pimcommon-22.04.3.ebuild)19
-rw-r--r--kde-apps/pimcommon/pimcommon-24.05.0.ebuild55
5 files changed, 64 insertions, 182 deletions
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index ded3cc211ee7..d250332a2046 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1 +1,2 @@
-DIST pimcommon-22.04.3.tar.xz 375756 BLAKE2B 8a008859888e14fd18107c44ba544e58a85c769c3c7a44828010de9fba53e4299de5ce294afda7ee68dabd761a181fda63ae2e48aa7867d9e0f82a6ce937a62e SHA512 4ada53fe93b9c00744c18e167cab63d9110de72dba9175154a1f4aec3a4a3204638c9f1912f2aac25e8f9cda3d5d68d712a55058b739db36b17db7b718872084
+DIST pimcommon-23.08.5.tar.xz 349196 BLAKE2B 66d525d68108ecba772cb4f145da893a3f739f3729cd458c62fcc4affaaed8776a4dc558db25fb86597e0842738f2820af622efe6c24e4ed344d43477d5795db SHA512 36464dc23f601d7ffb4cd85be9bc48c15bf610b59de635664ba01d50c914e58ce78c66f0ba33c4db245fd063d721b7b918fd39ab0e466a307a52f7b32d627ae3
+DIST pimcommon-24.05.0.tar.xz 349020 BLAKE2B 99d3ffaa4898771ef498ad32a787b84ad56de4bc052a7367f286516c4beb73db2bee53a3477ef0d0b286456f00b0b9fd581b1c3300c39ad36b485ce4008f5433 SHA512 9432a6eb840c389b945e0f779d291aff77cd050255a582712736b29583a0259fafba1ea7b4912e6853d99d32ab87d36e46bf244a660f402a2f7a79ff25cd3af7
diff --git a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch
deleted file mode 100644
index d2ffd9c1d3e3..000000000000
--- a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 9acb24cc6c35a98d90da94a72c13ca5b20c88b26 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 15 Mar 2022 07:00:44 +0100
-Subject: [PATCH] not used now (kpimprintpreviewdialog)
-
----
- src/pimcommon/CMakeLists.txt | 3 --
- .../widgets/kpimprintpreviewdialog.cpp | 44 -------------------
- .../widgets/kpimprintpreviewdialog.h | 31 -------------
- 3 files changed, 78 deletions(-)
- delete mode 100644 src/pimcommon/widgets/kpimprintpreviewdialog.cpp
- delete mode 100644 src/pimcommon/widgets/kpimprintpreviewdialog.h
-
-diff --git a/src/pimcommon/CMakeLists.txt b/src/pimcommon/CMakeLists.txt
-index 7af8744..349d2f4 100644
---- a/src/pimcommon/CMakeLists.txt
-+++ b/src/pimcommon/CMakeLists.txt
-@@ -99,7 +99,6 @@ target_sources(KF5PimCommon PRIVATE
- widgets/configureimmutablewidgetutils.cpp
- widgets/kactionmenuchangecase.cpp
- widgets/spellchecklineedit.cpp
-- widgets/kpimprintpreviewdialog.cpp
- widgets/lineeditwithcompleterng.cpp
- widgets/customlogwidget.cpp
- customtools/customtoolsplugin.cpp
-@@ -143,7 +142,6 @@ target_sources(KF5PimCommon PRIVATE
- translator/translatorwidget.h
- translator/translatorutil.h
- widgets/renamefiledialog.h
-- widgets/kpimprintpreviewdialog.h
- widgets/spellchecklineedit.h
- widgets/customtreeview.h
- widgets/lineeditwithcompleterng.h
-@@ -376,7 +374,6 @@ ecm_generate_headers(PimCommon_Camelcasewidgets_HEADERS
- RenameFileDialog
- SimpleStringListEditor
- KActionMenuChangeCase
-- KPimPrintPreviewDialog
- LineEditWithCompleterNg
- CustomLogWidget
- PurposeMenuWidget
-diff --git a/src/pimcommon/widgets/kpimprintpreviewdialog.cpp b/src/pimcommon/widgets/kpimprintpreviewdialog.cpp
-deleted file mode 100644
-index 8717ecf..0000000
---- a/src/pimcommon/widgets/kpimprintpreviewdialog.cpp
-+++ /dev/null
-@@ -1,44 +0,0 @@
--/*
-- SPDX-FileCopyrightText: 2015-2022 Laurent Montel <montel@kde.org>
--
-- SPDX-License-Identifier: GPL-2.0-or-later
--*/
--
--#include "kpimprintpreviewdialog.h"
--#include <KConfigGroup>
--#include <KSharedConfig>
--
--using namespace PimCommon;
--
--KPimPrintPreviewDialog::KPimPrintPreviewDialog(QWidget *parent)
-- : QPrintPreviewDialog(parent)
--{
-- readConfig();
--}
--
--KPimPrintPreviewDialog::KPimPrintPreviewDialog(QPrinter *printer, QWidget *parent)
-- : QPrintPreviewDialog(printer, parent)
--{
-- readConfig();
--}
--
--KPimPrintPreviewDialog::~KPimPrintPreviewDialog()
--{
-- writeConfig();
--}
--
--void KPimPrintPreviewDialog::readConfig()
--{
-- KConfigGroup group(KSharedConfig::openStateConfig(), "KPimPrintPreviewDialog");
-- const QSize size = group.readEntry("Size", QSize(800, 600));
-- if (size.isValid()) {
-- resize(size);
-- }
--}
--
--void KPimPrintPreviewDialog::writeConfig()
--{
-- KConfigGroup group(KSharedConfig::openStateConfig(), "KPimPrintPreviewDialog");
-- group.writeEntry("Size", size());
-- group.sync();
--}
-diff --git a/src/pimcommon/widgets/kpimprintpreviewdialog.h b/src/pimcommon/widgets/kpimprintpreviewdialog.h
-deleted file mode 100644
-index 978939a..0000000
---- a/src/pimcommon/widgets/kpimprintpreviewdialog.h
-+++ /dev/null
-@@ -1,31 +0,0 @@
--/*
-- SPDX-FileCopyrightText: 2015-2022 Laurent Montel <montel@kde.org>
--
-- SPDX-License-Identifier: GPL-2.0-or-later
--*/
--
--#pragma once
--
--#include "pimcommon_export.h"
--#include <QPrintPreviewDialog>
--
--namespace PimCommon
--{
--/**
-- * @brief The KPimPrintPreviewDialog class
-- * @author Laurent Montel <montel@kde.org>
-- */
--class PIMCOMMON_EXPORT KPimPrintPreviewDialog : public QPrintPreviewDialog
--{
-- Q_OBJECT
--public:
-- explicit KPimPrintPreviewDialog(QWidget *parent = nullptr);
-- explicit KPimPrintPreviewDialog(QPrinter *printer, QWidget *parent = nullptr);
-- ~KPimPrintPreviewDialog() override;
--
--private:
-- void readConfig();
-- void writeConfig();
--};
--}
--
---
-GitLab
-
diff --git a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch
deleted file mode 100644
index bba55e966e95..000000000000
--- a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9fd75aab1bcb4a3be256cfd1a2730027d912b79b Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Tue, 15 Mar 2022 18:26:59 +0100
-Subject: [PATCH] Remove the now unused Qt::PrintSupport dependency
-
----
- CMakeLists.txt | 2 +-
- src/pimcommon/CMakeLists.txt | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43e0c39..9d9cb8e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,7 @@ set(KLDAP_LIB_VERSION "5.19.80")
- set(AKONADICONTACT_LIB_VERSION "5.19.80")
- set(AKONADI_VERSION "5.19.80")
-
--find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml PrintSupport)
-+find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml)
-
- find_package(KF5Archive ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/src/pimcommon/CMakeLists.txt b/src/pimcommon/CMakeLists.txt
-index 349d2f4..beeef6f 100644
---- a/src/pimcommon/CMakeLists.txt
-+++ b/src/pimcommon/CMakeLists.txt
-@@ -201,7 +201,6 @@ target_link_libraries(KF5PimCommon
- KF5::NewStuff
- KF5::XmlGui
- KF5::KIOWidgets
-- Qt${QT_MAJOR_VERSION}::PrintSupport
- KF5::ItemViews
- KF5::NewStuff
- )
---
-GitLab
-
diff --git a/kde-apps/pimcommon/pimcommon-22.04.3.ebuild b/kde-apps/pimcommon/pimcommon-23.08.5.ebuild
index 7dcda582d7a9..c5d4d7081bd5 100644
--- a/kde-apps/pimcommon/pimcommon-22.04.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-23.08.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,9 +7,8 @@ ECM_DESIGNERPLUGIN="true"
ECM_QTHELP="true"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
+KFMIN=5.106.0
+QTMIN=5.15.9
inherit ecm gear.kde.org
DESCRIPTION="Common PIM libraries"
@@ -19,7 +18,8 @@ SLOT="5"
KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
-DEPEND="
+RDEPEND="
+ dev-libs/ktextaddons:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -36,7 +36,6 @@ DEPEND="
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
@@ -49,16 +48,12 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/purpose-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !<kde-apps/libkdepim-20.07.80:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.03.80-unused-dep-{1,2}.patch )
+DEPEND="${RDEPEND}"
src_test() {
# bugs 641730, 661330
local myctestargs=(
- -E "(autocorrectiontest|pimcommon-translator-translatortest)"
+ -E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
)
ecm_src_test
diff --git a/kde-apps/pimcommon/pimcommon-24.05.0.ebuild b/kde-apps/pimcommon/pimcommon-24.05.0.ebuild
new file mode 100644
index 000000000000..7fd4c7cbb35f
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-24.05.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.0.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/ktextaddons-1.5.4:6
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+ >=kde-apps/akonadi-${PVCUT}:6
+ >=kde-apps/akonadi-contacts-${PVCUT}:6
+ >=kde-apps/akonadi-search-${PVCUT}:6
+ >=kde-apps/kimap-${PVCUT}:6
+ >=kde-apps/kldap-${PVCUT}:6
+ >=kde-apps/libkdepim-${PVCUT}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kcontacts-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/purpose-${KFMIN}:6
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+ # bugs 641730, 661330
+ local myctestargs=(
+ -E "(autocorrectiontest|pimcommon-translator-translatorwidgettest)"
+ )
+
+ ecm_src_test
+}