* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/
@ 2017-12-02 21:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-12-02 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 604a26a14c00c35a9db134d4261b7e7ca76476c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 19:40:23 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 21:57:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604a26a1
kde-frameworks/kded: Drop obsolete dbus calls
Package-Manager: Portage-2.3.16, Repoman-2.3.6
kde-frameworks/kded/Manifest | 2 +-
.../files/kded-5.40.0-obsolete-dbus-calls.patch | 70 ++++++++++++++++++++++
kde-frameworks/kded/kded-5.40.0-r1.ebuild | 38 ++++++++++++
3 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 2c0dc98c0b6..fd1c1acb6ad 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1,2 @@
DIST kded-5.37.0.tar.xz 38020 SHA256 fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98 SHA512 2a420cf97f55858ec6cac4a74bdf97f367b32fc07529714b494576f7828261ae52650972b9f8b80e5e12cd854f66e7bc4d2d2cd339d7ce8a71ab29ebd41e76fa WHIRLPOOL f5c6da6d02ec099072b6ded7ac207c3d6f6f7b674a99531216b2f03408ac16f530bea916f207604c0b76a9de56561ab2234c9b7b4e2413792e5e1fe521c8773e
-DIST kded-5.40.0.tar.xz 38152 SHA256 0439d68e2b08a0084b6d15e92679692090271a873ee90dca8ed0a0afa1eac449 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8 WHIRLPOOL 9bb10fa2d135394eb0c33ef15209aeae6037ba91840cf2ad3e2f26ac3acd53541e203fe02202db52d038fa1d0a7c710fd77eb4754ea87451722d1ac569e7260b
+DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8
diff --git a/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
new file mode 100644
index 00000000000..96fa447c9bc
--- /dev/null
+++ b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch
@@ -0,0 +1,70 @@
+From 185afa8a3af8002172d8f5d6aa08c57244422a12 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 2 Nov 2017 22:27:29 +0100
+Subject: kded: remove dbus calls to ksplash.
+
+Summary:
+Not needed anymore since June 2016 (b6058a0 in plasma-workspace, i.e. Plasma
+5.7).
+
+Originally at https://git.reviewboard.kde.org/r/129010/
+
+Test Plan: none, this is dead code
+
+Reviewers: davidedmundson
+
+Reviewed By: davidedmundson
+
+Subscribers: #plasma, #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D8632
+---
+ src/kded.cpp | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/kded.cpp b/src/kded.cpp
+index 526bd4e..11ddd4f 100644
+--- a/src/kded.cpp
++++ b/src/kded.cpp
+@@ -37,7 +37,6 @@
+ #include <QDBusConnectionInterface>
+ #include <QDBusInterface>
+ #include <QDBusServiceWatcher>
+-#include <QDBusPendingCall>
+
+ #include <KDBusService>
+ #include <kconfiggroup.h>
+@@ -777,28 +776,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[])
+ (void) new KUpdateD; // Watch for updates
+ }
+
+-//NOTE: We are going to change how KDE starts and this certanly doesn't fit on the new design.
+-#ifdef Q_OS_LINUX
+- // Tell KSplash that KDED has started
+- QDBusMessage ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("/KSplash"),
+- QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("setStage"));
+- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("kded"));
+- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
+-#endif
+-
+ runKonfUpdate(); // Run it once.
+
+-#ifdef Q_OS_LINUX
+- ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("/KSplash"),
+- QStringLiteral("org.kde.KSplash"),
+- QStringLiteral("setStage"));
+- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("confupdate"));
+- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage);
+-#endif
+-
+ int result = app.exec(); // keep running
+
+ delete kded;
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/kded/kded-5.40.0-r1.ebuild b/kde-frameworks/kded/kded-5.40.0-r1.ebuild
new file mode 100644
index 00000000000..5c25a5e9226
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.40.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kservice)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+ man? ( $(add_frameworks_dep kdoctools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-obsolete-dbus-calls.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package man KF5DocTools)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/
@ 2023-01-29 0:12 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-01-29 0:12 UTC (permalink / raw
To: gentoo-commits
commit: dff14b6e05b77bda4478c71e1ef9af209096dacb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 23:55:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 00:12:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff14b6e
kde-frameworks/kded: Only recreate icons if an icon dir changed
Upstream commit 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463353
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...0-only-recreate-icons-if-icon-dir-changed.patch | 34 ++++++++++++++++++
kde-frameworks/kded/kded-5.102.0-r1.ebuild | 42 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
new file mode 100644
index 000000000000..3fd652bd2483
--- /dev/null
+++ b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
@@ -0,0 +1,34 @@
+From 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 24 Jan 2023 10:20:01 +0100
+Subject: [PATCH] Only recreate icons if an icon dir changed
+
+Other paths that we are watching can end in "icons"
+as we are watching subdirs. Make sure to not take the wrong code
+path and only do an icon change if one our watched icon dirs
+changes.
+BUG:463353
+FIXED-IN:5.103
+
+
+(cherry picked from commit b6a3e25e81014110f1e0f470832006cc60cbc86d)
+---
+ src/kded.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kded.cpp b/src/kded.cpp
+index 1f90f9c..b473f1c 100644
+--- a/src/kded.cpp
++++ b/src/kded.cpp
+@@ -525,7 +525,7 @@ void Kded::dirDeleted(const QString &path)
+
+ void Kded::update(const QString &path)
+ {
+- if (path.endsWith(QLatin1String("/icons"))) {
++ if (path.endsWith(QLatin1String("/icons")) && m_pDirWatch->contains(path)) {
+ // If the dir was created or updated there could be new folders to merge into the active theme(s)
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
+ message << 0;
+--
+GitLab
+
diff --git a/kde-frameworks/kded/kded-5.102.0-r1.ebuild b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
new file mode 100644
index 000000000000..81846924c148
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[dbus]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kcrash-${PVCUT}*:5
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/kinit-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-only-recreate-icons-if-icon-dir-changed.patch" # KDE-bug 463353
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/
@ 2023-04-22 16:21 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-04-22 16:21 UTC (permalink / raw
To: gentoo-commits
commit: dc96b3626150b4d3ac39c6c78d46217d2c29539b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:12:37 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:20:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc96b362
kde-frameworks/kded: drop 5.102.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kded/Manifest | 1 -
...0-only-recreate-icons-if-icon-dir-changed.patch | 34 ------------------
kde-frameworks/kded/kded-5.102.0-r1.ebuild | 42 ----------------------
3 files changed, 77 deletions(-)
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index c4dc945e8061..3c413816d41a 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,3 +1,2 @@
-DIST kded-5.102.0.tar.xz 40968 BLAKE2B d7bf8ac8e5def70dce42afa4050bd1a0ecb5a6354b58ca16eee5cc8ea0ee368c0125e290643318b288cc18db102925bf5a77664b7f23e8e234205d3d95e488a5 SHA512 971eca90bca7218c0637a62740aaefa2bb3fb68a2941bd8c25bf65b79e07b69cdf1d629733b2511382b6fab2cd112f194ef09939d8043e96d9242d4253eb1e83
DIST kded-5.104.0.tar.xz 40996 BLAKE2B 98bd89c5eed1f5c48ec9333a8259aa3042beb9541e6774e3be28bad1dcd714933c4dc1326321382957456915534b31215616237360b7d73885414a71b831f701 SHA512 cee37b7d384db7b4ba283132b60166e14edf58a0941aaac37aab00ceb1958990f9bf963df417d874025c6eaa1b0a89091355207edacbe15735e1115d59c8f11e
DIST kded-5.105.0.tar.xz 41008 BLAKE2B 8c9a036db7a53b722f9afbc0b750bb02652d67867e8f9d27df786b35c567370ef3421f69c4510974a8d2b1acad069081b020288acaade23449d500adef4b5853 SHA512 5c03add4258343dacdeccfd6b4e79a3285b166dda6e01cf2aee5444cad8f41946007ed197e0c91bc3f5062cc1ef9cc254620623c81e5f033b03df7db5a1b8581
diff --git a/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
deleted file mode 100644
index 3fd652bd2483..000000000000
--- a/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Tue, 24 Jan 2023 10:20:01 +0100
-Subject: [PATCH] Only recreate icons if an icon dir changed
-
-Other paths that we are watching can end in "icons"
-as we are watching subdirs. Make sure to not take the wrong code
-path and only do an icon change if one our watched icon dirs
-changes.
-BUG:463353
-FIXED-IN:5.103
-
-
-(cherry picked from commit b6a3e25e81014110f1e0f470832006cc60cbc86d)
----
- src/kded.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kded.cpp b/src/kded.cpp
-index 1f90f9c..b473f1c 100644
---- a/src/kded.cpp
-+++ b/src/kded.cpp
-@@ -525,7 +525,7 @@ void Kded::dirDeleted(const QString &path)
-
- void Kded::update(const QString &path)
- {
-- if (path.endsWith(QLatin1String("/icons"))) {
-+ if (path.endsWith(QLatin1String("/icons")) && m_pDirWatch->contains(path)) {
- // If the dir was created or updated there could be new folders to merge into the active theme(s)
- QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
- message << 0;
---
-GitLab
-
diff --git a/kde-frameworks/kded/kded-5.102.0-r1.ebuild b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
deleted file mode 100644
index e7f6ee3ecfde..000000000000
--- a/kde-frameworks/kded/kded-5.102.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+man"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/kconfig-${PVCUT}*:5[dbus]
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kinit-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-only-recreate-icons-if-icon-dir-changed.patch" # KDE-bug 463353
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package man KF5DocTools)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-22 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-02 21:57 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-29 0:12 Andreas Sturmlechner
2023-04-22 16:21 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox