[neon/kde/plasma-framework/Neon/unstable] debian/patches: Revert "backport patch as requested on distros list"

[Harald Sitter]

Git commit 5d72d9ba67b63655cf6cf81f208509406f74e459 by Harald Sitter.
Committed on 16/08/2021 at 09:03.
Pushed by sitter into branch 'Neon/unstable'.

Revert "backport patch as requested on distros list"

This reverts commit a5f29ef8e063c7659c1c58f0b49f6c39ff18ea17.

Revert the patch for Neon/unstable. not applicable there.

D  +0    -44   debian/patches/0001-Fix-Plasma-non-Qt-icon-scaling-with-integer-scale-fa.patch
D  +0    -2    debian/patches/series

https://invent.kde.org/neon/kde/plasma-framework/commit/5d72d9ba67b63655cf6cf81f208509406f74e459

diff --git a/debian/patches/0001-Fix-Plasma-non-Qt-icon-scaling-with-integer-scale-fa.patch b/debian/patches/0001-Fix-Plasma-non-Qt-icon-scaling-with-integer-scale-fa.patch
deleted file mode 100644
index a448b0b..0000000
--- a/debian/patches/0001-Fix-Plasma-non-Qt-icon-scaling-with-integer-scale-fa.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate at kde.org>
-Date: Sun, 15 Aug 2021 09:33:10 -0600
-Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors
-
-An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6
-caused the function which returns an appropriate scale factor for icons
-to both take and return integer values rather than floating point
-values, preventing it from working properly with any scale factor other
-than an integer scale factor (e.g. 200%). This commit fixes that issue.
----
- src/declarativeimports/core/units.cpp | 2 +-
- src/declarativeimports/core/units.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
-index 6788ed952..fbcc6d888 100644
---- a/src/declarativeimports/core/units.cpp
-+++ b/src/declarativeimports/core/units.cpp
-@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size)
-     }
- }
- 
--int Units::bestIconScaleForDevicePixelRatio(const int ratio)
-+qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio)
- {
-     if (ratio < 1.5) {
-         return 1;
-diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h
-index c19cf0dd8..855738e7d 100644
---- a/src/declarativeimports/core/units.h
-+++ b/src/declarativeimports/core/units.h
-@@ -271,7 +271,7 @@ private:
-      * Note that this function is only relevant when using Plasma scaling and
-      * when using Qt scaling, it always returns 1.
-      */
--    static int bestIconScaleForDevicePixelRatio(const int ratio);
-+    static qreal bestIconScaleForDevicePixelRatio(const qreal ratio);
- 
-     /**
-      * @return The dpi-adjusted size for a given icon size
--- 
-2.25.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index afac57c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-# backport request from distributions at kde.org plasma icon sizes were broken on x11 fractional scaling
-0001-Fix-Plasma-non-Qt-icon-scaling-with-integer-scale-fa.patch