kirigami2: update to 5.93.0

5.81.0
Add a humanMoment unit to Kirigami.Units
Make the luma conversion of a color api accessible
Consider Ubuntu Touch to be mobile
[controls/Avatar]: Get rid of 'both point size and pixel size' set warning
Remove link to deprecated ApplicationHeader
Fix potential crash in SizeGroup

5.82.0
SearchField: Stop timer if the user accepted manually
Static builds: Let qmlimportscanner find kirigami
[OverlaySheet] Fix click to close
Embrace the usage of categorised debugging methods
[ListSectionHeader] Unset deprecated supportsMouseEvents: property
[ListSectionHeader] use named Kirigami import
controls/SizeGroup: shield against nullptr qmlContext
Fix richTextLabel for the initial value of CJK style label
Switch some arbitrary numbers to the humanMoment unit
ColumnView: do not enable animation in setCurrentIndex
Revert "disable animations during replace"

5.83.0
Update template app
[ActionTextField] Add more spacing between actions and text
Improve look of card by making border a bit more subble
Adapt BasicListItemTest.qml to new API
Fix rendering of small size borders of ShadowedTexture
Introduce Kirigami.Heading.type
Disconnect before destroying items

5.84.0
Allow static link without sources
Bundle plugins on Android
Only emit sync signal if we have finished construction
Port CardsListView to use reuseItems instead of the DelegateRecycler
Expose Labels of BasicListItem for greater end-user control
[OverlaySheet] Add side margins when trying to span window width
Respect an Action's visible property in GlobalDrawer even when collapsed

5.85.0
[InlineMessage] Correct spacing between close button and action buttons
[ScrollView] Don't scroll with arrow keys if the view isn't scrollable
SearchField: Disable predictive text
Introduce hasPlatformMenuBar
Allow to add additional content to the about page
Ensure that icon sizes are consistent for mobile before 5.23
Add method to push page as a new window on the desktop
Use iconSizes for floating action button
[apptemplate] Increase Qt and KF5 min versions
Pagepool item and url accessors

5.86.0
Add "Report Bug" action to the about page
Support horizontal scrolling in ScrollablePage
Use text as tooltip only for icon-only buttons
Fix Page.rightAction being labeled as leftAction in API docs
[ActionTextField] Use small icon sizing for actions
Add Attached property used as a hint for application to enabled spellchecking
Handle KirigamiPluginFactor::createPlatformTheme returning nullptr
Use rate limiting to display warnings for deprecated Units properties
Remove iconScaleFactor and related code from Units
Only load the first style plugin that we find
Rewrite Units in c++
Load theme definition when Kirigami is built with bundled resources

5.87.0
PageRow: Do not async load the global header
NavigationTabButton: Fix hover effect staying even after touch release
Fix BreadcrumbControl on mobile when using layers
cmake: Remove intermediate target for kirigamiplugin post-build steps
Add NavigationToolBar component
[SwipeListItem] Fix view property
Fix breadcrumb header title on secondary layers in mobile mode
[FormLayout] Fix in-group spacing in narrow mode
Fix page header being shown even when it's specified not to
Set activeFocusOnTab to false for ListSectionHeader
Support enter/return and up/down keys in Global drawer for navigation
ColumnView: Simplify Units property access
Remove unwanted "/" prefix from iconId

5.88.0
Fix missing titlebar on ApplicationWindow modals in Windows
NavigationTabButton: Set minimum width and wrap text
Icon: Use icon-png as the default placeholder instead of icon-x-icon
Remove the no longer existing Units.qml file from the qrc files
Add missing AboutItem to to the qrc files
[GlobalDrawerActionItem] Dim when disabled
Pass properties when creating a dialog for pushDialogLayers
Fix context drawer being inaccessible on secondary layers in mobile mode
[PageRow] Fix variable shadowing
[ActionTextField] Doc: Reword nullable field to an empty list
[Breadcrumb] Fix breadcrumb position on content change
NavigationTabBar: Support actions that have mnemonics
Fix issues with setting components on tablet

