On Wed Apr 17, 2024 at 07:55:47PM +0200, Landry Breuil wrote:
> Le Wed, Apr 17, 2024 at 07:52:11PM +0200, Rafael Sadowski a écrit :
> > On Wed Apr 17, 2024 at 07:34:57PM +0200, Landry Breuil wrote:
> > > Le Wed, Apr 17, 2024 at 07:25:51PM +0200, Rafael Sadowski a écrit :
> > > > I would like to replace devel/kf5/extra-cmake-modules and breeze-icons
> > > > with the kf6 version.
> > > >
> > > > This is the recommended way and for me the first step to continue
> > > > working cleanly.
> > > >
> > > > - Only one version of extra-cmake-modules can be installed. The KF6
> > > > version is backwards compatible and should also be used for KF5
> > > > builds.
> > >
> > > Mmmmm.. hadnt realized it when i first looked before, but why not
> > > then... update devel/kf5/extra-cmake-modules to 6, not touching pkgpath
> > > and PKGNAME for now ? since it replaces version 5.. and this way you
> > > don't have to deal with a migration path.
> > >
> > > maybe the same thing applies for breeze-icons ?
> >
> > Yes, that's the shortcut, but I think we can remove kf5 completely in
> > the mid-term. I would like to have a clean separation. Especially at
> > ports-folder level.
> >
> > Everything comes with a clean kf6- prefix. The same goes for
> > x11/kde-plasma and x11/kde-applications. No longer the kf5 suffix,
> > prefix, non-fix.
>
> ok your call, the more churn the more chances to miss something :)
> i'm fine with your diff then
>
All new KDE6 ports are makred "UNLINKED = kf6". Here is a diff that
makes use of this. I think it is safe for bulk(8) and easer for testers.
(BUILD_UNLINKED=kf6). Still ok kn@ and landry@?
Here is the same diff with one
Index: astro/kstars/Makefile
===================================================================
RCS file: /cvs/ports/astro/kstars/Makefile,v
diff -u -p -u -p -r1.51 Makefile
--- astro/kstars/Makefile 5 Sep 2023 15:07:02 -0000 1.51
+++ astro/kstars/Makefile 21 Apr 2024 06:52:43 -0000
@@ -2,6 +2,7 @@ COMMENT = planetarium simulator for KDE
DISTNAME = kstars-3.6.6
EPOCH = 0
+REVISION = 0
CATEGORIES = astro education
@@ -35,7 +36,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
x11/xplanet
RUN_DEPENDS = devel/desktop-file-utils \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
devel/kf5/kdoctools \
x11/gtk+4,-guic \
x11/qt5/qtquickcontrols \
Index: databases/kexi/Makefile
===================================================================
RCS file: /cvs/ports/databases/kexi/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- databases/kexi/Makefile 8 Feb 2024 20:16:19 -0000 1.17
+++ databases/kexi/Makefile 21 Apr 2024 06:52:45 -0000
@@ -5,7 +5,7 @@ COMMENT = visual database applications c
VERSION = 3.2.0
DISTNAME = kexi-${VERSION}
-REVISION = 5
+REVISION = 6
SHARED_LIBS += kexicore3.2 0.0 # 3.2
SHARED_LIBS += kexidatatable3.2 0.0 # 3.2
@@ -48,12 +48,12 @@ MODULES = devel/cmake \
BUILD_DEPENDS = databases/postgresql,-server \
devel/gettext,-tools \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
devel/kf5/karchive \
x11/kde-applications/marble
RUN_DEPENDS = devel/desktop-file-utils \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
devel/kf5/kservice \
x11/kde-applications/marble
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
diff -u -p -u -p -r1.2401 Makefile
--- devel/Makefile 17 Apr 2024 18:59:04 -0000 1.2401
+++ devel/Makefile 21 Apr 2024 06:52:45 -0000
@@ -249,6 +249,7 @@
SUBDIR += kdiff3
SUBDIR += keystone
SUBDIR += kf5
+ SUBDIR += kf6
SUBDIR += knfmt
SUBDIR += kproperty
SUBDIR += kreport
Index: devel/kf5/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- devel/kf5/Makefile 13 Nov 2023 20:26:06 -0000 1.27
+++ devel/kf5/Makefile 21 Apr 2024 06:52:46 -0000
@@ -1,5 +1,5 @@
SUBDIR =
-SUBDIR += extra-cmake-modules
+#SUBDIR += extra-cmake-modules
# do not sort blindly: items below are listed in the straight build order
# tier docs: https://api.kde.org/frameworks/index.html
@@ -8,7 +8,7 @@ SUBDIR += extra-cmake-modules
SUBDIR += ki18n
SUBDIR += attica
SUBDIR += bluez-qt
-SUBDIR += breeze-icons
+#SUBDIR += breeze-icons
SUBDIR += kapidox
SUBDIR += karchive
SUBDIR += kcodecs
Index: devel/kf5/kf5.port.mk
===================================================================
RCS file: /cvs/ports/devel/kf5/kf5.port.mk,v
diff -u -p -u -p -r1.58 kf5.port.mk
--- devel/kf5/kf5.port.mk 16 Feb 2024 06:03:49 -0000 1.58
+++ devel/kf5/kf5.port.mk 21 Apr 2024 06:52:46 -0000
@@ -6,9 +6,8 @@ MODKF5_BUILD_TESTING ?= No
EXTRACT_SUFX ?= .tar.xz
.endif
-.if ${PKGPATH:Ndevel/kf5/extra-cmake-modules}
-BUILD_DEPENDS += devel/kf5/extra-cmake-modules>=${MODKF5_VERSION}
-.endif
+BUILD_DEPENDS += devel/kf6/extra-cmake-modules>=${MODKF5_VERSION}
+CONFIGURE_ARGS += -DKF_IGNORE_PLATFORM_CHECK=ON
.if empty(CONFIGURE_STYLE)
CONFIGURE_STYLE = cmake
Index: devel/kf5/kiconthemes/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/kiconthemes/Makefile,v
diff -u -p -u -p -r1.24 Makefile
--- devel/kf5/kiconthemes/Makefile 23 Mar 2024 07:06:58 -0000 1.24
+++ devel/kf5/kiconthemes/Makefile 21 Apr 2024 06:52:46 -0000
@@ -1,6 +1,6 @@
COMMENT = KDE icon GUI utility library
DISTNAME = kiconthemes-${VERSION}
-REVISION = 0
+REVISION = 1
SHARED_LIBS = KF5IconThemes 5.6
@@ -11,7 +11,7 @@ WANTLIB += Qt5Widgets Qt5Xml c m
BUILD_DEPENDS = devel/gettext,-tools
-RUN_DEPENDS += devel/kf5/breeze-icons
+RUN_DEPENDS += devel/kf6/breeze-icons
LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
devel/kf5/kcodecs>=${MODKF5_VERSION} \
Index: devel/kf5/kirigami2/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/kirigami2/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- devel/kf5/kirigami2/Makefile 23 Mar 2024 07:06:58 -0000 1.27
+++ devel/kf5/kirigami2/Makefile 21 Apr 2024 06:52:46 -0000
@@ -1,7 +1,7 @@
COMMENT = QtQuick based components set
DISTNAME = kirigami2-${VERSION}
PKGNAME = kf5-${DISTNAME}
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://api.kde.org/frameworks/kirigami/html/index.html
@@ -19,7 +19,7 @@ BUILD_DEPENDS = archivers/gtar \
RUN_DEPENDS = x11/qt5/qtgraphicaleffects \
x11/qt5/qtsvg
-RUN_DEPENDS += devel/kf5/breeze-icons
+RUN_DEPENDS += devel/kf6/breeze-icons
LIB_DEPENDS = x11/qt5/qtquickcontrols2 \
x11/qt5/qtdeclarative
Index: devel/kf5/plasma-framework/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/plasma-framework/Makefile,v
diff -u -p -u -p -r1.40 Makefile
--- devel/kf5/plasma-framework/Makefile 23 Mar 2024 07:06:58 -0000 1.40
+++ devel/kf5/plasma-framework/Makefile 21 Apr 2024 06:52:46 -0000
@@ -1,6 +1,6 @@
COMMENT = core components and tools of the Plasma Workspaces
DISTNAME = plasma-framework-${VERSION}
-REVISION = 0
+REVISION = 1
SHARED_LIBS = KF5Plasma 12.4
SHARED_LIBS += KF5PlasmaQuick 9.0
@@ -38,7 +38,7 @@ RUN_DEPENDS = archivers/bzip2 \
x11/qt5/qtquickcontrols \
x11/qt5/qtwayland
-RUN_DEPENDS += devel/kf5/breeze-icons
+RUN_DEPENDS += devel/kf6/breeze-icons
LIB_DEPENDS = devel/kf5/kactivities>=${MODKF5_VERSION} \
devel/kf5/karchive>=${MODKF5_VERSION} \
Index: devel/kf6/breeze-icons/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf6/breeze-icons/Makefile,v
diff -u -p -u -p -r1.3 Makefile
--- devel/kf6/breeze-icons/Makefile 19 Apr 2024 06:18:49 -0000 1.3
+++ devel/kf6/breeze-icons/Makefile 21 Apr 2024 06:52:47 -0000
@@ -1,4 +1,3 @@
-UNLINKED = kf6
COMMENT = KDE Breeze-style light and dark icon themes
DISTNAME = breeze-icons-${VERSION}
Index: devel/kf6/extra-cmake-modules/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf6/extra-cmake-modules/Makefile,v
diff -u -p -u -p -r1.2 Makefile
--- devel/kf6/extra-cmake-modules/Makefile 19 Apr 2024 06:18:49 -0000
1.2
+++ devel/kf6/extra-cmake-modules/Makefile 21 Apr 2024 06:52:47 -0000
@@ -1,4 +1,3 @@
-UNLINKED = kf6
COMMENT = CMake modules required by KDE and Qt
DISTNAME = extra-cmake-modules-${VERSION}
Index: devel/zeal/Makefile
===================================================================
RCS file: /cvs/ports/devel/zeal/Makefile,v
diff -u -p -u -p -r1.21 Makefile
--- devel/zeal/Makefile 14 Feb 2024 07:52:30 -0000 1.21
+++ devel/zeal/Makefile 21 Apr 2024 06:52:52 -0000
@@ -31,7 +31,7 @@ EXTRACT_SUFX = .tar.xz
MODULES = x11/qt6 devel/cmake
-BUILD_DEPENDS = devel/kf5/extra-cmake-modules
+BUILD_DEPENDS = devel/kf6/extra-cmake-modules
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
Index: emulators/melonds/Makefile
===================================================================
RCS file: /cvs/ports/emulators/melonds/Makefile,v
diff -u -p -u -p -r1.2 Makefile
--- emulators/melonds/Makefile 25 Feb 2024 21:11:24 -0000 1.2
+++ emulators/melonds/Makefile 21 Apr 2024 06:52:53 -0000
@@ -26,7 +26,7 @@ LIB_DEPENDS = archivers/libarchive \
devel/sdl2 \
net/libslirp \
x11/qt5/qtmultimedia
-BUILD_DEPENDS = devel/kf5/extra-cmake-modules
+BUILD_DEPENDS = devel/kf6/extra-cmake-modules
RUN_DEPENDS = x11/gtk+4,-guic \
devel/desktop-file-utils
Index: net/kdeconnect-kde/Makefile
===================================================================
RCS file: /cvs/ports/net/kdeconnect-kde/Makefile,v
diff -u -p -u -p -r1.22 Makefile
--- net/kdeconnect-kde/Makefile 27 Sep 2023 14:18:12 -0000 1.22
+++ net/kdeconnect-kde/Makefile 21 Apr 2024 06:53:00 -0000
@@ -1,6 +1,7 @@
COMMENT = KDE app that allows your devices to communicate
DISTNAME = kdeconnect-kde-${MODKDE_VERSION}
+REVISION = 0
SHARED_LIBS += kdeconnectcore 5.0 # 1.4
SHARED_LIBS += kdeconnectinterfaces 5.0 # 1.4
@@ -43,7 +44,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
wayland/plasma-wayland-protocols
RUN_DEPENDS = devel/desktop-file-utils \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
devel/kf5/kirigami2 \
devel/kf5/qqc2-desktop-style \
sysutils/sshfs-fuse \
Index: net/kdsoap-ws-discovery-client/Makefile
===================================================================
RCS file: /cvs/ports/net/kdsoap-ws-discovery-client/Makefile,v
diff -u -p -u -p -r1.2 Makefile
--- net/kdsoap-ws-discovery-client/Makefile 19 Apr 2024 04:29:54 -0000
1.2
+++ net/kdsoap-ws-discovery-client/Makefile 21 Apr 2024 06:53:00 -0000
@@ -21,7 +21,7 @@ MODULES = devel/cmake \
BUILD_DEPENDS = devel/boost
-BUILD_DEPENDS += devel/kf5/extra-cmake-modules
+BUILD_DEPENDS += devel/kf6/extra-cmake-modules
LIB_DEPENDS = net/kdsoap,qt6
Index: net/nextcloudclient/Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
diff -u -p -u -p -r1.60 Makefile
--- net/nextcloudclient/Makefile 23 Mar 2024 09:23:05 -0000 1.60
+++ net/nextcloudclient/Makefile 21 Apr 2024 06:53:01 -0000
@@ -38,7 +38,7 @@ BUILD_DEPENDS = devel/gettext,-tools
BUILD_DEPENDS += x11/gnome/librsvg
# FindInotify.cmake
-BUILD_DEPENDS += devel/kf5/extra-cmake-modules
+BUILD_DEPENDS += devel/kf6/extra-cmake-modules
# for tests, but detected during configure
BUILD_DEPENDS += devel/cmocka
Index: net/owncloudclient/Makefile
===================================================================
RCS file: /cvs/ports/net/owncloudclient/Makefile,v
diff -u -p -u -p -r1.75 Makefile
--- net/owncloudclient/Makefile 25 Sep 2023 17:07:34 -0000 1.75
+++ net/owncloudclient/Makefile 21 Apr 2024 06:53:01 -0000
@@ -30,7 +30,7 @@ SITES.a = https://github.com/owncloud/l
MODULES = devel/cmake x11/qt5
-BUILD_DEPENDS = devel/kf5/extra-cmake-modules
+BUILD_DEPENDS = devel/kf6/extra-cmake-modules
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+4,-guic
Index: sysutils/krename/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/krename/Makefile,v
diff -u -p -u -p -r1.43 Makefile
--- sysutils/krename/Makefile 27 Sep 2023 17:16:28 -0000 1.43
+++ sysutils/krename/Makefile 21 Apr 2024 06:53:05 -0000
@@ -2,7 +2,7 @@ COMMENT = powerful batch file renamer
VERSION = 5.0.2
DISTNAME = krename-${VERSION}
-REVISION = 1
+REVISION = 2
CATEGORIES = sysutils x11
@@ -29,7 +29,7 @@ MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
x11/gtk+4,-guic
LIB_DEPENDS = audio/taglib \
Index: x11/kde-applications/kdenlive/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kdenlive/Makefile,v
diff -u -p -u -p -r1.32 Makefile
--- x11/kde-applications/kdenlive/Makefile 13 Jun 2023 19:14:06 -0000
1.32
+++ x11/kde-applications/kdenlive/Makefile 21 Apr 2024 06:53:13 -0000
@@ -3,6 +3,7 @@ USE_WXNEEDED = Yes
COMMENT = non-linear video editor for KDE
DISTNAME = kdenlive-${VERSION}
+REVISION = 0
CATEGORIES = multimedia
WANTLIB += ${COMPILER_LIBCXX} KF5Archive KF5Attica KF5Auth KF5AuthCore
@@ -26,7 +27,7 @@ MODKDE5_DOCS = yes
MODULES += lang/python
-RUN_DEPENDS = devel/kf5/breeze-icons \
+RUN_DEPENDS = devel/kf6/breeze-icons \
devel/kf5/kinit \
graphics/ffmpeg \
misc/shared-mime-info \
Index: x11/kde-applications/kirigami-gallery/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kirigami-gallery/Makefile,v
diff -u -p -u -p -r1.4 Makefile
--- x11/kde-applications/kirigami-gallery/Makefile 11 Mar 2022 20:16:21
-0000 1.4
+++ x11/kde-applications/kirigami-gallery/Makefile 21 Apr 2024 06:53:13
-0000
@@ -1,5 +1,7 @@
COMMENT = kirigami component gallery application
DISTNAME = kirigami-gallery-${VERSION}
+REVISION = 0
+
CATEGORIES = devel
HOMEPAGE = https://apps.kde.org/de/kirigami2.gallery/
@@ -15,7 +17,7 @@ BUILD_DEPENDS = devel/kf5/kpackage \
x11/qt5/qtquickcontrols
RUN_DEPENDS = devel/kf5/kpackage \
- devel/kf5/breeze-icons \
+ devel/kf6/breeze-icons \
devel/kf5/qqc2-desktop-style \
x11/qt5/qtquickcontrols
Index: x11/kde-plasma/breeze/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-plasma/breeze/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- x11/kde-plasma/breeze/Makefile 21 Dec 2023 20:35:17 -0000 1.10
+++ x11/kde-plasma/breeze/Makefile 21 Apr 2024 06:53:13 -0000
@@ -1,5 +1,6 @@
COMMENT = Breeze KDE desktop theme
DISTNAME = breeze-${VERSION}
+REVISION = 0
SHARED_LIBS += breezecommon5 1.0 # 5.12.0
@@ -17,7 +18,7 @@ BUILD_DEPENDS = devel/kf5/kpackage
RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kpackage \
- devel/kf5/breeze-icons
+ devel/kf6/breeze-icons
LIB_DEPENDS = devel/kf5/frameworkintegration \
devel/kf5/kauth \
Index: x11/kde-plasma/oxygen/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-plasma/oxygen/Makefile,v
diff -u -p -u -p -r1.9 Makefile
--- x11/kde-plasma/oxygen/Makefile 21 Dec 2023 20:35:18 -0000 1.9
+++ x11/kde-plasma/oxygen/Makefile 21 Apr 2024 06:53:13 -0000
@@ -1,5 +1,7 @@
COMMENT = style for Qt/KDE Applications
DISTNAME = oxygen-${VERSION}
+REVISION = 0
+
SHARED_LIBS = oxygenstyle5 1.0
SHARED_LIBS += oxygenstyleconfig5 0.0
@@ -16,7 +18,7 @@ MODKDE5_TRANSLATIONS = Yes
BUILD_DEPENDS = devel/kf5/kpackage
RUN_DEPENDS = devel/kf5/kpackage \
- devel/kf5/breeze-icons
+ devel/kf6/breeze-icons
LIB_DEPENDS = devel/kf5/frameworkintegration \
devel/kf5/kauth \
Index: x11/lightly/Makefile
===================================================================
RCS file: /cvs/ports/x11/lightly/Makefile,v
diff -u -p -u -p -r1.6 Makefile
--- x11/lightly/Makefile 24 Apr 2023 11:42:24 -0000 1.6
+++ x11/lightly/Makefile 21 Apr 2024 06:53:13 -0000
@@ -5,7 +5,7 @@ GH_PROJECT = Lightly
GH_TAGNAME = v0.4.1
PKGNAME = ${DISTNAME:L}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = lightlycommon5 0.0 # 0.4.1
@@ -30,7 +30,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
RUN_DEPENDS = x11/gtk+4,-guic \
devel/kf5/kpackage \
- devel/kf5/breeze-icons
+ devel/kf6/breeze-icons
LIB_DEPENDS = devel/kf5/frameworkintegration \
devel/kf5/kauth \
