From nobody Tue Jul 23 12:51:48 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WSxqT02Bcz5RtlF; Tue, 23 Jul 2024 12:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSxqS6YxJz4FLB; Tue, 23 Jul 2024 12:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721739108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFvrIcBr6DmjfnCYFEA52z8rZcMbqxfJpxLw6nHh2Qc=; b=OIaidGO3p1ZlYhTCwp3887JaexazZyEs0A0ljHKRD7tsHg0hl+hWxBoUPTgUpW3j5hb5PA QUd+CedFjK5j6qkPgU6Z+TEU5cZkU0QR9ourqOF56mAq0UvVzU/uQtc3FMVe31kvZm+eDN 2PeDNwasG3+vTdS3Jmq2p53OEztVhdlkPdr4ryp1dxVZY9z6eQnjKTJIVW+5i/iLuSbvij Puv8gnfHVAqmEpGazmqfaEDJYlFU3JPFyUuQ27slVrNlzTLVej6rkhJV/tTdyCueGqhYww SMPdPy7rZj+eEFR8Tkqy7lqpa6QitK+tDAz1n/tGFVq9v9vbNmk5etkD+NzZrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721739108; a=rsa-sha256; cv=none; b=hnFvfE6hHuBTktMp0suHpOmfEluXkrnC6JHtuGze9kjKQliRtr4Ta+azXa5XcT73vVFtHH CunZwPX4MQ54XRsS+0gzNem3hHhKOEMz68En70qVHNdpapQwUfHyeZi5SKzA981+53hPXr NjP4NZ4RgSsViSb0r1Rjquz3pzoGZPessEUXRsSvxXU6fV14JfkdXbSl+kMvH+w5yDXpCJ 0RYDyYy+nB5pX4yhDRNc7Jyz0W12yxU05ih5UshsrseNdZic6JF83JdjawcKKIddJL88ob kt//NhsMtaCzZEAwaAFCzg7YatVyBRsCUzwVlu3zTexR45cezuniNVIuBcXcSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721739108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wFvrIcBr6DmjfnCYFEA52z8rZcMbqxfJpxLw6nHh2Qc=; b=nzgPL1v5vkA4e8W957RUSpiWmE22LNvdXicEcxa7oMkpTxa+LaeuFNW70qPY/qdRoMs0jN KCuXsmjI6yRO8MW2ZHFDT+X/4/8AQMJwg1276xERug1Z8o4QPvIiiKzQVE4w9F6a9MmZNP mGsDVVXaY97IH/o5IdA1x8/nGzHDkWjAzLk+iSedT5qOYUlhAa/ETZqGeuLAUO3YYedjw8 U+qTVfWfqUnSmQHQwKBk5mY0pfbLg/wztBeBX5GmhSBG2slRZkvpYzBPLjD4aLlX45qFvf d4avzpZcKqaKsPuFwfwj9lG1IJQswsVgL+or6UckKJxB92ScLG7WSzN7z3UJZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WSxqS69SRzT9x; Tue, 23 Jul 2024 12:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46NCpmm1066761; Tue, 23 Jul 2024 12:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46NCpmK3066758; Tue, 23 Jul 2024 12:51:48 GMT (envelope-from git) Date: Tue, 23 Jul 2024 12:51:48 GMT Message-Id: <202407231251.46NCpmK3066758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: eef1a0b44d86 - main - Uses/kde.mk: prepare for the removal of devel/kf5-extra-cmake-modules List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eef1a0b44d861ec93b214046f92c9da6a0eea899 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=eef1a0b44d861ec93b214046f92c9da6a0eea899 commit eef1a0b44d861ec93b214046f92c9da6a0eea899 Author: Tobias C. Berner AuthorDate: 2024-07-01 11:24:24 +0000 Commit: Gleb Popov 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 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 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