From nobody Thu Jan 23 17:11:08 2025 X-Original-To: dev-commits-ports-all@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 4Yf6sn0NQpz5lCch; Thu, 23 Jan 2025 17:11:09 +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 4Yf6sm6glBz41NP; Thu, 23 Jan 2025 17:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737652269; 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=xdkRxAgkzvv52ZMgeHMz+iZzi4wV7XAJ8nnCH4E/Di0=; b=kt8z2ADweNz8d+JSSwH3q6Rv5LuGu7Bv0/083HqNxp/cFLqgGEaRRh5pHzr15fsEdNEP+3 i1pbmGhfmexRg+8BSUvJkxbMdP+rSdl73GEklOvG0DT1XFiyoyotDTuHEugmAAU8iN1QD2 rFRGFU/lSLIyVKkzu2fi6i2AVFHSHx/0j37/LEhIUyaEW/IXbE9znDGo5RObssCzwyvUJJ vVmepkDo0YLHxzV4djK6B3P5LHnWBa0K6bj2/9H5ZdYH9ku15KjhzAGhhdfWisM+9fB6Mb u446Ie5otAYy8FyNQEkooQI7gr8WOtqv79wJt/VRMPAtP/xtkr9GPZgVmC9psA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737652269; 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=xdkRxAgkzvv52ZMgeHMz+iZzi4wV7XAJ8nnCH4E/Di0=; b=KY9oTYIdSB0gT0ykxBPKBK313Qj2rYLFYKTx6AW67maqRNvmDfAq1X57BglAe93F9mG3PM n0iC/EFY9r97MzMhQdgbcgA3ztle0xhJDIHkCG8KUqlbDZXMwvZnTquSuEeWTnTVSm2ddz Fapg3DG+APxKaF6ac3PpDz9p5brC4iVh32OSuqydhIVTB0Qt4WGbTjJhJxadfXEQnZ+Q2s 9/RFvNbFHxAwOUiCD4L0t2nWHyOiW7z/EXOuIrfR1vL0x0TiqlsHhTwgq22FxVPMHDLG/M yDguIhFnZF9Pz/P3/Wc6AbS4GA73CT86Ts0FlSzTUEDPlRy6uG1t05L0+Q8feg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737652269; a=rsa-sha256; cv=none; b=PBUzDvxbKzIBrOZgK8FuD/MEsQbcFBakxKDrtrcDQk/NJGrFVdKkU2Zhv/OhiVjRxlB9Ji ohnF7Yoar8hFnaJq6Cbwyld33Vqo7uRvNf7oSMksJ38bu1mgCV8Xe5QyHNHfrUBDRj2vGN hGo6FUFmJs9RzadFIIxvmVvIWxeAhkNsel8FseDkyU0qhSpTfBXVdjZWRuyy862O9PySmm l9Ct0wEXWNhBt+Ceamp0fnHB7NiKd3wtnpcrQi/448cMob5/xkyrY+OA8jsSCPvYu4BecR y44Q9aNoNeRw9sspZqwHINV+T8IpD9uu8fjKVEaCkxJallXIsrVPbIN76V9OvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf6sm69WCznyp; Thu, 23 Jan 2025 17:11:08 +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 50NHB87B095014; Thu, 23 Jan 2025 17:11:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NHB8LW095011; Thu, 23 Jan 2025 17:11:08 GMT (envelope-from git) Date: Thu, 23 Jan 2025 17:11:08 GMT Message-Id: <202501231711.50NHB8LW095011@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 6ac05e225b23 - main - kde.mk: prepare for switching to Plasma 6 and KF6 based KDE Applications List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ac05e225b23fc5ce566d41db384c9af727068a5 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ac05e225b23fc5ce566d41db384c9af727068a5 commit 6ac05e225b23fc5ce566d41db384c9af727068a5 Author: Max Brazhnikov AuthorDate: 2025-01-23 17:08:18 +0000 Commit: Max Brazhnikov CommitDate: 2025-01-23 17:08:18 +0000 kde.mk: prepare for switching to Plasma 6 and KF6 based KDE Applications To avoid conflict between KF5 and KF6 ports always use KF6 kapidox and the latest Plasma sounds samples. --- Mk/Uses/kde.mk | 6 ++++-- x11/kf5-frameworkintegration/Makefile | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 8025e65b38c7..ecb94179d4be 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -383,7 +383,8 @@ kde-activities-stats_LIB5= libKF${_KDE_VERSION}ActivitiesStats.so kde-activities-stats_LIB6= libPlasmaActivitiesStats.so kde-activities-stats_LIB= ${kde-activities-stats_LIB${_KDE_VERSION}} -kde-apidox_PORT= devel/kf${_KDE_VERSION}-kapidox +# Use KApiDox tools from KDE Frameworks 6 +kde-apidox_PORT= devel/kf6-kapidox kde-apidox_PATH= ${KDE_PREFIX}/bin/kapidox-generate kde-apidox_TYPE= run @@ -543,7 +544,8 @@ kde-notifications_LIB= libKF${_KDE_VERSION}Notifications.so kde-notifyconfig_PORT= devel/kf${_KDE_VERSION}-knotifyconfig kde-notifyconfig_LIB= libKF${_KDE_VERSION}NotifyConfig.so -kde-oxygen-sounds_PORT= audio/plasma${_KDE_VERSION}-oxygen-sounds +# Use the latest sounds from Plasma 6 +kde-oxygen-sounds_PORT= audio/plasma6-oxygen-sounds kde-oxygen-sounds_PATH= ${KDE_PREFIX}/share/sounds/Oxygen-Sys-Log-In.ogg kde-oxygen-sounds_TYPE= run diff --git a/x11/kf5-frameworkintegration/Makefile b/x11/kf5-frameworkintegration/Makefile index 0a4fb0be3ff4..d5926c872dcf 100644 --- a/x11/kf5-frameworkintegration/Makefile +++ b/x11/kf5-frameworkintegration/Makefile @@ -1,5 +1,6 @@ PORTNAME= frameworkintegration DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org