* [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/files/
@ 2022-04-21 19:38 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-04-21 19:38 UTC (permalink / raw
To: gentoo-commits
commit: 48f8a9c9e5852eb69432262f9cbf3df4eefc72cb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 19:31:55 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:38:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f8a9c9
kde-apps/pimcommon: Add missing patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/pimcommon-22.03.80-unused-dep-1.patch | 131 +++++++++++++++++++++
.../files/pimcommon-22.03.80-unused-dep-2.patch | 38 ++++++
2 files changed, 169 insertions(+)
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
new file mode 100644
index 000000000000..d2ffd9c1d3e3
--- /dev/null
+++ b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch
@@ -0,0 +1,131 @@
+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
new file mode 100644
index 000000000000..bba55e966e95
--- /dev/null
+++ b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch
@@ -0,0 +1,38 @@
+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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/files/
@ 2022-12-03 10:57 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-12-03 10:57 UTC (permalink / raw
To: gentoo-commits
commit: c826bc248a64b99c7a4cf14caf6e25ebc04afeb3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 10:57:06 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 10:57:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c826bc24
kde-apps/pimcommon: Drop obsolete patches
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/pimcommon-22.03.80-unused-dep-1.patch | 131 ---------------------
.../files/pimcommon-22.03.80-unused-dep-2.patch | 38 ------
2 files changed, 169 deletions(-)
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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-03 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03 10:57 [gentoo-commits] repo/gentoo:master commit in: kde-apps/pimcommon/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-04-21 19:38 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox