From nobody Sun Feb 9 19:57:48 2025 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 4YrdmF4gKsz5mwTH; Sun, 09 Feb 2025 19:57: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 4YrdmD70VKz47R9; Sun, 09 Feb 2025 19:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739131069; 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=M+To+FhqhwlIsbBizMtW4xDdiKAYwMiJWtZW79XQoP8=; b=JETBUM2NH+xJOflxiGfnXLX/BGInazFd93gkxuwBxPBmhCN+PjfcOi0gk2oOq9rmHhhc8V 0uuq1Z1Hwu5q3gFfcjGbCON0WBmajoRuGKma1m0QMaj7y/ou0/s6YKDdFOrf/HGfytS46t w7tW6bKLxqtVeygWmb8AGq8NzZwSPG++iXj1xqoaa1pb3LmVZlm545ak0pnveupOv3eztv mLgyHDJn3k0H1ZFskpbIgyoa+jzw3tLurYqM6Fya/Qmub1M16M7MwOUxwM9GOFgVvojYjs rn0oAXfGZ50P+GeGgggbcWA6kWgQbcHMFc2l2V1UER/2cTs731sGAlfF3NT1RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739131069; 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=M+To+FhqhwlIsbBizMtW4xDdiKAYwMiJWtZW79XQoP8=; b=jTjkHCaNYUJns4nTk4smzPhUuLSGNPTPBTDl+fCoSTpkbGTAYdGzkq4/4anxUxx2HMPINs x04OQKyF9AyP+y/bzwGmzKwMJqq+lU4lsu3gzxF4pg/Rnpbf40Tc4bNtgREwNNAGVm102U AmeUuRwQYxxXfw/eUV0gcyckO8NKNJtTeTJIgSevNQCtVHBvuOph+xkm2+BMXCgmABKfb2 BoTfrmZTeOhE19idzdmGJMFloeMC0vV/XaLflEJNkIcGzVT9+Nuh6I4rP/HAdBP08MUnut Kc1OWn0eKMjgJkspLGBDPJpdBTUuGwWOxpFNLJqdPsf+jz4SSn4bOS4ryF36/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739131069; a=rsa-sha256; cv=none; b=KV0QP9T5rl37IkwxccKo/nT0U7xwFDS+/n0F3cVHtmDjeqfs5FKtwj7SSRuqVVgWtwuoI2 GSsMVwO23Wts0ABgYogaf4+4XtZBf7G3WwMVsaYU08qhw0/uBDxlIHf43e+geL1ksOC2NY nbLRwBNmJIXbxq28GYOGtKkeVAinYas6WMBPPkWzwb35sk2vQgMM8fvIEQ8LnQ5jA6CIk+ cyjDu0ZYC6V73unBFPCtWXenRzt7y8P7ra8dLdsXKGVPklvBwaqPJnFET1tenZ1/DPA2Sl xYS4d6qCNPUzup1LpEi3px2t60g8b0gfiyvmWLtTgpQJ1Kd8IIoCDtP02SCWLw== 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 4YrdmD5qjbz19Kx; Sun, 09 Feb 2025 19:57: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 519JvmKc094590; Sun, 9 Feb 2025 19:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 519Jvm07094587; Sun, 9 Feb 2025 19:57:48 GMT (envelope-from git) Date: Sun, 9 Feb 2025 19:57:48 GMT Message-Id: <202502091957.519Jvm07094587@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: 328fff71590d - main - kde.mk: clean up 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 328fff71590db772f49879f7ec2762ee11c0d8d9 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=328fff71590db772f49879f7ec2762ee11c0d8d9 commit 328fff71590db772f49879f7ec2762ee11c0d8d9 Author: Max Brazhnikov AuthorDate: 2025-02-09 19:57:13 +0000 Commit: Max Brazhnikov CommitDate: 2025-02-09 19:57:13 +0000 kde.mk: clean up - Rework USE_KDE components: rearrange components, remove stale items and duplication, add useful components lost with the migration to KF6. Introduce _USE_GEAR_ and _USE_KDE_EXTRA groups. - Remove not used anymore KDE_APPLICATIONS5_* variables. --- Mk/Uses/kde.mk | 180 +++++++++++++++++++++++---------------------------------- 1 file changed, 73 insertions(+), 107 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 54c07e5680cc..48ebc3030d2b 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -102,13 +102,6 @@ KDE_FRAMEWORKS5_BRANCH?= stable KDE_FRAMEWORKS6_VERSION?= 6.9.0 KDE_FRAMEWORKS6_BRANCH?= stable -# Legacy KDE applications. -KDE_APPLICATIONS5_VERSION?= 23.08.5 -KDE_APPLICATIONS5_SHLIB_VER?= 5.24.5 -# G as in KDE Gear, and as in "don't make the variable name longer than required" -KDE_APPLICATIONS5_SHLIB_G_VER?= 23.8.5 -KDE_APPLICATIONS5_BRANCH?= stable - # Current KDE applications. KDE_APPLICATIONS6_VERSION?= 24.12.0 KDE_APPLICATIONS6_SHLIB_VER?= 6.3.0 @@ -201,8 +194,7 @@ DESCR= ${.CURDIR:H:H}/x11/plasma6-plasma/pkg-descr PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf${_KDE_VERSION}- WWW?= https://api.kde.org/frameworks/${PORTNAME}/html/index.html -# This is a slight duplication of _USE_FRAMEWORKS_PORTING -- it maybe would be -# better to rely on ${_USE_FRAMEWORKS_PORTING:S/^/k/g} +# This is a slight duplication of _USE_PORTINGAIDS_ALL _PORTINGAIDS= kjs kjsembed kdelibs4support kdesignerplugin khtml kmediaplayer kross kxmlrpcclient . if ${_KDE_VERSION:M5} . if ${_PORTINGAIDS:M*${PORTNAME}*} @@ -256,55 +248,48 @@ PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" \ KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}" # ============================================================================== -# List of components of the KDE Frameworks distribution. -# The *_TIER variables are internal, primarily for checking -# that our list of frameworks matches the structure offered upstream. -_USE_FRAMEWORKS_TIER1= apidox archive attica breeze-icons codecs config \ - coreaddons dbusaddons dnssd holidays i18n idletime itemmodels \ - itemviews kirigami2 kquickcharts plotting prison \ - qqc2-desktop-style solid sonnet syntaxhighlighting \ - threadweaver wayland widgetsaddons windowsystem -# NOT LISTED TIER1: modemmanagerqt networkmanagerqt (not applicable) - -_USE_FRAMEWORKS_TIER2= auth completion crash doctools \ - filemetadata kimageformats jobwidgets notifications \ - package pty syndication unitconversion - -_USE_FRAMEWORKS_TIER3= activities activities-stats baloo bookmarks configwidgets \ - designerplugin emoticons globalaccel guiaddons \ - iconthemes init kcmutils kdav kdeclarative \ - kded kdesu kio newstuff notifyconfig parts \ - people plasma-framework purpose runner service texteditor \ - textwidgets wallet xmlgui xmlrpcclient - -_USE_FRAMEWORKS_TIER4= frameworkintegration calendarcore contacts +# List of all USE_KDE components. +# TODO for KDE 7: do not mangle upstream naming: use the same name +# for port directory, PORTNAME, and USE_KDE component. # Porting Aids frameworks provide code and utilities to ease the transition from -# kdelibs 4 to KDE Frameworks 5. Code should aim to port away from this framework, -# new projects should avoid using these libraries. -_USE_FRAMEWORKS_PORTING=js jsembed kdelibs4support khtml mediaplayer kross - -_USE_FRAMEWORKS5_ALL= ecm \ - ${_USE_FRAMEWORKS_TIER1} \ - ${_USE_FRAMEWORKS_TIER2} \ - ${_USE_FRAMEWORKS_TIER3} \ - ${_USE_FRAMEWORKS_TIER4} \ - ${_USE_FRAMEWORKS_PORTING} \ - ${_USE_FRAMEWORKS_EXTRA} \ - kpublictransport kosm \ - plasma-wayland-protocols -# TODO: fix -_USE_FRAMEWORKS6_ALL= ecm colorscheme \ - svg \ - statusnotifieritem \ - plasma-wayland-protocols \ - texttemplate \ - userfeedback \ - ${_USE_FRAMEWORKS_TIER1:Nwayland} \ - ${_USE_FRAMEWORKS_TIER2} \ - ${_USE_FRAMEWORKS_TIER3:Nemoticons:Ndesignerplugin:Nactivities:Nactivities-stats:Ninit:Nplasma-framework:Nxmlrpcclient} \ - ${_USE_FRAMEWORKS_TIER4} \ - ${_USE_FRAMEWORKS_EXTRA} +# kdelibs 4 to KDE Frameworks 5. +_USE_PORTINGAIDS_ALL= js jsembed kdelibs4support khtml mediaplayer kross + +# List of components of the KDE Frameworks distribution. +# Not ported to FreeBSD: bluez-qt modemmanagerqt networkmanagerqt +_USE_FRAMEWORKS5_ALL= activities activities-stats apidox archive attica \ + auth baloo bookmarks breeze-icons calendarcore \ + codecs completion config configwidgets contacts \ + coreaddons crash dbusaddons designerplugin dnssd \ + doctools ecm emoticons filemetadata frameworkintegration \ + globalaccel guiaddons holidays i18n iconthemes \ + idletime init itemmodels itemviews jobwidgets \ + kcmutils kdav kdeclarative kded kdesu kimageformats \ + kio kirigami2 kquickcharts newstuff notifications \ + notifyconfig package parts people plasma-framework \ + plotting prison pty purpose qqc2-desktop-style \ + runner service solid sonnet syndication \ + syntaxhighlighting texteditor textwidgets \ + threadweaver unitconversion wallet wayland \ + widgetsaddons windowsystem xmlgui xmlrpcclient \ + ${_USE_PORTINGAIDS_ALL} + +_USE_FRAMEWORKS6_ALL= apidox archive attica auth baloo bookmarks \ + breeze-icons calendarcore codecs colorscheme \ + completion config configwidgets contacts coreaddons \ + crash dbusaddons dnssd doctools ecm filemetadata \ + frameworkintegration globalaccel guiaddons holidays \ + i18n iconthemes idletime itemmodels itemviews \ + jobwidgets kcmutils kdav kdeclarative kded kdesu \ + kimageformats kio kirigami2 kquickcharts newstuff \ + notifications notifyconfig package parts people \ + plasma-wayland-protocols plotting prison pty purpose \ + qqc2-desktop-style runner service solid sonnet \ + statusnotifieritem svg syndication \ + syntaxhighlighting texteditor texttemplate \ + textwidgets threadweaver unitconversion userfeedback \ + wallet widgetsaddons windowsystem xmlgui _USE_FRAMEWORKS_ALL= ${_USE_FRAMEWORKS${_KDE_VERSION}_ALL} # List of components of the KDE Plasma distribution. @@ -327,52 +312,42 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \ systemsettings wayland xdg-desktop-portal-kde _USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL} -# List of components of the KDE PIM distribution (part of applications). -_USE_KDEPIM_ALL= akonadicontacts akonadiimportwizard akonadimime \ - akonadicalendar akonadisearch \ - calendarcore calendarsupport calendarutils \ - contacts eventviews gapi grantleetheme \ - gravatar identitymanagement imap \ - incidenceeditor kdepim-addons \ - kdepim-runtime kitinerary kontactinterface kpkpass \ - ksmtp ldap libkdepim libkleo libksieve mailcommon \ - mailimporter mailtransport mbox messagelib \ - mime pimcommon pimtextedit tnef \ - kalarm kontact kmail mbox-importer \ - akonadiconsole akregator grantlee-editor kaddressbook \ - kalarm kmail-account-wizard kmail knotes kontact \ - korganizer pim-data-exporter ktextaddons \ - mimetreeparser - -_USE_PHONON_ALL= phonon phonon-backend +# List of frequently used components of the KDE Gears distribution. +_USE_GEAR_ALL= baloo-widgets kate kosm kpublictransport \ + libkcddb libkcompactdisc libkdcraw \ + libkdegames libkeduvocdocument libkexiv2 \ + libksane marble okular + +# List of components of the KDE PIM distribution (part of KDE Gears). +_USE_KDEPIM_ALL= akonadi akonadicalendar akonadiconsole \ + akonadicontacts akonadiimportwizard akonadimime \ + akonadisearch akregator calendarsupport \ + calendarutils eventviews gapi grantlee-editor \ + grantleetheme gravatar identitymanagement imap \ + incidenceeditor kaddressbook kalarm kdepim-addons \ + kdepim-runtime kitinerary kmail kmail-account-wizard \ + kontact kontactinterface korganizer kpkpass ksmtp \ + ldap libkdepim libkleo libksieve mailcommon \ + mailimporter mailtransport mbox mbox-importer \ + messagelib mime mimetreeparser pim-data-exporter \ + pimcommon pimtextedit tnef + +# List of frequently used KDE releated software for any KDE/Qt version. +_USE_KDE_EXTRA5_ALL= kirigami-addons phonon phonon-backend \ + plasma-wayland-protocols +_USE_KDE_EXTRA6_ALL= kirigami-addons phonon phonon-backend \ + plasma-wayland-protocols ktextaddons +_USE_KDE_EXTRA_ALL= ${_USE_KDE_EXTRA${_KDE_VERSION}_ALL} _USE_KDE5_ALL= ${_USE_FRAMEWORKS_ALL} \ ${_USE_PLASMA_ALL} \ - ${_USE_PHONON_ALL} \ - kirigami-addons \ - akonadi \ - libkexiv2 \ - libkdcraw - -# TODO: fix -_USE_KDE6_ALL= ecm colorscheme \ - svg \ - plasma-wayland-protocols \ - mediaplayer \ - ${_USE_FRAMEWORKS_ALL} \ + ${_USE_KDE_EXTRA_ALL} + +_USE_KDE6_ALL= ${_USE_FRAMEWORKS_ALL} \ ${_USE_PLASMA_ALL} \ - ${_USE_PHONON_ALL} \ - kirigami-addons \ - akonadi \ - kpublictransport \ - libkdegames \ - libksane \ - baloo-widgets \ - libkdcraw \ ${_USE_KDEPIM_ALL} \ - libkeduvocdocument \ - libkexiv2 \ - okular + ${_USE_GEAR_ALL} \ + ${_USE_KDE_EXTRA_ALL} # ====================== frameworks components ================================= kde-activities_PORT5= x11/kf${_KDE_VERSION}-kactivities @@ -818,9 +793,6 @@ kde-akonadiimportwizard_LIB= libKPim${_KDE_VERSION}ImportWizard.so kde-akonadimime_PORT= net/akonadi-mime kde-akonadimime_LIB= libKPim${_KDE_VERSION}AkonadiMime.so -kde-akonadinotes_PORT= net/akonadi-notes -kde-akonadinotes_LIB= libKPim${_KDE_VERSION}AkonadiNotes.so - kde-akonadicalendar_PORT= net/akonadi-calendar kde-akonadicalendar_LIB= libKPim${_KDE_VERSION}AkonadiCalendar.so @@ -936,9 +908,6 @@ kde-kmail_PATH= ${KDE_PREFIX}/bin/kmail kde-kmail-account-wizard_PORT= deskutils/kmail-account-wizard kde-kmail-account-wizard_PATH= ${KDE_PREFIX}/bin/accountwizard -kde-knotes_PORT= deskutils/knotes -kde-knotex_PATH= ${KDE_PREFIX}/bin/knotes - kde-kontact_PORT= deskutils/kontact kde-kontact_PATH= ${KDE_PREFIX}/bin/kontact @@ -966,7 +935,7 @@ kde-kate_PORT= editors/kate kde-kate_PATH= ${QT_PLUGINDIR}/ktexteditor/katebacktracebrowserplugin.so kde-libkcddb_PORT= audio/libkcddb -kde-libkcddb_LIB= libKF${_KDE_VERSION}Cddb.so +kde-libkcddb_LIB= libKCddb${_KDE_VERSION}.so kde-libkcompactdisc_PORT= audio/libkcompactdisc kde-libkcompactdisc_LIB= libKF${_KDE_VERSION}CompactDisc.so @@ -987,9 +956,6 @@ kde-libkexiv2_LIB5= libKF${_KDE_VERSION}KExiv2.so kde-libkexiv2_LIB6= libKExiv2Qt${_KDE_VERSION}.so kde-libkexiv2_LIB= ${kde-libkexiv2_LIB${_KDE_VERSION}} -kde-libkipi_PORT= graphics/libkipi -kde-libkipi_LIB= libKF${_KDE_VERSION}Kipi.so - kde-libksane_PORT= graphics/libksane kde-libksane_LIB= libKSaneWidgets${_KDE_VERSION}.so