5.89.0
PageRowGlobalToolBarUI: use open-menu-symbolic
Heading: Deprecate headerPointSize(int level) method
Let escape key close pushed dialog layers
AboutItem: fix the view for narrow dialogs
AboutItem: Report its implicit size so it can scroll
Increase passive notification opacity
Bold labels for narrow FormLayout
Add Dialog Components
add columns on empty width
DefaultCardBackground improvements
Expose internal icon source in the Avatar component
Preconfigure kconfig and kaboutdata on template

5.90.0
Fix navigation buttons on layers
FormLayout: Switch an instance of let to var
ShadowedRectangle: Add renderType option
AboutPage: show spinner feedback while loading remote icon
AboutPage: Only mess with the URL when we are dealing with KDE products
AboutItem: don't multiply sizes by devicePixelRatio
AboutItem: Fix incorrect usage of height: and width: inside layouts
OverlaySheet: Modify anchors on tall headers imperatively
globaltoolbar: Use strict === equality in JavaScript
PageRowGlobalToolBarUI: don't animate opacity, take two

5.91.0
OverlaySheet: Accommodate the left and right padding
OverlaySheet: Initialise the view with sound values
FormLayout: Replace heuristic approach with an instanceof check
Fix install plugin in kf<version>
libkirigami: Port to target_sources and other target-specific properties
Disable BUILD_EXAMPLES/TESTING when BUILD_SHARED_LIBS is off
Add Chip Component
Add android related files to template
Add BasicListItem.iconSelected property and use it in CheckableListItem
KF5Kirigami2: install headers to path prefix matching C++ namespace Kirigami
Introduce "InputMethod" singleton and supporting code to detect virtual keyboard
Deprecate TabBar toolbar style
change color when card is highlighted
Kirigami supports Windows, ensure we have our dependencies there too

5.92.0
Dialog: Accommodate vertical scrollbars widths properly
Dialog: Fix implicitWidth binding loop when absolute maximum size used
consider visibility when calculating page content positions
update commandlink url to a working one
FormLayout: make section headings slightly smaller but bolder
NavigationTabBar: check checkedButton state before updating currentIndex
Drawer should not eat mouse events at edges
Add a CI job to build and test the static build
Use extra spacing to distinguish narrow-mode form labels and UI controls
Revert "Bold labels for narrow FormLayout"
Units: add mediumSpacing property
Ensure OverlayDrawer handles is keyboard navigable
CheckableListItem: Reset list item's checked property when checking box
CheckableListItem: Only conditionally trigger action when checked
PageRow: properly handle back button
WheelHandler: Round contentX/contentY positions
Allow compiling against Qt configured with -no-opengl
Fix install path of settings and swipe navigator components

5.93.0
InlineMessage: Do not layout for actions at bottom when there are none
only change height if visible
Units: Delete QML FontMetrics object when Units is destructed
ListItemDragHandle: Emit moveRequest when cursor enters a new index
BasicListItem: tighten up spacing for text+subtitle labels
ListSectionHeader: vertically align default text item
PlaceholderMessage: compare string length rather than content
Render Page's default heading as PlainText
Page: Don't load global toolbar async so that the header looks less stuttery
Fix warning on the org.kde.desktop Theme
controls/SwipeListItem: handle RtL properly

4 files changed, 37 insertions, 28 deletions

diff --git a/x11/kirigami2/Makefile b/x11/kirigami2/Makefile
index dfa9b7b8c7b..14ec354f195 100644
--- a/x11/kirigami2/Makefile
+++ b/x11/kirigami2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2022/04/18 19:10:14 adam Exp $
+# $NetBSD: Makefile,v 1.34 2022/04/25 08:59:16 markd Exp $
 
 DISTNAME=	kirigami2-${KF5VER}
-PKGREVISION=	6
 CATEGORIES=	x11
 
 HOMEPAGE=	https://community.kde.org/Frameworks
