Bug 280070 (kf5-ecm-removal) - [exp-run] Make all ports using ecm use devel/kf6-extra-cmake-modules
Summary: [exp-run] Make all ports using ecm use devel/kf6-extra-cmake-modules
Status: Closed FIXED
Alias: kf5-ecm-removal
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-07-01 11:28 UTC by Tobias C. Berner
Modified: 2024-07-25 17:13 UTC (History)
4 users (show)

See Also:
arrowd: exp-run+


Attachments
Updated patch (5.83 KB, patch)
2024-07-19 09:44 UTC, Gleb Popov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias C. Berner freebsd_committer freebsd_triage 2024-07-01 11:28:08 UTC
Moin moin

kde@ would like to ask for an exp-run to prepare to remove devel/kf5-extra-cmake-modules, in favor of always using devel/kf6-extra-cmake-modules.

The patch can be found here:

https://people.freebsd.org/~tcberner/patches/0001-Uses-kde.mk-prepare-for-the-removal-of-devel-kf5-ext.patch


mfg Tobias
Comment 1 Jason E. Hale freebsd_committer freebsd_triage 2024-07-01 14:13:56 UTC
(In reply to Tobias C. Berner from comment #0)

The following ports have devel/kf5-extra-cmake-modules listed directly in BUILD_DEPENDS and should also be included in your patch:

deskutils/syncthingtray
graphics/drawpile
textproc/crow-translate
Comment 2 Tobias C. Berner freebsd_committer freebsd_triage 2024-07-01 14:15:41 UTC
(In reply to Jason E. Hale from comment #1)
oh, good catch, thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2024-07-14 16:51:43 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=361c7862039b13383065cd62e0a1f0007f4dc3e5

commit 361c7862039b13383065cd62e0a1f0007f4dc3e5
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-14 16:19:56 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-14 16:51:31 +0000

    chinese/fcitx5-mcbopomofo: Declare dependency on devel/icu

    PR:             280070

 chinese/fcitx5-mcbopomofo/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2024-07-14 16:51:44 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f72970869e0f72223904e84d5c508ee29f93418

commit 1f72970869e0f72223904e84d5c508ee29f93418
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-14 16:40:44 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-14 16:51:31 +0000

    chinese/fcitx-rime: Mark BROKEN

    PR:             280070

 chinese/fcitx-rime/Makefile | 2 ++
 1 file changed, 2 insertions(+)
Comment 6 commit-hook freebsd_committer freebsd_triage 2024-07-15 07:11:29 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25237138341dc07b467664d4a83306338fc13ec0

commit 25237138341dc07b467664d4a83306338fc13ec0
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-15 07:00:21 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-15 07:10:28 +0000

    devel/zeal: Unbreak build with Qt 6

    The port still fails at the moment because it picks Qt 5, but this will be
    fixed once we switch to kf6-extra-cmake-modules

    PR:             280070

 devel/zeal/Makefile                                 | 2 +-
 devel/zeal/files/patch-src_app_CMakeLists.txt (new) | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2024-07-15 08:12:35 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=413a1f2fd2c2997f8160604f1c1abc7871e0a050

commit 413a1f2fd2c2997f8160604f1c1abc7871e0a050
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-15 08:11:47 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-15 08:12:19 +0000

    audio/plasma5-oxygen-sounds: Fix build with KF6

    PR:             280070

 audio/plasma5-oxygen-sounds/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-07-15 08:33:38 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffda5d8879dc80b8a28a2a7f8235c20300790588

commit ffda5d8879dc80b8a28a2a7f8235c20300790588
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-15 08:32:05 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-15 08:32:05 +0000

    x11/antimicrox: Fix build with KF6

    PR:             280070

 x11/antimicrox/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 9 commit-hook freebsd_committer freebsd_triage 2024-07-15 08:33:39 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=98f789831885deb55915f838489fd57fc331bced

commit 98f789831885deb55915f838489fd57fc331bced
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-15 08:13:55 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-15 08:22:14 +0000

    KDE ports: Fix build with KF6

    PR:             280070

 x11-fonts/oxygen-fonts/Makefile       | 2 +-
 x11-themes/kf5-oxygen-icons5/Makefile | 7 +------
 x11/plasma-wayland-protocols/Makefile | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)
Comment 10 Gleb Popov freebsd_committer freebsd_triage 2024-07-15 08:34:34 UTC
@tcberner The fallout has been dealt with, sir!

o7
Comment 11 Tobias C. Berner freebsd_committer freebsd_triage 2024-07-15 13:54:49 UTC
(In reply to Gleb Popov from comment #10)
Awesome, thank you very much :D 


@antoine, could you take it for an other exp-run, unless you think it is good to go as is?
Comment 12 Antoine Brodin freebsd_committer freebsd_triage 2024-07-18 07:16:40 UTC
(In reply to Tobias C. Berner from comment #11)

The patch fails to apply
Comment 13 Gleb Popov freebsd_committer freebsd_triage 2024-07-19 09:44:46 UTC
Created attachment 252164 [details]
Updated patch
Comment 15 commit-hook freebsd_committer freebsd_triage 2024-07-20 08:38:07 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=31454ac364c508eedd5d0cd4395f42fa75a887a9

commit 31454ac364c508eedd5d0cd4395f42fa75a887a9
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-20 08:36:15 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-20 08:37:55 +0000

    textproc/crow-translate: Fix build with KF6

    PR:             280070

 textproc/crow-translate/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 16 Gleb Popov freebsd_committer freebsd_triage 2024-07-23 12:18:52 UTC
Do you think this is ready to go, Antoine?
Comment 17 Antoine Brodin freebsd_committer freebsd_triage 2024-07-23 12:27:29 UTC
(In reply to Gleb Popov from comment #16)
It should be
Comment 18 commit-hook freebsd_committer freebsd_triage 2024-07-23 12:52:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eef1a0b44d861ec93b214046f92c9da6a0eea899

commit eef1a0b44d861ec93b214046f92c9da6a0eea899
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-07-01 11:24:24 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
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(-)
Comment 19 commit-hook freebsd_committer freebsd_triage 2024-07-25 17:13:01 UTC
A commit in branch 2024Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9815c7b35e0d1f4064c7de3f46da1ef03d4278b6

commit 9815c7b35e0d1f4064c7de3f46da1ef03d4278b6
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-07-15 07:00:21 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-07-25 17:12:08 +0000

    devel/zeal: Unbreak build with Qt 6

    The port still fails at the moment because it picks Qt 5, but this will be
    fixed once we switch to kf6-extra-cmake-modules

    PR:             280070
    (cherry picked from commit 25237138341dc07b467664d4a83306338fc13ec0)

 devel/zeal/Makefile                                 | 2 +-
 devel/zeal/files/patch-src_app_CMakeLists.txt (new) | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)