summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2025-08-27 19:18:51 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2025-08-27 19:18:51 +0000
commitf5545be7388479d2f555297ec02f24eeacd10a33 (patch)
tree9b41914660660aa2583fa40658507d538cafd3da
parent97641cb884a4ef74476815c96249e38d301b5675 (diff)
parent1aa7ce5126d8d4f0ca0d76da7dcfcfac6e9ec5cd (diff)
downloadkde-f5545be7388479d2f555297ec02f24eeacd10a33.tar.gz
kde-f5545be7388479d2f555297ec02f24eeacd10a33.tar.bz2
kde-f5545be7388479d2f555297ec02f24eeacd10a33.zip
Merge updates from master
-rw-r--r--media-gfx/krita/files/krita-5.3.0-tests-optional.patch26
-rw-r--r--net-im/neochat/neochat-25.08.49.9999.ebuild7
-rw-r--r--net-im/neochat/neochat-9999.ebuild7
3 files changed, 36 insertions, 4 deletions
diff --git a/media-gfx/krita/files/krita-5.3.0-tests-optional.patch b/media-gfx/krita/files/krita-5.3.0-tests-optional.patch
index c21b9127b77..85f1b4adcaf 100644
--- a/media-gfx/krita/files/krita-5.3.0-tests-optional.patch
+++ b/media-gfx/krita/files/krita-5.3.0-tests-optional.patch
@@ -88,3 +88,29 @@ index 88c0516360..01f2383ddb 100644
add_subdirectory(libs)
add_subdirectory(plugins)
+From e0ba479d6e7a1a34ad9fc984605aef2872d653da Mon Sep 17 00:00:00 2001
+From: Lucio Sauer <watermanpaint@posteo.net>
+Date: Mon, 25 Aug 2025 13:20:34 +0200
+Subject: [PATCH] libs/koplugin: don't build tests when not testing
+
+Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
+---
+ libs/koplugin/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libs/koplugin/CMakeLists.txt b/libs/koplugin/CMakeLists.txt
+index c3c6368..720ebe6 100644
+--- a/libs/koplugin/CMakeLists.txt
++++ b/libs/koplugin/CMakeLists.txt
+@@ -28,4 +28,6 @@ set_target_properties(kritaplugin PROPERTIES
+ )
+ install(TARGETS kritaplugin ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+-add_subdirectory(tests)
+\ No newline at end of file
++if (BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+--
+2.49.1
+
diff --git a/net-im/neochat/neochat-25.08.49.9999.ebuild b/net-im/neochat/neochat-25.08.49.9999.ebuild
index 342b4f5e664..fa7beafae3a 100644
--- a/net-im/neochat/neochat-25.08.49.9999.ebuild
+++ b/net-im/neochat/neochat-25.08.49.9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
SLOT="0"
KEYWORDS=""
-DEPEND="
+COMMON_DEPEND="
app-text/cmark:=
>=dev-libs/kirigami-addons-1.6.0:6
>=dev-libs/icu-61.0:=
@@ -49,7 +49,10 @@ DEPEND="
media-libs/kquickimageeditor:6
>=net-libs/libquotient-0.9.1:=
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-qt/qthttpserver-${QTMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
>=dev-qt/qt5compat-${QTMIN}:6[qml]
>=dev-qt/qtlocation-${QTMIN}:6
>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
diff --git a/net-im/neochat/neochat-9999.ebuild b/net-im/neochat/neochat-9999.ebuild
index 342b4f5e664..fa7beafae3a 100644
--- a/net-im/neochat/neochat-9999.ebuild
+++ b/net-im/neochat/neochat-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
SLOT="0"
KEYWORDS=""
-DEPEND="
+COMMON_DEPEND="
app-text/cmark:=
>=dev-libs/kirigami-addons-1.6.0:6
>=dev-libs/icu-61.0:=
@@ -49,7 +49,10 @@ DEPEND="
media-libs/kquickimageeditor:6
>=net-libs/libquotient-0.9.1:=
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-qt/qthttpserver-${QTMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
>=dev-qt/qt5compat-${QTMIN}:6[qml]
>=dev-qt/qtlocation-${QTMIN}:6
>=dev-qt/qtmultimedia-${QTMIN}:6[qml]