Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

kirigami2: Bump to 5.101.0

This commit is contained in:
Tee KOBAYASHI 2022-12-11 08:16:26 +09:00 committed by xtkoba
parent 0df93f7075
commit 57a527855b
3 changed files with 8 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11-packages/kirigami2/build.sh
View File

@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.kde.org/
TERMUX_PKG_DESCRIPTION="KDE Kirigami2 QtQuick components based on Qt Quick Controls 2"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="Simeon Huang <symeon@librehat.com>"
TERMUX_PKG_VERSION=5.100.0
TERMUX_PKG_VERSION=5.101.0
TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kirigami2-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=d6080af0c5cece525fcf261e3f71562f7f7a654599c602d530e99d99cc3501df
TERMUX_PKG_REVISION=1
TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtdeclarative, qt5-qtquickcontrols2, qt5-qtsvg"
TERMUX_PKG_SHA256=7608eeb528ee863441270cb5896628f8f592dcf09ad00d5bd76d5f7dc1578fbd
TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtdeclarative, qt5-qtgraphicaleffects, qt5-qtquickcontrols2, qt5-qtsvg"
TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules, qt5-qtbase-cross-tools, qt5-qttools-cross-tools"

10
x11-packages/kirigami2/without_accessibility.patch
View File

@ -41,12 +41,12 @@ diff -uNr kirigami2-5.100.0/src/controls/LinkButton.qml kirigami2-5.100.0.mod/sr
--- kirigami2-5.100.0/src/controls/LinkButton.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/LinkButton.qml 2022-12-03 12:57:48.000000000 +0800
@@ -38,9 +38,6 @@
*/
property alias mouseArea: area
activeFocusOnTab: true
- Accessible.role: Accessible.Button
- Accessible.name: text
- Accessible.onPressAction: control.clicked(null)
- Accessible.onPressAction: control.clicked({"button": Qt.LeftButton})
text: action ? action.text : ""
enabled: !action || action.enabled
@ -197,11 +197,11 @@ diff -uNr kirigami2-5.100.0/src/controls/templates/OverlayDrawer.qml kirigami2-5
--- kirigami2-5.100.0/src/controls/templates/OverlayDrawer.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/templates/OverlayDrawer.qml 2022-12-03 12:58:46.000000000 +0800
@@ -170,7 +170,6 @@
width: parent.height - Units.smallSpacing * 1.5
height: parent.height - Units.smallSpacing * 1.5
width: parent.height - Kirigami.Units.smallSpacing * 1.5
height: parent.height - Kirigami.Units.smallSpacing * 1.5
onClicked: root.drawerOpen = !root.drawerOpen;
- Accessible.name: root.drawerOpen ? root.handleOpenToolTip : root.handleClosedToolTip
visible: !Settings.tabletMode && !Settings.hasTransientTouchInput
visible: !Kirigami.SettingstabletMode && !Kirigami.SettingshasTransientTouchInput
}
diff -uNr kirigami2-5.100.0/src/controls/templates/SwipeListItem.qml kirigami2-5.100.0.mod/src/controls/templates/SwipeListItem.qml

244
x11-packages/kirigami2/without_qt_graphical_effects.patch
View File

