git: eef1a0b44d86 - main - Uses/kde.mk: prepare for the removal of devel/kf5-extra-cmake-modules
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 23 Jul 2024 12:51:48 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eef1a0b44d861ec93b214046f92c9da6a0eea899
commit eef1a0b44d861ec93b214046f92c9da6a0eea899
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-07-01 11:24:24 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-23 12:51:04 +0000
Uses/kde.mk: prepare for the removal of devel/kf5-extra-cmake-modules
- only one extra-cmake-modules package can be installed at a time
- devel/kf6-extra-cmake-modules is backward compatible and, according to
upstream, should be used for all builds.
Exp-run by: antoine
PR: 280070
---
Mk/Uses/kde.mk | 3 ++-
archivers/kf5-karchive/Makefile | 2 +-
deskutils/kuserfeedback/Makefile | 3 ++-
devel/kf5-threadweaver/Makefile | 2 +-
graphics/drawpile/Makefile | 2 +-
graphics/seexpr/Makefile | 2 +-
multimedia/phonon/Makefile | 2 +-
x11-themes/plasma5-plasma-workspace-wallpapers/Makefile | 4 ++--
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index fdc0e3f1f2c0..eb687b3bf07e 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -435,7 +435,8 @@ kde-dnssd_LIB= libKF${_KDE_VERSION}DNSSD.so
kde-doctools_PORT= devel/kf${_KDE_VERSION}-kdoctools
kde-doctools_PATH= ${KDE_PREFIX}/bin/meinproc${_KDE_VERSION}
-kde-ecm_PORT= devel/kf${_KDE_VERSION}-extra-cmake-modules
+# Use ECM from KDE Frameworks 6 for everything
+kde-ecm_PORT= devel/kf6-extra-cmake-modules
kde-ecm_PATH= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake
kde-emoticons_PORT= x11-themes/kf${_KDE_VERSION}-kemoticons
diff --git a/archivers/kf5-karchive/Makefile b/archivers/kf5-karchive/Makefile
index 121cf1c51d82..5d3b714c826e 100644
--- a/archivers/kf5-karchive/Makefile
+++ b/archivers/kf5-karchive/Makefile
@@ -10,7 +10,7 @@ LICENSE= LGPL20
USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm:build
-USE_QT= core \
+USE_QT= core linguisttools \
buildtools:build qmake:build
.include <bsd.port.mk>
diff --git a/deskutils/kuserfeedback/Makefile b/deskutils/kuserfeedback/Makefile
index 9371d5d2ddce..c0141f7d4325 100644
--- a/deskutils/kuserfeedback/Makefile
+++ b/deskutils/kuserfeedback/Makefile
@@ -12,7 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
USES= bison cmake compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= ecm:build
-USE_QT= charts core declarative gui network printsupport svg widgets \
+USE_QT= charts core declarative gui linguisttools network printsupport \
+ svg widgets \
buildtools:build help:build qdoc:build qmake:build
OPTIONS_DEFINE= SERVER
diff --git a/devel/kf5-threadweaver/Makefile b/devel/kf5-threadweaver/Makefile
index 7c37e82175ef..bdbbe267871a 100644
--- a/devel/kf5-threadweaver/Makefile
+++ b/devel/kf5-threadweaver/Makefile
@@ -7,7 +7,7 @@ COMMENT= KF5 helper for multithreaded programming
USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm:build
-USE_QT= core widgets \
+USE_QT= core widgets xml \
buildtools:build qmake:build testlib:build
.include <bsd.port.mk>
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index a5d39890156b..434b79c93139 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -10,7 +10,7 @@ WWW= https://drawpile.net
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules
+BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf6-extra-cmake-modules
LIB_DEPENDS= libsodium.so:security/libsodium
USES= cargo cmake compiler:c++17-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
index 3e6589805fae..a406bb3d56e7 100644
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libpng.so:graphics/png
USES= bison cmake compiler:c++14-lang gl qt:5
USE_GL= gl glu
USE_LDCONFIG= yes
-USE_QT= buildtools:build qmake:build core gui opengl widgets
+USE_QT= buildtools:build qmake:build core gui linguisttools opengl widgets
MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 93c6dd01ab92..c56ed98a45b6 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
USE_KDE= ecm:build
USE_QT= ${_USE_QT_${FLAVOR}}
-_USE_QT_qt5= core gui widgets buildtools:build qmake:build
+_USE_QT_qt5= core gui linguisttools widgets buildtools:build qmake:build
_USE_QT_qt6= 5compat base tools
_CMAKE_ON_qt5= PHONON_BUILD_QT5
_CMAKE_ON_qt6= PHONON_BUILD_QT6
diff --git a/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile b/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
index 2b8f29647f63..14947de81f58 100644
--- a/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
+++ b/x11-themes/plasma5-plasma-workspace-wallpapers/Makefile
@@ -13,8 +13,8 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3
USES= cmake kde:5 qt:5 tar:xz
USE_KDE= ecm:build
-USE_QT= buildtools:build \
- qmake:build
+# core is needed for kf6-ecm to find qmake
+USE_QT= buildtools:build core:build qmake:build
NO_ARCH= yes