diff --git a/x11/kirigami2/PLIST b/x11/kirigami2/PLIST
index 6215458414d..8ac6ac0587a 100644
--- a/x11/kirigami2/PLIST
+++ b/x11/kirigami2/PLIST
@@ -1,11 +1,23 @@
-@comment $NetBSD: PLIST,v 1.9 2021/03/30 10:58:30 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2022/04/25 08:59:16 markd Exp $
+include/KF5/Kirigami2/Kirigami/KirigamiPluginFactory
+include/KF5/Kirigami2/Kirigami/PlatformTheme
+include/KF5/Kirigami2/Kirigami/TabletModeWatcher
+include/KF5/Kirigami2/Kirigami/Units
+include/KF5/Kirigami2/Kirigami/VirtualKeyboardWatcher
 include/KF5/Kirigami2/KirigamiPluginFactory
 include/KF5/Kirigami2/PlatformTheme
 include/KF5/Kirigami2/TabletModeWatcher
-include/KF5/Kirigami2/kirigami2_export.h
+include/KF5/Kirigami2/Units
+include/KF5/Kirigami2/kirigami/kirigami2_export.h
+include/KF5/Kirigami2/kirigami/kirigamipluginfactory.h
+include/KF5/Kirigami2/kirigami/platformtheme.h
+include/KF5/Kirigami2/kirigami/tabletmodewatcher.h
+include/KF5/Kirigami2/kirigami/units.h
+include/KF5/Kirigami2/kirigami/virtualkeyboardwatcher.h
 include/KF5/Kirigami2/kirigamipluginfactory.h
 include/KF5/Kirigami2/platformtheme.h
 include/KF5/Kirigami2/tabletmodewatcher.h
+include/KF5/Kirigami2/units.h
 lib/cmake/KF5Kirigami2/KF5Kirigami2Config.cmake
 lib/cmake/KF5Kirigami2/KF5Kirigami2ConfigVersion.cmake
 lib/cmake/KF5Kirigami2/KF5Kirigami2Macros.cmake
@@ -15,11 +27,13 @@ lib/libKF5Kirigami2.so
 lib/libKF5Kirigami2.so.5
 lib/libKF5Kirigami2.so.${PKGVERSION}
 qt5/mkspecs/modules/qt_Kirigami2.pri
+qt5/qml/org/kde/kirigami.2/AboutItem.qml
 qt5/qml/org/kde/kirigami.2/AboutPage.qml
 qt5/qml/org/kde/kirigami.2/AbstractApplicationHeader.qml
 qt5/qml/org/kde/kirigami.2/AbstractApplicationItem.qml
 qt5/qml/org/kde/kirigami.2/AbstractApplicationWindow.qml
 qt5/qml/org/kde/kirigami.2/AbstractCard.qml
+qt5/qml/org/kde/kirigami.2/AbstractChip.qml
 qt5/qml/org/kde/kirigami.2/AbstractItemViewHeader.qml
 qt5/qml/org/kde/kirigami.2/AbstractListItem.qml
 qt5/qml/org/kde/kirigami.2/Action.qml
@@ -35,7 +49,9 @@ qt5/qml/org/kde/kirigami.2/CardsGridView.qml
 qt5/qml/org/kde/kirigami.2/CardsLayout.qml
 qt5/qml/org/kde/kirigami.2/CardsListView.qml
 qt5/qml/org/kde/kirigami.2/CheckableListItem.qml
+qt5/qml/org/kde/kirigami.2/Chip.qml
 qt5/qml/org/kde/kirigami.2/ContextDrawer.qml
+qt5/qml/org/kde/kirigami.2/Dialog.qml
 qt5/qml/org/kde/kirigami.2/FlexColumn.qml
 qt5/qml/org/kde/kirigami.2/FormLayout.qml
 qt5/qml/org/kde/kirigami.2/GlobalDrawer.qml
@@ -47,6 +63,9 @@ qt5/qml/org/kde/kirigami.2/Label.qml
 qt5/qml/org/kde/kirigami.2/LinkButton.qml
 qt5/qml/org/kde/kirigami.2/ListItemDragHandle.qml
 qt5/qml/org/kde/kirigami.2/ListSectionHeader.qml
