gentoo resync : 09.07.2022

3 files changed, 58 insertions, 1 deletions

diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 40170202bf1f..a8e9047d7faa 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,6 @@
+AUX kdeclarative-5.95.0-fix-potd-centered.patch 2116 BLAKE2B 40d26797da63d66d3340de37077a86f8d4ed59b9ecb50ec3eca398a2ca9d20282839ae92746aea3a488df0d3513ce129f34aa8594857ace532653395a6ef65d0 SHA512 f8220241c41c23dc75bed5f26889db72b05526902a41a1d13f8aa25970c93ec6207b5167f63e6596973bb423fe57f89129a5364a98d98dafbf20c2fe45e39d92
 DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
 DIST kdeclarative-5.95.0.tar.xz 205716 BLAKE2B 7cff9307f5098513e65416868845fe3b892da30c97fa01b6e6eca95dc15517d8aa67423fddfb78e2695a7df47b7c9f083534ac993b5b87a0f9b692d725b22d52 SHA512 bedacd087b7215b38ec83291c853238f759532b7fd5941cc02771746002a08233985b624ac31bd926bcd18fb2eca6e703f0a7ae83439a3e63657d6aa3ea647c0
 EBUILD kdeclarative-5.92.0.ebuild 944 BLAKE2B eedca9ff52fd3d86b73ea12b8251efe7aa1136631a5eb69b118c91cc9ec506310ec9e4e62e0948089c30c4fef95373e50e95d9e87791aa034f88f70e5888ef3f SHA512 3ce5b83d7ad536f0e69d156b8ef61bc09591acbe5bd6b62815d445e2af0ad78c245d6e721638fd314ff16ec48afba355caba0bb59df1d63086dc1435a3ac584b
-EBUILD kdeclarative-5.95.0.ebuild 954 BLAKE2B 5137c2e59a7083b3e883e667fb58685e26c510dc5aa0f4c5df03d8ac2bac960ae1ef943b78f21b141b5a193c5650b306c0ff6f927a862b2b368828e842855b6c SHA512 9c058359b6572e1fa4e930f9016ab8d1d4b11e4e87bc29556880e90f6804336102ffbb77ca7e1aaa35bc699ab6c1f8c2bb10da1a777a9a489177d3cd8d0c397a
+EBUILD kdeclarative-5.95.0-r1.ebuild 1010 BLAKE2B 872a1732a463eaef2adeee5ba8236ab4ed5ea04e0d06c063ad5c7dd51eaea1f1e5ce3628d0a8debc6dc818a11a8a73bdf17a8c39cdb15bc56d433121098dc2a4 SHA512 de7d3dd904efda8701496fd423e728ec910ebcb5ef60a4daa4b8dcb8e01533fe8719897353078806564d4c7333c533cb1cf618ed479412bae1dc220293047798
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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 000000000000..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 <qydwhotmail@gmail.com>
+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.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
index b2097f97efc7..6d2b7ad1ccae 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.95.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.95.0-r1.ebuild
@@ -33,3 +33,5 @@ DEPEND="
 	media-libs/libepoxy
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-potd-centered.patch" )