Can't install the port devel/thunar-vcs-plugin while kdevelop is already installed and vice versa. The output of pkg install command: Checking integrity... done (1 conflicting) - thunar-vcs-plugin-0.4.0_1 conflicts with kdevelop-25.04.2 on /usr/local/share/icons/hicolor/16x16/apps/subversion.png Checking integrity... done (0 conflicting) Conflicts with the existing packages have been found. One more solver iteration is needed to resolve them. The following 2 package(s) will be affected (of 0 checked): Installed packages to be UPGRADED: thunar-vcs-plugin: 0.3.0 -> 0.4.0_1 [1/1] Fetching kdevelop-25.04.2.pkg: 100% 10 MiB 10.5MB/s 00:01 Checking integrity... done (1 conflicting) - kdevelop-25.04.2 conflicts with thunar-vcs-plugin-0.4.0_1 on /usr/local/share/icons/hicolor/16x16/apps/subversion.png Checking integrity... done (0 conflicting) Conflicts with the existing packages have been found. One more solver iteration is needed to resolve them. The following 4 package(s) will be affected (of 0 checked): Installed packages to be UPGRADED: thunar-vcs-plugin: 0.3.0 -> 0.4.0_1 Installed packages to be REMOVED: kdev-php: 25.04.2 kdev-python: 25.04.2 kdevelop: 25.04.2 Number of packages to be removed: 3 Number of packages to be upgraded: 1 The operation will free 57 MiB. Proceed with this action? [y/N]: Installed packages to be REINSTALLED: kdevelop-25.04.2 Number of packages to be upgraded: 1 Number of packages to be reinstalled: 1 10 MiB to be downloaded. Proceed with this action? [y/N]: y
Corrected pkg install output: All repositories are up to date. Checking integrity... done (2 conflicting) - thunar-vcs-plugin-0.4.0_1 conflicts with kdevelop-25.04.2 on /usr/local/share/icons/hicolor/16x16/apps/subversion.png - thunar-vcs-plugin-0.4.0_1 conflicts with kdevelop-25.04.2 on /usr/local/share/icons/hicolor/16x16/apps/subversion.png Checking integrity... done (0 conflicting) The following 4 package(s) will be affected (of 0 checked): Installed packages to be UPGRADED: thunar-vcs-plugin: 0.3.0 -> 0.4.0_1 Installed packages to be REMOVED: kdev-php: 25.04.2 kdev-python: 25.04.2 kdevelop: 25.04.2 Number of packages to be removed: 3 Number of packages to be upgraded: 1 The operation will free 57 MiB. Proceed with this action? [y/N]:
Ugh, this is unfortunate. Can you please check plists of both kdevelop and thunar-vcs-plugin and find all the conflicting files? Or is it only subversion.png?
(In reply to Gleb Popov from comment #2) I've copmared the output of pkg info -l command for both thunar-vcs-plugin and kdevelop. So there is only one conflicting file - /usr/local/share/icons/hicolor/16x16/apps/subversion.png
This is very unfortunate, and I'd say this did not show up earlier just by chance. Looks like both ports have been installing a subversion.png file, but at different sizes, all along. This shows up now because the same size file has been added to thunar-vcs-plugin. Most probably the icons look also the same. I'm not sure how this can be fixed. We can simply stop installing the 16x16 size icon from the thunar-vcs-plugin port. The plugin itself is not referencing it, so my guess is the icon is there for thunar usage when displaying the files in its window. Not the best solution though. I filed an issue upstream [1], to get some feedback, maybe some better idea can come our way. [1] https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin/-/issues/15
I think we can just drop 16x16 png from kde package to solve the conflict temporary.
(In reply to Max Brazhnikov from comment #5) +1 as I'm not kde user but the problem is interesting, yes
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c4729fd7ef64e2265d13a76c41564ecfe9c2bea commit 2c4729fd7ef64e2265d13a76c41564ecfe9c2bea Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2025-06-26 09:23:30 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2025-06-26 09:30:43 +0000 devel/kdevelop: avoid conflict with devel/thunar-vcs-plugin Both install 16x16 png icon for subversion of similar visual style: https://invent.kde.org/kdevelop/kdevelop/-/raw/master/plugins/subversion/icons/16-apps-subversion.png https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin/-/raw/master/icons/16x16/subversion.png Drop the 16x16 icon from kdevelop. It still installs other sizes and svg icon. PR: 287804 Reported by: Sergey V. Koupreyenko devel/kdevelop/Makefile | 1 + devel/kdevelop/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
A patch has been proposed upstream which should fix this for good, I'm waiting to see if it is merge there before committing it for us.
Created attachment 262560 [details] Import upstream patch Upstream merged the patch at [1] renaming the icons. This should fix the issue for good. Also, the changes to kdevelop can be rolled back once this is committed. @sergey.dyatko@gmail.com can you review and eventually approve this patch? Thanks in advance. [1] https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin/-/merge_requests/22
(In reply to Guido Falsi from comment #9) looks good to me
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f26455fa3842689aedfa77dba58102627c944eb commit 2f26455fa3842689aedfa77dba58102627c944eb Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2025-07-31 13:17:50 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2025-07-31 13:17:50 +0000 devel/thunar-vcs-plugin: Import upstream change fixing icon naming issue Import an upstream change that adds a domain to icon names to avoid conflicts with other software packages. PR: 287804 Approved by: Sergey V. Dyatko <sergey.dyatko@gmail.com> (maintainer) Obtained from: https://gitlab.xfce.org/thunar-plugins/thunar-vcs-plugin/-/merge_requests/22 devel/thunar-vcs-plugin/Makefile | 10 ++- devel/thunar-vcs-plugin/files/patch-icons (new) | 88 +++++++++++++++++++++++++ devel/thunar-vcs-plugin/pkg-plist | 12 ++-- 3 files changed, 103 insertions(+), 7 deletions(-)
I committed the upstream patch. It removes the naming conflict. @makc I think you can now revert the changes to kdevelop
(In reply to Guido Falsi from comment #12) Thank you! I'll revert it with the next port update.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=76982d517f2a15b387e49943e2390177e4139344 commit 76982d517f2a15b387e49943e2390177e4139344 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2025-08-15 18:06:47 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2025-08-15 18:06:47 +0000 KDE: Update KDE Gear to 25.08.0 Announcement: https://kde.org/announcements/gear/25.08.0/ Removed ports: devel/cervisia: not ported to Qt6 and excluded from KDE Gear releases databases/akonadi: - Backport upstream patch to fix account management in Merkuro devel/kdevelop: - Bump PLATFORM_VER to 6.3 - Revert now needless workaround [1] devel/kpublictranspor: - Renew USE_KDE - Explicitly disable KF6NetworkManagerQt graphics/kqtquickcharts: - Switch to Qt6/KF6 - Remove noop DOCS option math/kig: - Switch to Qt6/KF6 misc/artikulate: - Switch to Qt6/KF6 misc/kdeedu-data: - Update WWW and description misc/ktouch: - Switch to Qt6/KF6 multimedia/dragon: - Renew USE_KDE - Add dependency on ffmpeg and remove stale pkg-message multimedia/kamoso: - Switch to Qt6/KF6 net-im/neochat: - Add now mandatory dependency on devel/kunifiedpush - Add missing Qt dependencies x11-clocks/kteatime: - Renew USE_KDE PR: 287804 [1] Mk/Uses/kde.mk | 4 +- accessibility/kmag/distinfo | 6 +- accessibility/kmousetool/distinfo | 6 +- accessibility/kmouth/distinfo | 6 +- archivers/ark/distinfo | 6 +- archivers/ark/pkg-plist | 2 - astro/kosmindoormap/distinfo | 6 +- astro/kosmindoormap/pkg-plist | 2 + astro/marble/distinfo | 6 +- astro/marble/pkg-plist | 1 + audio/audiocd-kio/distinfo | 6 +- audio/elisa/Makefile | 1 - audio/elisa/distinfo | 6 +- audio/juk/distinfo | 6 +- audio/kmix/distinfo | 6 +- audio/kwave/distinfo | 6 +- audio/libkcddb/distinfo | 6 +- audio/libkcompactdisc/distinfo | 6 +- databases/akonadi/Makefile | 2 + databases/akonadi/distinfo | 8 +- databases/akonadi/pkg-plist | 21 ++++ deskutils/akonadi-calendar-tools/distinfo | 6 +- deskutils/akonadi-calendar-tools/pkg-plist | 1 + deskutils/akonadi-import-wizard/distinfo | 6 +- deskutils/akonadiconsole/distinfo | 6 +- deskutils/akonadiconsole/pkg-plist | 1 + deskutils/akregator/distinfo | 6 +- deskutils/grantlee-editor/distinfo | 6 +- deskutils/grantleetheme/distinfo | 6 +- deskutils/itinerary/distinfo | 6 +- deskutils/kaddressbook/distinfo | 6 +- deskutils/kalarm/distinfo | 6 +- deskutils/kcharselect/distinfo | 6 +- deskutils/kdeconnect-kde/distinfo | 6 +- deskutils/kdeconnect-kde/pkg-plist | 127 ++------------------ deskutils/kdepim-addons/distinfo | 6 +- deskutils/kdepim-addons/pkg-plist | 30 +++++ deskutils/kdepim-runtime/distinfo | 6 +- deskutils/kdepim-runtime/pkg-plist | 74 +++++++++++- deskutils/keditbookmarks/distinfo | 6 +- deskutils/kfind/distinfo | 6 +- deskutils/kmail-account-wizard/distinfo | 6 +- deskutils/kmail/distinfo | 6 +- deskutils/kongress/distinfo | 6 +- deskutils/kontact/distinfo | 6 +- deskutils/korganizer/distinfo | 6 +- deskutils/korganizer/pkg-plist | 1 - deskutils/kruler/distinfo | 6 +- deskutils/kweather/distinfo | 6 +- deskutils/kweathercore/distinfo | 6 +- deskutils/libkdepim/distinfo | 6 +- deskutils/mbox-importer/distinfo | 6 +- deskutils/merkuro/distinfo | 6 +- deskutils/merkuro/pkg-plist | 11 -- deskutils/pim-data-exporter/distinfo | 6 +- deskutils/pim-sieve-editor/distinfo | 6 +- deskutils/zanshin/distinfo | 6 +- devel/cervisia/Makefile | 3 +- devel/dolphin-plugins/distinfo | 6 +- devel/dolphin-plugins/pkg-plist | 3 +- devel/kapptemplate/distinfo | 6 +- devel/kcachegrind/distinfo | 6 +- devel/kde-dev-scripts/distinfo | 6 +- devel/kde-dev-utils/distinfo | 6 +- devel/kdesdk-kio/distinfo | 6 +- devel/kdesdk-thumbnailers/distinfo | 6 +- devel/kdesdk-thumbnailers/pkg-plist | 1 + devel/kdev-php/distinfo | 6 +- devel/kdev-python/distinfo | 6 +- devel/kdevelop/distinfo | 6 +- devel/kdevelop/kdevelop.mk | 2 +- devel/kdevelop/pkg-plist | 18 ++- devel/kio-extras/Makefile | 1 - devel/kio-extras/distinfo | 6 +- devel/kirigami-gallery/distinfo | 6 +- devel/kopeninghours/distinfo | 6 +- devel/kpublictransport/Makefile | 3 +- devel/kpublictransport/distinfo | 6 +- devel/kpublictransport/pkg-plist | 15 +++ devel/kunifiedpush/distinfo | 6 +- devel/kunifiedpush/pkg-plist | 3 + devel/lokalize/distinfo | 6 +- devel/lokalize/pkg-plist | 7 -- devel/massif-visualizer/distinfo | 6 +- devel/poxml/distinfo | 6 +- devel/umbrello/distinfo | 6 +- devel/umbrello/pkg-plist | 1 + editors/calligra/Makefile | 1 - editors/calligra/distinfo | 6 +- editors/calligra/pkg-plist | 2 + editors/ghostwriter/distinfo | 6 +- editors/ghostwriter/pkg-plist | 1 + editors/kate/distinfo | 6 +- editors/kate/pkg-plist | 26 +++++ games/blinken/distinfo | 6 +- games/bomber/distinfo | 6 +- games/bovo/distinfo | 6 +- games/granatier/distinfo | 6 +- games/kajongg/distinfo | 6 +- games/kanagram/distinfo | 6 +- games/kapman/distinfo | 6 +- games/katomic/distinfo | 6 +- games/kblackbox/distinfo | 6 +- games/kblocks/distinfo | 6 +- games/kbounce/distinfo | 6 +- games/kbreakout/distinfo | 6 +- games/kdiamond/distinfo | 6 +- games/kfourinline/distinfo | 6 +- games/kgoldrunner/distinfo | 6 +- games/khangman/distinfo | 6 +- games/khangman/pkg-plist | 1 + games/kigo/distinfo | 6 +- games/killbots/distinfo | 6 +- games/kiriki/distinfo | 6 +- games/kjumpingcube/distinfo | 6 +- games/klickety/distinfo | 6 +- games/klines/distinfo | 6 +- games/kmahjongg/distinfo | 6 +- games/kmines/distinfo | 6 +- games/knavalbattle/distinfo | 6 +- games/knetwalk/distinfo | 6 +- games/knights/distinfo | 6 +- games/kolf/distinfo | 6 +- games/kollision/distinfo | 6 +- games/konquest/distinfo | 6 +- games/kpat/distinfo | 6 +- games/kreversi/distinfo | 6 +- games/kshisen/distinfo | 6 +- games/ksirk/distinfo | 6 +- games/ksnakeduel/distinfo | 6 +- games/kspaceduel/distinfo | 6 +- games/ksquares/distinfo | 6 +- games/ksudoku/distinfo | 6 +- games/ktuberling/distinfo | 6 +- games/kubrick/distinfo | 6 +- games/libkdegames/distinfo | 6 +- games/libkmahjongg/distinfo | 6 +- games/lskat/distinfo | 6 +- games/palapeli/distinfo | 6 +- games/picmi/distinfo | 6 +- games/skladnik/distinfo | 6 +- graphics/colord-kde/distinfo | 6 +- graphics/gwenview/distinfo | 6 +- graphics/kamera/distinfo | 6 +- graphics/kcolorchooser/distinfo | 6 +- graphics/kdegraphics-mobipocket/distinfo | 6 +- graphics/kdegraphics-mobipocket/pkg-plist.qt5 | 6 +- graphics/kdegraphics-mobipocket/pkg-plist.qt6 | 6 +- graphics/kdegraphics-svgpart/distinfo | 6 +- graphics/kdegraphics-thumbnailers/distinfo | 6 +- graphics/kgraphviewer/distinfo | 6 +- graphics/kgraphviewer/pkg-plist | 1 + graphics/kimagemapeditor/distinfo | 6 +- graphics/kolourpaint/distinfo | 6 +- graphics/kolourpaint/pkg-plist | 5 + graphics/kontrast/Makefile | 1 - graphics/kontrast/distinfo | 6 +- graphics/kqtquickcharts/Makefile | 7 +- graphics/kqtquickcharts/distinfo | 6 +- graphics/kqtquickcharts/pkg-plist | 4 +- graphics/ksanecore/Makefile | 1 - graphics/ksanecore/distinfo | 6 +- graphics/libkdcraw/distinfo | 6 +- graphics/libkexiv2/distinfo | 6 +- graphics/libksane/distinfo | 6 +- graphics/okular/distinfo | 6 +- graphics/okular/pkg-plist | 4 +- graphics/skanlite/distinfo | 6 +- graphics/skanpage/distinfo | 6 +- irc/konversation/distinfo | 6 +- japanese/kiten/distinfo | 6 +- lang/kturtle/distinfo | 6 +- math/analitza/distinfo | 6 +- math/cantor/Makefile | 1 - math/cantor/distinfo | 6 +- math/kalgebra/distinfo | 6 +- math/kalk/distinfo | 6 +- math/kalk/pkg-plist | 1 + math/kbruch/distinfo | 6 +- math/kcalc/distinfo | 6 +- math/kig/Makefile | 16 +-- math/kig/distinfo | 6 +- math/kig/pkg-plist | 2 +- math/kmplot/distinfo | 6 +- math/rocs/distinfo | 6 +- misc/artikulate/Makefile | 10 +- misc/artikulate/distinfo | 6 +- misc/artikulate/pkg-plist | 3 +- misc/kdeedu-data/Makefile | 2 +- misc/kdeedu-data/distinfo | 6 +- misc/kdeedu-data/pkg-descr | 2 +- misc/kgeography/distinfo | 6 +- misc/klettres/distinfo | 6 +- misc/ktouch/Makefile | 14 +-- misc/ktouch/distinfo | 6 +- misc/kwordquiz/distinfo | 6 +- misc/libkeduvocdocument/distinfo | 6 +- misc/minuet/distinfo | 6 +- misc/minuet/pkg-plist | 1 + misc/parley/distinfo | 6 +- multimedia/dragon/Makefile | 15 ++- multimedia/dragon/distinfo | 6 +- multimedia/dragon/pkg-message (gone) | 11 -- multimedia/dragon/pkg-plist | 38 ++---- multimedia/kamoso/Makefile | 16 +-- multimedia/kamoso/distinfo | 6 +- multimedia/kamoso/pkg-plist | 3 +- multimedia/kasts/distinfo | 6 +- multimedia/kdemultimedia-ffmpegthumbs/distinfo | 6 +- multimedia/kdenlive/Makefile | 1 - multimedia/kdenlive/distinfo | 6 +- multimedia/kdenlive/pkg-plist | 68 ++++++++++- multimedia/plasmatube/distinfo | 6 +- net-im/kaccounts-integration/Makefile | 1 - net-im/kaccounts-integration/distinfo | 6 +- net-im/kaccounts-providers/distinfo | 6 +- net-im/neochat/Makefile | 6 +- net-im/neochat/distinfo | 6 +- net-im/neochat/pkg-plist | 2 + net-im/tokodon/distinfo | 6 +- net-p2p/ktorrent/distinfo | 6 +- net-p2p/libktorrent/distinfo | 6 +- net/akonadi-calendar/distinfo | 6 +- net/akonadi-calendar/pkg-plist | 15 ++- net/akonadi-contacts/distinfo | 6 +- net/akonadi-contacts/pkg-plist | 2 + net/akonadi-mime/distinfo | 6 +- net/akonadi-search/distinfo | 6 +- net/alligator/distinfo | 6 +- net/calendarsupport/distinfo | 6 +- net/eventviews/distinfo | 6 +- net/incidenceeditor/distinfo | 6 +- net/kcalutils/distinfo | 6 +- net/kcalutils/pkg-plist | 1 + net/kdenetwork-filesharing/Makefile | 1 - net/kdenetwork-filesharing/distinfo | 6 +- net/kget/Makefile | 4 - net/kget/distinfo | 10 +- net/kidentitymanagement/distinfo | 6 +- net/kimap/distinfo | 6 +- net/kio-gdrive/distinfo | 6 +- net/kio-gdrive/pkg-plist | 1 + net/kio-zeroconf/distinfo | 6 +- net/kitinerary/distinfo | 6 +- net/kldap/distinfo | 6 +- net/kmailtransport/distinfo | 6 +- net/kmbox/distinfo | 6 +- net/kmime/distinfo | 6 +- net/kontactinterface/distinfo | 6 +- net/kpimtextedit/distinfo | 6 +- net/krdc/distinfo | 6 +- net/krdc/pkg-plist | 1 + net/krfb/distinfo | 6 +- net/ksmtp/distinfo | 6 +- net/ktnef/distinfo | 6 +- net/libgravatar/distinfo | 6 +- net/libkgapi/distinfo | 6 +- net/libksieve/distinfo | 6 +- net/mailcommon/distinfo | 6 +- net/mailimporter/distinfo | 6 +- net/messagelib/distinfo | 6 +- net/mimetreeparser/distinfo | 6 +- net/pimcommon/distinfo | 6 +- net/pimcommon/pkg-plist | 2 - science/kalzium/distinfo | 6 +- science/kalzium/pkg-plist | 20 ++++ science/step/distinfo | 6 +- science/step/pkg-plist | 43 +++++++ security/keysmith/distinfo | 6 +- security/kgpg/distinfo | 6 +- security/kleopatra/Makefile | 5 - security/kleopatra/distinfo | 12 +- security/kpkpass/distinfo | 6 +- security/kwalletmanager/distinfo | 6 +- security/libkleo/distinfo | 6 +- security/libkleo/pkg-plist | 7 +- sysutils/baloo-widgets/distinfo | 6 +- sysutils/filelight/distinfo | 6 +- sysutils/filelight/pkg-plist | 1 + sysutils/k3b/distinfo | 6 +- sysutils/kbackup/distinfo | 6 +- sysutils/kcron/distinfo | 6 +- sysutils/kcron/pkg-plist | 154 ++++++++++++------------- sysutils/kdebugsettings/distinfo | 6 +- sysutils/kdf/distinfo | 6 +- sysutils/kdialog/distinfo | 6 +- sysutils/khelpcenter/distinfo | 6 +- sysutils/kpmcore/distinfo | 6 +- sysutils/kpmcore/pkg-plist | 2 + sysutils/ksystemlog/distinfo | 6 +- sysutils/ksystemlog/pkg-plist | 1 + sysutils/signon-kwallet-extension/distinfo | 6 +- sysutils/sweeper/distinfo | 6 +- textproc/arianna/distinfo | 6 +- textproc/kompare/distinfo | 6 +- textproc/libkomparediff2/distinfo | 6 +- textproc/markdownpart/distinfo | 6 +- textproc/markdownpart/pkg-plist | 1 + www/falkon/distinfo | 6 +- www/falkon/pkg-plist | 2 +- x11-clocks/kteatime/Makefile | 6 +- x11-clocks/kteatime/distinfo | 6 +- x11-clocks/ktimer/distinfo | 6 +- x11-fm/dolphin/distinfo | 6 +- x11-fm/dolphin/pkg-plist | 5 +- x11-fm/konqueror/distinfo | 6 +- x11-fm/konqueror/pkg-plist | 2 + x11/konsole/distinfo | 6 +- x11/konsole/pkg-plist | 4 - x11/yakuake/distinfo | 6 +- 310 files changed, 1220 insertions(+), 1060 deletions(-)
A commit in branch 2025Q3 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=199061f2d9c9fc45f77983b6b18ff5c18bf50837 commit 199061f2d9c9fc45f77983b6b18ff5c18bf50837 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2025-08-21 20:58:47 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> CommitDate: 2025-08-21 20:58:47 +0000 KDE: Update KDE Gear to 25.08.0 Announcement: https://kde.org/announcements/gear/25.08.0/ Removed ports: devel/cervisia: not ported to Qt6 and excluded from KDE Gear releases databases/akonadi: - Backport upstream patch to fix account management in Merkuro devel/kdevelop: - Bump PLATFORM_VER to 6.3 - Revert now needless workaround [1] devel/kpublictranspor: - Renew USE_KDE - Explicitly disable KF6NetworkManagerQt graphics/kqtquickcharts: - Switch to Qt6/KF6 - Remove noop DOCS option math/kig: - Switch to Qt6/KF6 misc/artikulate: - Switch to Qt6/KF6 misc/kdeedu-data: - Update WWW and description misc/ktouch: - Switch to Qt6/KF6 multimedia/dragon: - Renew USE_KDE - Add dependency on ffmpeg and remove stale pkg-message multimedia/kamoso: - Switch to Qt6/KF6 net-im/neochat: - Add now mandatory dependency on devel/kunifiedpush - Add missing Qt dependencies x11-clocks/kteatime: - Renew USE_KDE PR: 287804 [1] (cherry picked from commit 76982d517f2a15b387e49943e2390177e4139344) Mk/Uses/kde.mk | 4 +- accessibility/kmag/distinfo | 6 +- accessibility/kmousetool/distinfo | 6 +- accessibility/kmouth/distinfo | 6 +- archivers/ark/distinfo | 6 +- archivers/ark/pkg-plist | 2 - astro/kosmindoormap/distinfo | 6 +- astro/kosmindoormap/pkg-plist | 2 + astro/marble/distinfo | 6 +- astro/marble/pkg-plist | 1 + audio/audiocd-kio/distinfo | 6 +- audio/elisa/Makefile | 1 - audio/elisa/distinfo | 6 +- audio/juk/distinfo | 6 +- audio/kmix/distinfo | 6 +- audio/kwave/distinfo | 6 +- audio/libkcddb/distinfo | 6 +- audio/libkcompactdisc/distinfo | 6 +- databases/akonadi/Makefile | 2 + databases/akonadi/distinfo | 8 +- databases/akonadi/pkg-plist | 21 ++++ deskutils/akonadi-calendar-tools/distinfo | 6 +- deskutils/akonadi-calendar-tools/pkg-plist | 1 + deskutils/akonadi-import-wizard/distinfo | 6 +- deskutils/akonadiconsole/distinfo | 6 +- deskutils/akonadiconsole/pkg-plist | 1 + deskutils/akregator/distinfo | 6 +- deskutils/grantlee-editor/distinfo | 6 +- deskutils/grantleetheme/distinfo | 6 +- deskutils/itinerary/distinfo | 6 +- deskutils/kaddressbook/distinfo | 6 +- deskutils/kalarm/distinfo | 6 +- deskutils/kcharselect/distinfo | 6 +- deskutils/kdeconnect-kde/distinfo | 6 +- deskutils/kdeconnect-kde/pkg-plist | 127 ++------------------ deskutils/kdepim-addons/distinfo | 6 +- deskutils/kdepim-addons/pkg-plist | 30 +++++ deskutils/kdepim-runtime/distinfo | 6 +- deskutils/kdepim-runtime/pkg-plist | 74 +++++++++++- deskutils/keditbookmarks/distinfo | 6 +- deskutils/kfind/distinfo | 6 +- deskutils/kmail-account-wizard/distinfo | 6 +- deskutils/kmail/distinfo | 6 +- deskutils/kongress/distinfo | 6 +- deskutils/kontact/distinfo | 6 +- deskutils/korganizer/distinfo | 6 +- deskutils/korganizer/pkg-plist | 1 - deskutils/kruler/distinfo | 6 +- deskutils/kweather/distinfo | 6 +- deskutils/kweathercore/distinfo | 6 +- deskutils/libkdepim/distinfo | 6 +- deskutils/mbox-importer/distinfo | 6 +- deskutils/merkuro/distinfo | 6 +- deskutils/merkuro/pkg-plist | 11 -- deskutils/pim-data-exporter/distinfo | 6 +- deskutils/pim-sieve-editor/distinfo | 6 +- deskutils/zanshin/distinfo | 6 +- devel/cervisia/Makefile | 3 +- devel/dolphin-plugins/distinfo | 6 +- devel/dolphin-plugins/pkg-plist | 3 +- devel/kapptemplate/distinfo | 6 +- devel/kcachegrind/distinfo | 6 +- devel/kde-dev-scripts/distinfo | 6 +- devel/kde-dev-utils/distinfo | 6 +- devel/kdesdk-kio/distinfo | 6 +- devel/kdesdk-thumbnailers/distinfo | 6 +- devel/kdesdk-thumbnailers/pkg-plist | 1 + devel/kdev-php/distinfo | 6 +- devel/kdev-python/distinfo | 6 +- devel/kdevelop/distinfo | 6 +- devel/kdevelop/kdevelop.mk | 2 +- devel/kdevelop/pkg-plist | 18 ++- devel/kio-extras/Makefile | 1 - devel/kio-extras/distinfo | 6 +- devel/kirigami-gallery/distinfo | 6 +- devel/kopeninghours/distinfo | 6 +- devel/kpublictransport/Makefile | 3 +- devel/kpublictransport/distinfo | 6 +- devel/kpublictransport/pkg-plist | 15 +++ devel/kunifiedpush/distinfo | 6 +- devel/kunifiedpush/pkg-plist | 3 + devel/lokalize/distinfo | 6 +- devel/lokalize/pkg-plist | 7 -- devel/massif-visualizer/distinfo | 6 +- devel/poxml/distinfo | 6 +- devel/umbrello/distinfo | 6 +- devel/umbrello/pkg-plist | 1 + editors/calligra/distinfo | 6 +- editors/calligra/pkg-plist | 2 + editors/ghostwriter/distinfo | 6 +- editors/ghostwriter/pkg-plist | 1 + editors/kate/distinfo | 6 +- editors/kate/pkg-plist | 26 +++++ games/blinken/distinfo | 6 +- games/bomber/distinfo | 6 +- games/bovo/distinfo | 6 +- games/granatier/distinfo | 6 +- games/kajongg/distinfo | 6 +- games/kanagram/distinfo | 6 +- games/kapman/distinfo | 6 +- games/katomic/distinfo | 6 +- games/kblackbox/distinfo | 6 +- games/kblocks/distinfo | 6 +- games/kbounce/distinfo | 6 +- games/kbreakout/distinfo | 6 +- games/kdiamond/distinfo | 6 +- games/kfourinline/distinfo | 6 +- games/kgoldrunner/distinfo | 6 +- games/khangman/distinfo | 6 +- games/khangman/pkg-plist | 1 + games/kigo/distinfo | 6 +- games/killbots/distinfo | 6 +- games/kiriki/distinfo | 6 +- games/kjumpingcube/distinfo | 6 +- games/klickety/distinfo | 6 +- games/klines/distinfo | 6 +- games/kmahjongg/distinfo | 6 +- games/kmines/distinfo | 6 +- games/knavalbattle/distinfo | 6 +- games/knetwalk/distinfo | 6 +- games/knights/distinfo | 6 +- games/kolf/distinfo | 6 +- games/kollision/distinfo | 6 +- games/konquest/distinfo | 6 +- games/kpat/distinfo | 6 +- games/kreversi/distinfo | 6 +- games/kshisen/distinfo | 6 +- games/ksirk/distinfo | 6 +- games/ksnakeduel/distinfo | 6 +- games/kspaceduel/distinfo | 6 +- games/ksquares/distinfo | 6 +- games/ksudoku/distinfo | 6 +- games/ktuberling/distinfo | 6 +- games/kubrick/distinfo | 6 +- games/libkdegames/distinfo | 6 +- games/libkmahjongg/distinfo | 6 +- games/lskat/distinfo | 6 +- games/palapeli/distinfo | 6 +- games/picmi/distinfo | 6 +- games/skladnik/distinfo | 6 +- graphics/colord-kde/distinfo | 6 +- graphics/gwenview/distinfo | 6 +- graphics/kamera/distinfo | 6 +- graphics/kcolorchooser/distinfo | 6 +- graphics/kdegraphics-mobipocket/distinfo | 6 +- graphics/kdegraphics-mobipocket/pkg-plist.qt5 | 6 +- graphics/kdegraphics-mobipocket/pkg-plist.qt6 | 6 +- graphics/kdegraphics-svgpart/distinfo | 6 +- graphics/kdegraphics-thumbnailers/distinfo | 6 +- graphics/kgraphviewer/distinfo | 6 +- graphics/kgraphviewer/pkg-plist | 1 + graphics/kimagemapeditor/distinfo | 6 +- graphics/kolourpaint/distinfo | 6 +- graphics/kolourpaint/pkg-plist | 5 + graphics/kontrast/Makefile | 1 - graphics/kontrast/distinfo | 6 +- graphics/kqtquickcharts/Makefile | 7 +- graphics/kqtquickcharts/distinfo | 6 +- graphics/kqtquickcharts/pkg-plist | 4 +- graphics/ksanecore/Makefile | 1 - graphics/ksanecore/distinfo | 6 +- graphics/libkdcraw/distinfo | 6 +- graphics/libkexiv2/distinfo | 6 +- graphics/libksane/distinfo | 6 +- graphics/okular/distinfo | 6 +- graphics/okular/pkg-plist | 4 +- graphics/skanlite/distinfo | 6 +- graphics/skanpage/distinfo | 6 +- irc/konversation/distinfo | 6 +- japanese/kiten/distinfo | 6 +- lang/kturtle/distinfo | 6 +- math/analitza/distinfo | 6 +- math/cantor/distinfo | 6 +- math/kalgebra/distinfo | 6 +- math/kalk/distinfo | 6 +- math/kalk/pkg-plist | 1 + math/kbruch/distinfo | 6 +- math/kcalc/distinfo | 6 +- math/kig/Makefile | 16 +-- math/kig/distinfo | 6 +- math/kig/pkg-plist | 2 +- math/kmplot/distinfo | 6 +- math/rocs/distinfo | 6 +- misc/artikulate/Makefile | 10 +- misc/artikulate/distinfo | 6 +- misc/artikulate/pkg-plist | 3 +- misc/kdeedu-data/Makefile | 2 +- misc/kdeedu-data/distinfo | 6 +- misc/kdeedu-data/pkg-descr | 2 +- misc/kgeography/distinfo | 6 +- misc/klettres/distinfo | 6 +- misc/ktouch/Makefile | 14 +-- misc/ktouch/distinfo | 6 +- misc/kwordquiz/distinfo | 6 +- misc/libkeduvocdocument/distinfo | 6 +- misc/minuet/distinfo | 6 +- misc/minuet/pkg-plist | 1 + misc/parley/distinfo | 6 +- multimedia/dragon/Makefile | 15 ++- multimedia/dragon/distinfo | 6 +- multimedia/dragon/pkg-message (gone) | 11 -- multimedia/dragon/pkg-plist | 38 ++---- multimedia/kamoso/Makefile | 16 +-- multimedia/kamoso/distinfo | 6 +- multimedia/kamoso/pkg-plist | 3 +- multimedia/kasts/distinfo | 6 +- multimedia/kdemultimedia-ffmpegthumbs/distinfo | 6 +- multimedia/kdenlive/distinfo | 6 +- multimedia/kdenlive/pkg-plist | 68 ++++++++++- multimedia/plasmatube/distinfo | 6 +- net-im/kaccounts-integration/Makefile | 1 - net-im/kaccounts-integration/distinfo | 6 +- net-im/kaccounts-providers/distinfo | 6 +- net-im/neochat/Makefile | 6 +- net-im/neochat/distinfo | 6 +- net-im/neochat/pkg-plist | 2 + net-im/tokodon/distinfo | 6 +- net-p2p/ktorrent/distinfo | 6 +- net-p2p/libktorrent/distinfo | 6 +- net/akonadi-calendar/distinfo | 6 +- net/akonadi-calendar/pkg-plist | 15 ++- net/akonadi-contacts/distinfo | 6 +- net/akonadi-contacts/pkg-plist | 2 + net/akonadi-mime/distinfo | 6 +- net/akonadi-search/distinfo | 6 +- net/alligator/distinfo | 6 +- net/calendarsupport/distinfo | 6 +- net/eventviews/distinfo | 6 +- net/incidenceeditor/distinfo | 6 +- net/kcalutils/distinfo | 6 +- net/kcalutils/pkg-plist | 1 + net/kdenetwork-filesharing/Makefile | 1 - net/kdenetwork-filesharing/distinfo | 6 +- net/kget/Makefile | 4 - net/kget/distinfo | 10 +- net/kidentitymanagement/distinfo | 6 +- net/kimap/distinfo | 6 +- net/kio-gdrive/distinfo | 6 +- net/kio-gdrive/pkg-plist | 1 + net/kio-zeroconf/distinfo | 6 +- net/kitinerary/distinfo | 6 +- net/kldap/distinfo | 6 +- net/kmailtransport/distinfo | 6 +- net/kmbox/distinfo | 6 +- net/kmime/distinfo | 6 +- net/kontactinterface/distinfo | 6 +- net/kpimtextedit/distinfo | 6 +- net/krdc/distinfo | 6 +- net/krdc/pkg-plist | 1 + net/krfb/distinfo | 6 +- net/ksmtp/distinfo | 6 +- net/ktnef/distinfo | 6 +- net/libgravatar/distinfo | 6 +- net/libkgapi/distinfo | 6 +- net/libksieve/distinfo | 6 +- net/mailcommon/distinfo | 6 +- net/mailimporter/distinfo | 6 +- net/messagelib/distinfo | 6 +- net/mimetreeparser/distinfo | 6 +- net/pimcommon/distinfo | 6 +- net/pimcommon/pkg-plist | 2 - science/kalzium/distinfo | 6 +- science/kalzium/pkg-plist | 20 ++++ science/step/distinfo | 6 +- science/step/pkg-plist | 43 +++++++ security/keysmith/distinfo | 6 +- security/kgpg/distinfo | 6 +- security/kleopatra/Makefile | 5 - security/kleopatra/distinfo | 12 +- security/kpkpass/distinfo | 6 +- security/kwalletmanager/distinfo | 6 +- security/libkleo/distinfo | 6 +- security/libkleo/pkg-plist | 7 +- sysutils/baloo-widgets/distinfo | 6 +- sysutils/filelight/distinfo | 6 +- sysutils/filelight/pkg-plist | 1 + sysutils/k3b/distinfo | 6 +- sysutils/kbackup/distinfo | 6 +- sysutils/kcron/distinfo | 6 +- sysutils/kcron/pkg-plist | 154 ++++++++++++------------- sysutils/kdebugsettings/distinfo | 6 +- sysutils/kdf/distinfo | 6 +- sysutils/kdialog/distinfo | 6 +- sysutils/khelpcenter/distinfo | 6 +- sysutils/kpmcore/distinfo | 6 +- sysutils/kpmcore/pkg-plist | 2 + sysutils/ksystemlog/distinfo | 6 +- sysutils/ksystemlog/pkg-plist | 1 + sysutils/signon-kwallet-extension/distinfo | 6 +- sysutils/sweeper/distinfo | 6 +- textproc/arianna/distinfo | 6 +- textproc/kompare/distinfo | 6 +- textproc/libkomparediff2/distinfo | 6 +- textproc/markdownpart/distinfo | 6 +- textproc/markdownpart/pkg-plist | 1 + www/falkon/distinfo | 6 +- www/falkon/pkg-plist | 2 +- x11-clocks/kteatime/Makefile | 6 +- x11-clocks/kteatime/distinfo | 6 +- x11-clocks/ktimer/distinfo | 6 +- x11-fm/dolphin/distinfo | 6 +- x11-fm/dolphin/pkg-plist | 5 +- x11-fm/konqueror/distinfo | 6 +- x11-fm/konqueror/pkg-plist | 2 + x11/konsole/distinfo | 6 +- x11/konsole/pkg-plist | 4 - x11/yakuake/distinfo | 6 +- 307 files changed, 1220 insertions(+), 1057 deletions(-)