+qt5/qml/org/kde/kirigami.2/MenuDialog.qml
+qt5/qml/org/kde/kirigami.2/NavigationTabBar.qml
+qt5/qml/org/kde/kirigami.2/NavigationTabButton.qml
 qt5/qml/org/kde/kirigami.2/OverlayDrawer.qml
 qt5/qml/org/kde/kirigami.2/OverlaySheet.qml
 qt5/qml/org/kde/kirigami.2/Page.qml
@@ -54,6 +73,7 @@ qt5/qml/org/kde/kirigami.2/PagePoolAction.qml
 qt5/qml/org/kde/kirigami.2/PageRow.qml
 qt5/qml/org/kde/kirigami.2/PasswordField.qml
 qt5/qml/org/kde/kirigami.2/PlaceholderMessage.qml
+qt5/qml/org/kde/kirigami.2/PromptDialog.qml
 qt5/qml/org/kde/kirigami.2/RouterWindow.qml
 qt5/qml/org/kde/kirigami.2/ScrollablePage.qml
 qt5/qml/org/kde/kirigami.2/SearchField.qml
@@ -61,9 +81,8 @@ qt5/qml/org/kde/kirigami.2/Separator.qml
 qt5/qml/org/kde/kirigami.2/ShadowedImage.qml
 qt5/qml/org/kde/kirigami.2/SwipeListItem.qml
 qt5/qml/org/kde/kirigami.2/ToolBarApplicationHeader.qml
-qt5/qml/org/kde/kirigami.2/Units.qml
 qt5/qml/org/kde/kirigami.2/UrlButton.qml
-qt5/qml/org/kde/kirigami.2/libkirigamiplugin.so
+qt5/qml/org/kde/kirigami.2/libKirigamiPlugin.so
 qt5/qml/org/kde/kirigami.2/plugins.qmltypes
 qt5/qml/org/kde/kirigami.2/private/ActionButton.qml
 qt5/qml/org/kde/kirigami.2/private/ActionIconGroup.qml
@@ -71,10 +90,10 @@ qt5/qml/org/kde/kirigami.2/private/ActionMenuItem.qml
 qt5/qml/org/kde/kirigami.2/private/ActionsMenu.qml
 qt5/qml/org/kde/kirigami.2/private/BannerImage.qml
 qt5/qml/org/kde/kirigami.2/private/CardsGridViewPrivate.qml
-qt5/qml/org/kde/kirigami.2/private/CardsListViewPrivate.qml
 qt5/qml/org/kde/kirigami.2/private/ContextDrawerActionItem.qml
 qt5/qml/org/kde/kirigami.2/private/CornerShadow.qml
 qt5/qml/org/kde/kirigami.2/private/DefaultCardBackground.qml
+qt5/qml/org/kde/kirigami.2/private/DefaultChipBackground.qml
 qt5/qml/org/kde/kirigami.2/private/DefaultListItemBackground.qml
 qt5/qml/org/kde/kirigami.2/private/EdgeShadow.qml
 qt5/qml/org/kde/kirigami.2/private/GlobalDrawerActionItem.qml
@@ -90,6 +109,8 @@ qt5/qml/org/kde/kirigami.2/private/globaltoolbar/TabBarControl.qml
 qt5/qml/org/kde/kirigami.2/private/globaltoolbar/TitlesPageHeader.qml
 qt5/qml/org/kde/kirigami.2/private/globaltoolbar/ToolBarPageHeader.qml
 qt5/qml/org/kde/kirigami.2/qmldir
+qt5/qml/org/kde/kirigami.2/settingscomponents/CategorizedSettings.qml
+qt5/qml/org/kde/kirigami.2/settingscomponents/SettingAction.qml
 qt5/qml/org/kde/kirigami.2/styles/Material/AbstractListItem.qml
 qt5/qml/org/kde/kirigami.2/styles/Material/InlineMessage.qml
 qt5/qml/org/kde/kirigami.2/styles/Material/Label.qml
@@ -99,15 +120,18 @@ qt5/qml/org/kde/kirigami.2/styles/org.kde.desktop/AbstractApplicationHeader.qml
 qt5/qml/org/kde/kirigami.2/styles/org.kde.desktop/AbstractListItem.qml
 qt5/qml/org/kde/kirigami.2/styles/org.kde.desktop/SwipeListItem.qml
 qt5/qml/org/kde/kirigami.2/styles/org.kde.desktop/Theme.qml
