Re: Switch from devel/kf5 to kf6/{extra-cmake-modules,breeze-icons}
Le Sun, Apr 21, 2024 at 09:01:13AM +0200, Rafael Sadowski a écrit : > 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. > > > > > > > > M.. 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@? i've checked that there was @pkgpath/@conflict so that the kf5 versions of extra-cmake-modules/breeze-icons will be upgraded to the kf6. still ok with me.
Re: Switch from devel/kf5 to kf6/{extra-cmake-modules,breeze-icons}
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.
> > >
> > > M.. 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 - 1.51
+++ astro/kstars/Makefile 21 Apr 2024 06:52:43 -
@@ -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 - 1.17
+++ databases/kexi/Makefile 21 Apr 2024 06:52:45 -
@@ -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 - 1.2401
+++ devel/Makefile 21 Apr 2024 06:52:45 -
@@ -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 - 1.27
+++ devel/kf5/Makefile 21 Apr 2024 06:52:46 -
@@ -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
Re: Switch from devel/kf5 to kf6/{extra-cmake-modules,breeze-icons}
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. > > > > M.. 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
Re: Switch from devel/kf5 to kf6/{extra-cmake-modules,breeze-icons}
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. > > M.. 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. Rafael
Re: Switch from devel/kf5 to kf6/{extra-cmake-modules,breeze-icons}
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. M.. 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 ?