@ -1,244 +0,0 @@
QtGraphicalEffects module is not available because it depends on OpenGL.
This patch removes all usage of QtGraphicalEffects (shadows and gradients).
diff -uNr kirigami2-5.100.0/CMakeLists.txt kirigami2-5.100.0.mod/CMakeLists.txt
--- kirigami2-5.100.0/CMakeLists.txt 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/CMakeLists.txt 2022-12-03 14:03:52.000000000 +0800
@@ -123,7 +123,6 @@
add_definitions(-DUBUNTU_TOUCH)
endif()
-ecm_find_qmlmodule(QtGraphicalEffects 1.0)
ecm_set_disabled_deprecation_versions(
QT 5.15.2
diff -uNr kirigami2-5.100.0/src/CMakeLists.txt kirigami2-5.100.0.mod/src/CMakeLists.txt
--- kirigami2-5.100.0/src/CMakeLists.txt 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/CMakeLists.txt 2022-12-03 14:03:58.000000000 +0800
@@ -5,7 +5,6 @@
ecm_add_qml_module_dependencies(KirigamiPlugin DEPENDS
"QtQuick.Controls 2.15"
- "QtGraphicalEffects 1.0"
)
ecm_create_qm_loader(kirigami_QM_LOADER libkirigami2plugin_qt)
diff -uNr kirigami2-5.100.0/src/controls/Avatar.qml kirigami2-5.100.0.mod/src/controls/Avatar.qml
--- kirigami2-5.100.0/src/controls/Avatar.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/Avatar.qml 2022-12-03 14:04:06.000000000 +0800
@@ -8,7 +8,6 @@
import QtQuick.Window 2.15
import org.kde.kirigami 2.14 as Kirigami
import QtQuick.Controls 2.13 as QQC2
-import QtGraphicalEffects 1.0
import org.kde.kirigami.private 2.14
import "templates/private" as P
diff -uNr kirigami2-5.100.0/src/controls/Dialog.qml kirigami2-5.100.0.mod/src/controls/Dialog.qml
--- kirigami2-5.100.0/src/controls/Dialog.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/Dialog.qml 2022-12-03 14:04:10.000000000 +0800
@@ -10,7 +10,6 @@
import QtQuick.Templates 2.15 as T
import QtQuick.Controls 2.15 as Controls
import org.kde.kirigami 2.12 as Kirigami
-import QtGraphicalEffects 1.12
import "templates/private" as Private
/**
diff -uNr kirigami2-5.100.0/src/controls/ItemViewHeader.qml kirigami2-5.100.0.mod/src/controls/ItemViewHeader.qml
--- kirigami2-5.100.0/src/controls/ItemViewHeader.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/ItemViewHeader.qml 2022-12-03 14:05:00.000000000 +0800
@@ -6,7 +6,6 @@
import QtQuick 2.5
import QtQuick.Templates 2.0 as T2
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.4 as Kirigami
import "private"
@@ -95,13 +94,6 @@
elide: Text.ElideRight
layer.enabled: root.backgroundImage.hasImage
- layer.effect: DropShadow {
- horizontalOffset: 0
- verticalOffset: 2
- radius: Kirigami.Units.smallSpacing*2
- samples: 32
- color: Qt.rgba(0, 0, 0, 0.7)
- }
}
}
}
diff -uNr kirigami2-5.100.0/src/controls/NavigationTabBar.qml kirigami2-5.100.0.mod/src/controls/NavigationTabBar.qml
--- kirigami2-5.100.0/src/controls/NavigationTabBar.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/NavigationTabBar.qml 2022-12-03 14:04:16.000000000 +0800
@@ -9,7 +9,6 @@
import QtQuick.Templates 2.15 as T
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami
-import QtGraphicalEffects 1.12
/**
* @brief Page navigation tab-bar, used as an alternative to sidebars for 3-5 elements.
diff -uNr kirigami2-5.100.0/src/controls/ScrollablePage.qml kirigami2-5.100.0.mod/src/controls/ScrollablePage.qml
--- kirigami2-5.100.0/src/controls/ScrollablePage.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/ScrollablePage.qml 2022-12-03 14:04:22.000000000 +0800
@@ -9,7 +9,6 @@
import QtQuick.Templates 2.15 as T
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.19
import org.kde.kirigami.templates 2.2 as KT
diff -uNr kirigami2-5.100.0/src/controls/private/ActionButton.qml kirigami2-5.100.0.mod/src/controls/private/ActionButton.qml
--- kirigami2-5.100.0/src/controls/private/ActionButton.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/private/ActionButton.qml 2022-12-03 14:05:12.000000000 +0800
@@ -7,7 +7,6 @@
import QtQuick 2.15
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0 as Controls
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.16
import "../templates/private"
@@ -431,15 +430,6 @@
}
}
- DropShadow {
- anchors.fill: background
- horizontalOffset: 0
- verticalOffset: 1
- radius: Units.gridUnit /2
- samples: 16
- color: Qt.rgba(0, 0, 0, mouseArea.pressed ? 0.6 : 0.4)
- source: background
- }
}
}
@@ -464,15 +454,6 @@
height: width
- DropShadow {
- anchors.fill: handleGraphics
- horizontalOffset: 0
- verticalOffset: 1
- radius: Units.gridUnit /2
- samples: 16
- color: Qt.rgba(0, 0, 0, fakeContextMenuButton.pressed ? 0.6 : 0.4)
- source: handleGraphics
- }
Rectangle {
id: handleGraphics
anchors.fill: parent
diff -uNr kirigami2-5.100.0/src/controls/private/CornerShadow.qml kirigami2-5.100.0.mod/src/controls/private/CornerShadow.qml
--- kirigami2-5.100.0/src/controls/private/CornerShadow.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/private/CornerShadow.qml 2022-12-03 14:04:30.000000000 +0800
@@ -5,7 +5,6 @@
*/
import QtQuick 2.1
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.4
RadialGradient {
diff -uNr kirigami2-5.100.0/src/controls/private/EdgeShadow.qml kirigami2-5.100.0.mod/src/controls/private/EdgeShadow.qml
--- kirigami2-5.100.0/src/controls/private/EdgeShadow.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/private/EdgeShadow.qml 2022-12-03 14:05:38.000000000 +0800
@@ -5,10 +5,9 @@
*/
import QtQuick 2.1
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.4
-LinearGradient {
+Item {
id: shadow
/**
* @brief This property holds the edge of the shadow that will determine the direction of the gradient.
@@ -25,26 +24,5 @@
property int radius: Units.gridUnit
implicitWidth: radius
implicitHeight: radius
-
- start: Qt.point((edge !== Qt.RightEdge ? 0 : width), (edge !== Qt.BottomEdge ? 0 : height))
- end: Qt.point((edge !== Qt.LeftEdge ? 0 : width), (edge !== Qt.TopEdge ? 0 : height))
- gradient: Gradient {
- GradientStop {
- position: 0.0
- color: Qt.rgba(0, 0, 0, 0.25)
- }
- GradientStop {
- position: 0.20
- color: Qt.rgba(0, 0, 0, 0.1)
- }
- GradientStop {
- position: 0.35
- color: Qt.rgba(0, 0, 0, 0.02)
- }
- GradientStop {
- position: 1.0
- color: "transparent"
- }
- }
}
diff -uNr kirigami2-5.100.0/src/controls/qmldir kirigami2-5.100.0.mod/src/controls/qmldir
--- kirigami2-5.100.0/src/controls/qmldir 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/qmldir 2022-12-03 14:04:18.000000000 +0800
@@ -2,5 +2,4 @@
plugin kirigamiplugin
classname KirigamiPlugin
depends QtQuick.Controls 2.0
-depends QtGraphicalEffects 1.0
designersupported
diff -uNr kirigami2-5.100.0/src/controls/templates/private/PassiveNotification.qml kirigami2-5.100.0.mod/src/controls/templates/private/PassiveNotification.qml
--- kirigami2-5.100.0/src/controls/templates/private/PassiveNotification.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/controls/templates/private/PassiveNotification.qml 2022-12-03 14:04:36.000000000 +0800
@@ -8,7 +8,6 @@
import QtQuick.Controls 2.3 as Controls
import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.12 as Kirigami
/*
diff -uNr kirigami2-5.100.0/src/plugins.qmltypes kirigami2-5.100.0.mod/src/plugins.qmltypes
--- kirigami2-5.100.0/src/plugins.qmltypes 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/plugins.qmltypes 2022-12-03 14:04:02.000000000 +0800
@@ -8,7 +8,6 @@
Module {
dependencies: [
- "QtGraphicalEffects 1.12",
"QtQml 2.7",
"QtQml.Models 2.2",
"QtQml.WorkerScript 2.15",
diff -uNr kirigami2-5.100.0/src/styles/Material/InlineMessage.qml kirigami2-5.100.0.mod/src/styles/Material/InlineMessage.qml
--- kirigami2-5.100.0/src/styles/Material/InlineMessage.qml 2022-11-05 20:28:40.000000000 +0800
+++ kirigami2-5.100.0.mod/src/styles/Material/InlineMessage.qml 2022-12-03 14:05:16.000000000 +0800
@@ -7,7 +7,6 @@
*/
import QtQuick 2.7
-import QtGraphicalEffects 1.0
import org.kde.kirigami 2.5 as Kirigami
import "../../private"
@@ -104,12 +103,5 @@
}
layer.enabled: true
- layer.effect: DropShadow {
- horizontalOffset: 0
- verticalOffset: 1
- radius: 12
- samples: 32
- color: Qt.rgba(0, 0, 0, 0.5)
- }
}
}