-qt5/qml/org/kde/kirigami.2/styles/org.kde.desktop/Units.qml
+qt5/qml/org/kde/kirigami.2/swipenavigator/PageTab.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/PrivateSwipeHighlight.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/PrivateSwipeProgress.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/PrivateSwipeStack.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/PrivateSwipeTab.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/PrivateSwipeTabBar.qml
 qt5/qml/org/kde/kirigami.2/swipenavigator/SwipeNavigator.qml
+qt5/qml/org/kde/kirigami.2/swipenavigator/TabViewLayout.qml
+qt5/qml/org/kde/kirigami.2/swipenavigator/templates/PageTab.qml
 qt5/qml/org/kde/kirigami.2/templates/AbstractApplicationHeader.qml
 qt5/qml/org/kde/kirigami.2/templates/AbstractCard.qml
+qt5/qml/org/kde/kirigami.2/templates/AbstractChip.qml
 qt5/qml/org/kde/kirigami.2/templates/AbstractListItem.qml
 qt5/qml/org/kde/kirigami.2/templates/ApplicationHeader.qml
 qt5/qml/org/kde/kirigami.2/templates/InlineMessage.qml
@@ -142,6 +166,7 @@ share/locale/eu/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/fi/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/fr/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/gl/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/hi/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/hu/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/ia/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/id/LC_MESSAGES/libkirigami2plugin_qt.qm
@@ -165,6 +190,7 @@ share/locale/sr@ijekavian/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/sr@ijekavianlatin/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/sr@latin/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/sv/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/ta/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/tg/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/tr/LC_MESSAGES/libkirigami2plugin_qt.qm
 share/locale/uk/LC_MESSAGES/libkirigami2plugin_qt.qm
diff --git a/x11/kirigami2/distinfo b/x11/kirigami2/distinfo
index c7e597ec2c5..11911051874 100644
--- a/x11/kirigami2/distinfo
+++ b/x11/kirigami2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:34:03 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/04/25 08:59:16 markd Exp $
 
-BLAKE2s (kirigami2-5.80.0.tar.xz) = 383e1b8cd6522ef6a3d845e043fa33b7f7db02af6e14d3d438306e4f17f7a4c1
-SHA512 (kirigami2-5.80.0.tar.xz) = d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
-Size (kirigami2-5.80.0.tar.xz) = 310608 bytes
+BLAKE2s (kirigami2-5.93.0.tar.xz) = 38110b84247cc6a0369868cbad228680fdd62ce0846cf973ceb53fa981872233
+SHA512 (kirigami2-5.93.0.tar.xz) = 372d464a79dafa061e4c07528c4765445b89988bbbf345019a8f544c4012a0c64abf8a07d4b97b4d1874af6753cb357b4f11d958face1ce17b3de8e6daddded2
+Size (kirigami2-5.93.0.tar.xz) = 355100 bytes
 SHA1 (patch-src_icon.cpp) = 5d1e8ffe75903807f8404685cbee9c435be123bb
-SHA1 (patch-src_imagecolors.cpp) = 7eabf723dcac39f7befa9be585fb753868c42f7e
diff --git a/x11/kirigami2/patches/patch-src_imagecolors.cpp b/x11/kirigami2/patches/patch-src_imagecolors.cpp
deleted file mode 100644
index cb95c5d7f51..00000000000
--- a/x11/kirigami2/patches/patch-src_imagecolors.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_imagecolors.cpp,v 1.1 2021/10/21 15:16:26 jperkin Exp $
-
-Explicitly use std::pow.
-
---- src/imagecolors.cpp.orig	2021-03-06 16:26:33.000000000 +0000
-+++ src/imagecolors.cpp
-@@ -25,6 +25,8 @@
- 
- #include <cmath>
- 
-+using std::pow;
-+
- #define return_fallback(value) if (m_imageData.m_samples.size() == 0) {\
-     return value;\
- }