* [gentoo-commits] repo/gentoo:master commit in: kde-misc/zanshin/files/, kde-misc/zanshin/
@ 2019-06-22 11:44 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-22 11:44 UTC (permalink / raw
To: gentoo-commits
commit: b8a603506cb2bf061a03f12fc5e206073f903375
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 11:02:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 11:44:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a60350
kde-misc/zanshin: Fix build against >=kde-apps/akonadi-19.04
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch | 25 ++++++++++++++++++++++++
kde-misc/zanshin/zanshin-0.5.0.ebuild | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch b/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
new file mode 100644
index 00000000000..6d6facbaeaa
--- /dev/null
+++ b/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
@@ -0,0 +1,25 @@
+From 87e98e6b0aa704558009574eed8d8bdf2bfa0fbb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 22 Jun 2019 12:47:28 +0200
+Subject: [PATCH] Add missing KF5 dependency (fix broken cmake against >=19.04)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6191f54..960fc6c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,6 +67,7 @@ include_directories (
+
+ find_package(KF5 REQUIRED COMPONENTS
+ AkonadiCalendar
++ AkonadiContact
+ AkonadiNotes
+ AkonadiSearch
+ IdentityManagement
+--
+2.22.0
+
diff --git a/kde-misc/zanshin/zanshin-0.5.0.ebuild b/kde-misc/zanshin/zanshin-0.5.0.ebuild
index 3a8f084bb7b..96b3141c24e 100644
--- a/kde-misc/zanshin/zanshin-0.5.0.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -60,3 +60,5 @@ RDEPEND="${COMMON_DEPEND}
!kde-misc/zanshin:4
$(add_kdeapps_dep kdepim-runtime)
"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/zanshin/files/, kde-misc/zanshin/
@ 2019-12-08 13:24 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-12-08 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 7d1ec4525c61e899f2167f1026da7e42e558e76d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 8 12:20:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 13:24:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1ec452
kde-misc/zanshin: Drop 0.5.0-r1
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/zanshin/Manifest | 1 -
kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch | 25 ---------
kde-misc/zanshin/zanshin-0.5.0-r1.ebuild | 64 ------------------------
3 files changed, 90 deletions(-)
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index ed54309907c..533557d8c70 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,2 +1 @@
-DIST zanshin-0.5.0.tar.xz 438300 BLAKE2B 323f7f8545ba59daf2e62af6873be47b81e62b808495757752e4a33e3b0816c63e0e08979695c33cc70b4aebcff6d30814b8cbb400fe64af5329e72501639399 SHA512 9e4f01ee622a07096b7cc234a6a2f0b35501497efb662af590d4c4fa3f55f21acc528bfae10e92da8107f26f3d5f4b777730512c97017c36cad96d6e6cb28e43
DIST zanshin-0.5.71.tar.gz 355173 BLAKE2B 245ccde6b6a68ca0b7093525b2b3d0384b9222efbbb6366060a5061020c565dcd7e6b9b6e4fffadc164bae93783bdcf69e2d02b1df4c9cb382c473dc1a10152b SHA512 c04f280066f97e3984988a86376b6e86b451d0fe5bab31eba4de03f2c2d15e65a3681d3f9f6895bf0750ccac4bf7a4666d742dd9c74028e689d732615cce3e97
diff --git a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch b/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
deleted file mode 100644
index 6d6facbaeaa..00000000000
--- a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87e98e6b0aa704558009574eed8d8bdf2bfa0fbb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 22 Jun 2019 12:47:28 +0200
-Subject: [PATCH] Add missing KF5 dependency (fix broken cmake against >=19.04)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6191f54..960fc6c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@ include_directories (
-
- find_package(KF5 REQUIRED COMPONENTS
- AkonadiCalendar
-+ AkonadiContact
- AkonadiNotes
- AkonadiSearch
- IdentityManagement
---
-2.22.0
-
diff --git a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
deleted file mode 100644
index 981efbc3be5..00000000000
--- a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
- test? ( <kde-apps/akonadi-19.04.50:5[tools] )
-"
-COMMON_DEPEND="
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- <kde-apps/akonadi-19.04.50:5
- <kde-apps/akonadi-calendar-19.04.50:5
- <kde-apps/akonadi-contacts-19.04.50:5
- <kde-apps/akonadi-notes-19.04.50:5
- <kde-apps/akonadi-search-19.04.50:5
- <kde-apps/kcalcore-19.04.50:5
- <kde-apps/kcontacts-19.04.50:5
- <kde-apps/kidentitymanagement-19.04.50:5
- <kde-apps/kldap-19.04.50:5
- <kde-apps/kmime-19.04.50:5
- <kde-apps/kontactinterface-19.04.50:5
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-misc/zanshin:4
- <kde-apps/kdepim-runtime-19.04.50:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/zanshin/files/, kde-misc/zanshin/
@ 2021-12-29 15:42 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-12-29 15:42 UTC (permalink / raw
To: gentoo-commits
commit: dd7776f56d11cfc046d4a3d47641252ac223dd77
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 16:47:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 15:41:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7776f5
kde-misc/zanshin: Drop 0.5.71-r2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/zanshin/Manifest | 1 -
.../files/zanshin-0.5.71-akonadi-20.07.80.patch | 24 --------
.../zanshin-0.5.71-kontactinterface-20.07.80.patch | 58 -------------------
kde-misc/zanshin/zanshin-0.5.71-r2.ebuild | 67 ----------------------
4 files changed, 150 deletions(-)
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index b228a9f822d0..e8842d60f0ce 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,2 +1 @@
-DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
DIST zanshin-21.12.0.tar.xz 350888 BLAKE2B 5757193d46b8265701b3bcc1ed40254fd1a11da2d7e5734025138e442a2048039f573f2ffc028cf73bd57bbb348cd15cbecf87bc0c05b3dacb74775b2d3014ac SHA512 02dd6aa99d9a7efd942bfdb2139cae17f0f89a231de4fc8945232d0faf5f6f856032d7ca5d33d7d940a3e43f735d6666e483f17a2003aa3da65704cbbe718c71
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
deleted file mode 100644
index 59afdfad7762..000000000000
--- a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d37e34f78b3cb3ec5890ce22b0d15ad6e639f9be Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sat, 20 Jun 2020 09:44:44 +0200
-Subject: [PATCH] Build against a recent Akonadi
-
----
- tests/testlib/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt
-index 794ac2b2..9b786b77 100644
---- a/tests/testlib/CMakeLists.txt
-+++ b/tests/testlib/CMakeLists.txt
-@@ -21,6 +21,7 @@ target_link_libraries(testlib
- KF5::AkonadiCore
- KF5::AkonadiXml
- KF5::CalendarCore
-+ Qt5::DBus
- Qt5::Test
- )
-
---
-GitLab
-
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
deleted file mode 100644
index a5b39bbe6756..000000000000
--- a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4850c08998b33b37af99c3312d193b063b3e8174 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sat, 11 Apr 2020 17:36:25 +0200
-Subject: [PATCH] Port to kontactinterface >= 5.14.42, with ifdefs
-
----
- src/zanshin/kontact/kontact_plugin.cpp | 7 +++++++
- src/zanshin/kontact/kontact_plugin.h | 5 +++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp
-index b03d9674..4b0d2f92 100644
---- a/src/zanshin/kontact/kontact_plugin.cpp
-+++ b/src/zanshin/kontact/kontact_plugin.cpp
-@@ -33,9 +33,16 @@ Plugin::Plugin(KontactInterface::Core *core, const QVariantList&)
- setComponentName(QStringLiteral("zanshin"), QStringLiteral("zanshin"));
- }
-
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+KParts::Part *Plugin::createPart()
-+{
-+ return loadPart();
-+}
-+#else
- KParts::ReadOnlyPart *Plugin::createPart()
- {
- return loadPart();
- }
-+#endif
-
- #include "kontact_plugin.moc"
-diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h
-index 0d45564e..a270ba16 100644
---- a/src/zanshin/kontact/kontact_plugin.h
-+++ b/src/zanshin/kontact/kontact_plugin.h
-@@ -25,6 +25,7 @@
- #define ZANSHIN_KONTACT_PLUGIN_H
-
- #include <KontactInterface/Plugin>
-+#include <kontactinterface_version.h>
-
- class Plugin : public KontactInterface::Plugin
- {
-@@ -36,7 +37,11 @@ public:
- int weight() const override { return 449; }
-
- protected:
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+ KParts::Part *createPart() override;
-+#else
- KParts::ReadOnlyPart *createPart() override;
-+#endif
- };
-
- #endif
---
-GitLab
-
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
deleted file mode 100644
index 1bc6659d444a..000000000000
--- a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_APPS_MINIMAL=20.08.0
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/en/zanshin
-https://userbase.kde.org/Zanshin"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
- test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
-"
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
- >=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
- >=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
- >=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
- >=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}: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/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-kontactinterface-20.07.80.patch"
- "${FILESDIR}/${P}-akonadi-20.07.80.patch"
-)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-29 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-29 15:42 [gentoo-commits] repo/gentoo:master commit in: kde-misc/zanshin/files/, kde-misc/zanshin/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-12-08 13:24 Andreas Sturmlechner
2019-06-22 11:44 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox