* [gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/files/, kde-plasma/drkonqi/
@ 2017-10-20 22:56 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-10-20 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 40344977cca595b82e3fd69d98f810a0df612643
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 22:55:27 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 22:56:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=40344977
kde-plasma/drkonqi: Fix build with USE=-X
Gentoo-bug: 634510
Package-Manager: Portage-2.3.12, Repoman-2.3.3
kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild | 2 +
kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch | 46 +++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild
index cac8570632..a21d1fd143 100644
--- a/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.11.49.9999.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.10.95:5
"
+PATCHES=( "${FILESDIR}/${PN}-5.11.1-x11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X Qt5X11Extras)
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch
new file mode 100644
index 0000000000..ffbd25c4f7
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch
@@ -0,0 +1,46 @@
+From c5047038751052c3feb588496cd14bdb233a18f8 Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kfunk@kde.org>
+Date: Sun, 15 Oct 2017 18:52:53 +0200
+Subject: Make Qt5::X11Extras really optional
+
+Summary:
+Otherwise may fail.
+
+Reviewers: rjvbb, sitter, davidedmundson
+
+Reviewed By: sitter, davidedmundson
+
+Subscribers: apol, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D8307
+---
+ CMakeLists.txt | 2 +-
+ config-X11.h.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43eeea5..8c8f9b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service ConfigWidgets JobWidgets KIO Crash Completion XmlRpcClient WidgetsAddons Wallet Notifications IdleTime)
+
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG COMPONENTS X11Extras)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
+
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
+diff --git a/config-X11.h.cmake b/config-X11.h.cmake
+index 26064aa..2f779a2 100644
+--- a/config-X11.h.cmake
++++ b/config-X11.h.cmake
+@@ -1,2 +1,2 @@
+-#cmakedefine Qt5X11Extras_FOUND 1
++#cmakedefine01 Qt5X11Extras_FOUND
+ #define HAVE_X11 Qt5X11Extras_FOUND
+--
+cgit v0.11.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/files/, kde-plasma/drkonqi/
@ 2021-07-04 20:51 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-07-04 20:51 UTC (permalink / raw
To: gentoo-commits
commit: cef695de6e4b84bf158dfdc450a0fe3853c02a39
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 4 20:50:37 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 4 20:50:37 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cef695de
kde-plasma/drkonqi: Drop unused DEPEND
Upstream commit 59dceeb53196063c568201d0c567bea7887b1cc4
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild | 3 +-
kde-plasma/drkonqi/drkonqi-9999.ebuild | 1 -
.../drkonqi/files/drkonqi-5.22.3-unused-dep.patch | 37 ++++++++++++++++++++++
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
index 32c20a6429..61f911b5b0 100644
--- a/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.22.49.9999.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
@@ -47,6 +46,8 @@ RDEPEND="${COMMON_DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${PN}-5.22.3-unused-dep.patch" )
+
src_test() {
# needs network access, bug #698510
local myctestargs=(
diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index 02fd02a44f..2ec227a5a3 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
new file mode 100644
index 0000000000..d34638be71
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
@@ -0,0 +1,37 @@
+From 59dceeb53196063c568201d0c567bea7887b1cc4 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 3 Jul 2021 20:32:11 +0200
+Subject: [PATCH] Remove unused KService dep
+
+---
+ src/CMakeLists.txt | 1 -
+ src/statusnotifier.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1c176188..6ec2120e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -96,7 +96,6 @@ target_link_libraries(
+ DrKonqiInternal
+ KF5::I18n
+ KF5::CoreAddons
+- KF5::Service
+ KF5::ConfigWidgets
+ KF5::JobWidgets
+ KF5::KIOCore
+diff --git a/src/statusnotifier.cpp b/src/statusnotifier.cpp
+index 41271874..c5f795c0 100644
+--- a/src/statusnotifier.cpp
++++ b/src/statusnotifier.cpp
+@@ -17,7 +17,6 @@
+ #include <KIdleTime>
+ #include <KLocalizedString>
+ #include <KNotification>
+-#include <KService>
+ #include <KStatusNotifierItem>
+
+ #include "crashedapplication.h"
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-04 20:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-04 20:51 [gentoo-commits] proj/kde:master commit in: kde-plasma/drkonqi/files/, kde-plasma/drkonqi/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-10-20 22:56 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox