[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdeclarative/, kde-frameworks/kdeclarative/files/
commit: aa54e46154aa952caf3a967b9401536c8848272b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jun 29 19:41:57 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 29 19:53:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa54e461
kde-frameworks/kdeclarative: qmlcontrols: add Pad fill mode in QImageItem
Upstream commit 41b3d0b142387c3acbba73f6ac332b3f314f7700
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=389623
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kdeclarative-5.95.0-fix-potd-centered.patch| 54 ++
.../kdeclarative/kdeclarative-5.95.0-r1.ebuild | 37 +++
2 files changed, 91 insertions(+)
diff --git
a/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
b/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
new file mode 100644
index ..cac44a4333bf
--- /dev/null
+++
b/kde-frameworks/kdeclarative/files/kdeclarative-5.95.0-fix-potd-centered.patch
@@ -0,0 +1,54 @@
+From 41b3d0b142387c3acbba73f6ac332b3f314f7700 Mon Sep 17 00:00:00 2001
+From: Fushan Wen
+Date: Thu, 9 Jun 2022 12:57:55 +0800
+Subject: [PATCH] qmlcontrols: add `Pad` fill mode in `QImageItem`
+
+This matches the behavior in `QQuickImage`.
+
+BUG: 389623
+FIXED-IN: 5.96
+---
+ src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp | 7 ++-
+ src/qmlcontrols/kquickcontrolsaddons/qimageitem.h | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
+index 36929eed..060069a1 100644
+--- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp
+@@ -103,7 +103,11 @@ void QImageItem::paint(QPainter *painter)
+ painter->scale(1, height() / (qreal)m_image.height());
+ }
+
+-if (m_fillMode >= Tile) {
++if (m_fillMode == Pad) {
++QRect centeredRect = m_paintedRect;
++centeredRect.moveCenter(m_image.rect().center());
++painter->drawImage(m_paintedRect, m_image, centeredRect);
++} else if (m_fillMode >= Tile) {
+ painter->drawTiledPixmap(m_paintedRect, QPixmap::fromImage(m_image));
+ } else {
+ painter->drawImage(m_paintedRect, m_image, m_image.rect());
+@@ -174,6 +178,7 @@ void QImageItem::updatePaintedRect()
+ }
+ case Stretch:
+ case Tile:
++case Pad:
+ default:
+ destRect = boundingRect().toRect();
+ }
+diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
+index f32ae7da..ba38a4a1 100644
+--- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
+@@ -32,6 +32,7 @@ public:
+ Tile, // the image is duplicated horizontally and vertically
+ TileVertically, // the image is stretched horizontally and tiled
vertically
+ TileHorizontally, // the image is stretched vertically and tiled
horizontally
++Pad, /**< the image is not transformed @since 5.96 **/
+ };
+ Q_ENUM(FillMode)
+
+--
+GitLab
+
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
new file mode 100644
index ..6d2b7ad1ccae
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kpackage-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-potd-centered.patch" )
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdeclarative/, kde-frameworks/kdeclarative/files/
commit: 60fa952af8a8fd939091482881c81504e22f6b1a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 9 09:49:25 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jan 11 12:27:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fa952a
kde-frameworks/kdeclarative: drop 5.74.0*
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-frameworks/kdeclarative/Manifest | 1 -
...ck-shortcuts-when-recording-key-sequences.patch | 104 -
.../kdeclarative/kdeclarative-5.74.0-r2.ebuild | 38
3 files changed, 143 deletions(-)
diff --git a/kde-frameworks/kdeclarative/Manifest
b/kde-frameworks/kdeclarative/Manifest
index 98f69e6ea38..620dcc3e02d 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,3 +1,2 @@
-DIST kdeclarative-5.74.0.tar.xz 190360 BLAKE2B
cf4ac587189c4f6fba6a13eaea4eea95e7e8aacf902c8ed809fac03f5ca76c9e42eff9fa74c1dfb0d0618c71bd4109a1c6b8f6964b242659757efadcc149ddb5
SHA512
8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78
DIST kdeclarative-5.77.0.tar.xz 185036 BLAKE2B
53ce685df457d3e8b33d37efedbd7ba56b430a228c32673ca01cdf401f80a8e3518431d15182dbf28f4fa4a439369e380e65c13cf9fe385f42c98d54d50043a6
SHA512
188dbb2ba5080b2b5cb9815686c0bc619921390389e2865330c6183c3cf0c6f0df6bba7009f9215f2c99759322bf1ed4cae68df5c696fd1c3ecaecbaf327419c
DIST kdeclarative-5.78.0.tar.xz 185136 BLAKE2B
ef206cc43cfa24542ddf1168b3331d3cb7c589c17554501f7a09e1cf526d3afa8ce5eafbc3a932081b743b9fb461e8c5915ec9e3b3bc742253f77f33274b0c6c
SHA512
cb98f7041f93c8a21da74a6bcaf463fdd257aa96a5495200c749d60d517817c6d9be2b58e99b0a8e23996861ed9dcd9043da1643062ac94755070fb1d2b13add
diff --git
a/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
b/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
deleted file mode 100644
index 66808f910bf..000
---
a/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 88aabf069a0e454777c15227126732a04c8cb8b2 Mon Sep 17 00:00:00 2001
-From: David Edmundson
-Date: Fri, 18 Sep 2020 00:13:07 +0100
-Subject: [PATCH] Block shortcuts when recording key sequences
-
-Otherwise you can't select alt+a as a shortcut without triggering the
-nmenomic generated shortcut on the "add application" button.
-
-Testing done:
-- clicked "Add custom shortcut", pressed alt+a, it was recorded
-successfully
-
-- focussed "Add custom shortcut", pressed alt+a, the relevant shortcut
-activated
-
-Note that isRecording was already declared, but not defined, which is
-why it looks like my diff misses something.
-
-BUG: 425979
- src/qmlcontrols/kquickcontrols/KeySequenceItem.qml| 7 +++
- .../kquickcontrols/private/keysequencehelper.cpp | 8 +++-
- .../kquickcontrols/private/keysequencehelper.h| 7 +++
- 3 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-index 9d8e035..d1fbc02 100644
a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-+++ b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
-@@ -83,6 +83,13 @@ RowLayout {
- }
- }
-
-+Keys.onShortcutOverride: {
-+if (_helper.isRecording) {
-+_helper.keyPressed(event.key, event.modifiers);
-+event.accepted = true;
-+}
-+}
-+
- Keys.onPressed: {
- _helper.keyPressed(event.key, event.modifiers);
- event.accepted = true;
-diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
-index ba7ce01..26b0331 100644
a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
-+++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
-@@ -237,7 +237,10 @@ void
KeySequenceHelper::setCheckAgainstShortcutTypes(KeySequenceHelper::Shortcut
- Q_EMIT checkAgainstShortcutTypesChanged();
- }
-
--
-+bool KeySequenceHelper::isRecording() const
-+{
-+return d->isRecording;
-+}
-
- void KeySequenceHelper::clearKeySequence()
- {
-@@ -251,6 +254,7 @@ void KeySequenceHelperPrivate::startRecording()
- oldKeySequence = keySequence;
- keySequence = QKeySequence();
- isRecording = true;
-+emit q->isRecordingChanged();
- grabbedWindow = QQuickRenderControl::renderWindowFor(q->window());
- if (!grabbedWindow) {
- grabbedWindow = q->window();
-@@ -265,6 +269,8 @@ void KeySequenceHelper::doneRecording()
- {
- d->modifierlessTimeout.stop();
- d->isRecording = false;
-+emit isRecordingChanged();
-+
- d->stealActions.clear();
-
