git: b12e696e15a4 - main - x11-toolkits/kirigami-addons: Suffix the port with -qt5 and rename the -devel one to -qt6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Jan 2025 04:08:24 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b12e696e15a48eb706dd7bfc7c50bb9ba69014eb
commit b12e696e15a48eb706dd7bfc7c50bb9ba69014eb
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2025-01-16 03:58:10 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-01-16 04:07:58 +0000
x11-toolkits/kirigami-addons: Suffix the port with -qt5 and rename the -devel one to -qt6
---
MOVED | 1 +
Mk/Uses/kde.mk | 4 +---
deskutils/itinerary/Makefile | 4 ++--
deskutils/kdeconnect-kde/Makefile | 4 ++--
deskutils/merkuro/Makefile | 4 ++--
misc/kwordquiz/Makefile | 4 ++--
multimedia/kasts/Makefile | 4 ++--
net-im/neochat/Makefile | 4 ++--
net-im/tokodon/Makefile | 4 ++--
net/alligator/Makefile | 4 ++--
textproc/arianna/Makefile | 4 ++--
x11-toolkits/Makefile | 4 ++--
x11-toolkits/{kirigami-addons => kirigami-addons-qt5}/Makefile | 1 +
x11-toolkits/{kirigami-addons => kirigami-addons-qt5}/distinfo | 0
x11-toolkits/{kirigami-addons-devel => kirigami-addons-qt5}/pkg-descr | 0
x11-toolkits/{kirigami-addons => kirigami-addons-qt5}/pkg-plist | 0
x11-toolkits/{kirigami-addons-devel => kirigami-addons-qt6}/Makefile | 2 +-
x11-toolkits/{kirigami-addons-devel => kirigami-addons-qt6}/distinfo | 0
x11-toolkits/{kirigami-addons => kirigami-addons-qt6}/pkg-descr | 0
x11-toolkits/{kirigami-addons-devel => kirigami-addons-qt6}/pkg-plist | 0
20 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/MOVED b/MOVED
index 3a890769f4a4..a4c56d163250 100644
--- a/MOVED
+++ b/MOVED
@@ -4020,3 +4020,4 @@ x11-themes/kf5-breeze-icons|x11-themes/kf6-breeze-icons|2025-01-15|Replaced by t
x11-themes/kf5-oxygen-icons5|x11-themes/oxygen-icons|2025-01-15|Rename in accordance with the upstream
devel/raknet||2025-01-15|Has expired: Unmaintained upstream, only builds with EOL toolchain
devel/pas2dox||2025-01-15|Has expired: doesn't compile with moddern clang and gcc, upstream last updated it in 2003
+x11-toolkits/kirigami-addons|x11-toolkits/kirigami-addons-qt5|2025-01-16|Moved to have symmetric names with Qt6
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 8c79f5bde0a0..8025e65b38c7 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -798,9 +798,7 @@ kde-xdg-desktop-portal-kde_PATH= ${KDE_PREFIX}/lib/libexec/xdg-desktop-portal-kd
kde-plasma5support_PORT= devel/plasma${_KDE_VERSION}-plasma5support
kde-plasma5support_LIB= libPlasma5Support.so
-kde-kirigami-addons_PORT5= x11-toolkits/kirigami-addons
-kde-kirigami-addons_PORT6= x11-toolkits/kirigami-addons-devel
-kde-kirigami-addons_PORT= ${kde-kirigami-addons_PORT${_KDE_VERSION}}
+kde-kirigami-addons_PORT= x11-toolkits/kirigami-addons-qt${_KDE_VERSION}
kde-kirigami-addons_PATH= ${QT_QMLDIR}/org/kde/kirigamiaddons/components/libcomponentsplugin.so
kde-globalacceld_PORT= x11/plasma${_KDE_VERSION}-kglobalacceld
diff --git a/deskutils/itinerary/Makefile b/deskutils/itinerary/Makefile
index 2ee9b148af94..163005c5dd66 100644
--- a/deskutils/itinerary/Makefile
+++ b/deskutils/itinerary/Makefile
@@ -6,8 +6,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Digital travel assistant for KDE
WWW= https://apps.kde.org/en/itinerary
-BUILD_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
-RUN_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
+RUN_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
qt:5 tar:xz xorg
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index 3631a834b8a5..f4cc03c1f4b9 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -15,11 +15,11 @@ LIB_DEPENDS= libfakekey.so:x11/libfakekey \
BUILD_DEPENDS= kpeoplevcard>0:net/kpeoplevcard \
${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
wayland-protocols>=0:graphics/wayland-protocols \
- kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+ kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
RUN_DEPENDS= sshpass:security/sshpass \
sshfs:filesystems/sshfs \
kpeoplevcard>0:net/kpeoplevcard \
- kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+ kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
pkgconfig qca qt:5 tar:xz xorg
diff --git a/deskutils/merkuro/Makefile b/deskutils/merkuro/Makefile
index 39236c6ec971..997e886e001f 100644
--- a/deskutils/merkuro/Makefile
+++ b/deskutils/merkuro/Makefile
@@ -9,8 +9,8 @@ WWW= https://invent.kde.org/pim/kalendar
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt
-BUILD_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
-RUN_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
+RUN_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
USES= cmake compiler:c++17-lang desktop-file-utils grantlee:5 kde:5 \
qt:5 tar:xz xorg
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index afdba317de36..dc056f9e6996 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -6,8 +6,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Flash card trainer for KDE Applications
WWW= https://www.kde.org/applications/education/kwordquiz
-BUILD_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
-RUN_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
+RUN_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
USES= cmake compiler:c++11-lang desktop-file-utils gettext \
kde:5 qt:5 tar:xz xorg
diff --git a/multimedia/kasts/Makefile b/multimedia/kasts/Makefile
index 193004c758c7..2db91e8aa97c 100644
--- a/multimedia/kasts/Makefile
+++ b/multimedia/kasts/Makefile
@@ -9,11 +9,11 @@ WWW= https://apps.kde.org/kasts/
LICENSE= GPLv2+
-BUILD_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libtag.so:audio/taglib \
libvlc.so:multimedia/vlc
-RUN_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+RUN_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
USES= cmake desktop-file-utils gettext-runtime gnome gstreamer kde:5 \
pkgconfig qt:5 tar:xz xorg
diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
index 1156ccd80bb6..4660163b2c11 100644
--- a/net-im/neochat/Makefile
+++ b/net-im/neochat/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \
libolm.so:security/olm
BUILD_DEPENDS= libquotient-qt5>=0.8.1.2:net-im/libquotient@qt5 \
kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
- kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+ kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
# Quotient is a static lib, doesn't need to be in RUN_DEPENDS
RUN_DEPENDS= kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
- kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+ kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
USES= cmake compiler:c++20-lang desktop-file-utils kde:5 \
pkgconfig qt:5 tar:xz xorg
diff --git a/net-im/tokodon/Makefile b/net-im/tokodon/Makefile
index d42542f796db..0ce598e277cf 100644
--- a/net-im/tokodon/Makefile
+++ b/net-im/tokodon/Makefile
@@ -9,10 +9,10 @@ WWW= https://apps.kde.org/tokodon/
LICENSE= GPLv3
-BUILD_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
libmpv.so:multimedia/mpv
-RUN_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+RUN_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
USES= cmake desktop-file-utils gettext kde:5 pkgconfig qt:5 tar:xz xorg
USE_KDE= auth codecs completion config configwidgets coreaddons \
diff --git a/net/alligator/Makefile b/net/alligator/Makefile
index abdf42df26ba..1ff7e7ad07ab 100644
--- a/net/alligator/Makefile
+++ b/net/alligator/Makefile
@@ -8,8 +8,8 @@ WWW= https://apps.kde.org/alligator/
LICENSE= GPLv2
-BUILD_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
-RUN_DEPENDS= kirigami-addons>=0:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
+RUN_DEPENDS= kirigami-addons-qt5>=0:x11-toolkits/kirigami-addons-qt5
USES= cmake desktop-file-utils kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm:build i18n syndication
diff --git a/textproc/arianna/Makefile b/textproc/arianna/Makefile
index dc02dbc8ee42..28c8f082d2b3 100644
--- a/textproc/arianna/Makefile
+++ b/textproc/arianna/Makefile
@@ -8,8 +8,8 @@ WWW= https://apps.kde.org/arianna/
LICENSE= GPLv3
-BUILD_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
-RUN_DEPENDS= kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
+BUILD_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
+RUN_DEPENDS= kirigami-addons-qt5>=0.6.1:x11-toolkits/kirigami-addons-qt5
USES= cmake desktop-file-utils gettext kde:5 qt:5 tar:xz xorg
USE_KDE= archive baloo config coreaddons dbusaddons filemetadata \
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 5811830b328b..8934c3ce4e77 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -76,8 +76,8 @@
SUBDIR += kf6-ktextwidgets
SUBDIR += kf6-kwidgetsaddons
SUBDIR += kf6-kxmlgui
- SUBDIR += kirigami-addons
- SUBDIR += kirigami-addons-devel
+ SUBDIR += kirigami-addons-qt5
+ SUBDIR += kirigami-addons-qt6
SUBDIR += kproperty
SUBDIR += lesstif
SUBDIR += libXaw
diff --git a/x11-toolkits/kirigami-addons/Makefile b/x11-toolkits/kirigami-addons-qt5/Makefile
similarity index 95%
rename from x11-toolkits/kirigami-addons/Makefile
rename to x11-toolkits/kirigami-addons-qt5/Makefile
index da79764c9259..2611fcabc8c6 100644
--- a/x11-toolkits/kirigami-addons/Makefile
+++ b/x11-toolkits/kirigami-addons-qt5/Makefile
@@ -3,6 +3,7 @@ DISTVERSION= 0.11.0
CATEGORIES= x11-toolkits kde
MASTER_SITES= KDE/stable/${PORTNAME}/
DIST_SUBDIR= KDE
+PKGNAMESUFFIX= -qt5
MAINTAINER= kde@FreeBSD.org
COMMENT= Component library for KDE Kirigami
diff --git a/x11-toolkits/kirigami-addons/distinfo b/x11-toolkits/kirigami-addons-qt5/distinfo
similarity index 100%
rename from x11-toolkits/kirigami-addons/distinfo
rename to x11-toolkits/kirigami-addons-qt5/distinfo
diff --git a/x11-toolkits/kirigami-addons-devel/pkg-descr b/x11-toolkits/kirigami-addons-qt5/pkg-descr
similarity index 100%
rename from x11-toolkits/kirigami-addons-devel/pkg-descr
rename to x11-toolkits/kirigami-addons-qt5/pkg-descr
diff --git a/x11-toolkits/kirigami-addons/pkg-plist b/x11-toolkits/kirigami-addons-qt5/pkg-plist
similarity index 100%
rename from x11-toolkits/kirigami-addons/pkg-plist
rename to x11-toolkits/kirigami-addons-qt5/pkg-plist
diff --git a/x11-toolkits/kirigami-addons-devel/Makefile b/x11-toolkits/kirigami-addons-qt6/Makefile
similarity index 95%
rename from x11-toolkits/kirigami-addons-devel/Makefile
rename to x11-toolkits/kirigami-addons-qt6/Makefile
index b0d1599b36a1..d3145fee6600 100644
--- a/x11-toolkits/kirigami-addons-devel/Makefile
+++ b/x11-toolkits/kirigami-addons-qt6/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 1.3.0
CATEGORIES= x11-toolkits kde
MASTER_SITES= KDE/stable/${PORTNAME}/
DIST_SUBDIR= KDE
-PKGNAMESUFFIX= -devel
+PKGNAMESUFFIX= -qt6
MAINTAINER= kde@FreeBSD.org
COMMENT= Component library for KDE Kirigami
diff --git a/x11-toolkits/kirigami-addons-devel/distinfo b/x11-toolkits/kirigami-addons-qt6/distinfo
similarity index 100%
rename from x11-toolkits/kirigami-addons-devel/distinfo
rename to x11-toolkits/kirigami-addons-qt6/distinfo
diff --git a/x11-toolkits/kirigami-addons/pkg-descr b/x11-toolkits/kirigami-addons-qt6/pkg-descr
similarity index 100%
rename from x11-toolkits/kirigami-addons/pkg-descr
rename to x11-toolkits/kirigami-addons-qt6/pkg-descr
diff --git a/x11-toolkits/kirigami-addons-devel/pkg-plist b/x11-toolkits/kirigami-addons-qt6/pkg-plist
similarity index 100%
rename from x11-toolkits/kirigami-addons-devel/pkg-plist
rename to x11-toolkits/kirigami-addons-qt6/pkg-plist