summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-09-21 18:03:27 +0000
committer Eric Hameleers <alien@slackware.com>2021-09-22 08:59:56 +0200
commit1466aa1f79ae537f4244351e1340e537fc571d31 (patch)
tree77e4f92ac92fc09b50550814f76aea8c38720e99 /source/kde/kde/patch
parentb957c033af59dfa7cb549a0fe368e5efec72ebaf (diff)
downloadcurrent-1466aa1f79ae537f4244351e1340e537fc571d31.tar.gz
current-1466aa1f79ae537f4244351e1340e537fc571d31.tar.xz
Tue Sep 21 18:03:27 UTC 202120210921180327
a/btrfs-progs-5.14.1-x86_64-1.txz: Upgraded. a/sysvinit-3.00-x86_64-1.txz: Upgraded. ap/htop-3.1.0-x86_64-1.txz: Upgraded. d/cmake-3.21.3-x86_64-1.txz: Upgraded. kde/attica-5.86.0-x86_64-1.txz: Upgraded. kde/baloo-5.86.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.86.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.86.0-noarch-1.txz: Upgraded. kde/extra-cmake-modules-5.86.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.86.0-x86_64-1.txz: Upgraded. kde/kactivities-5.86.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.86.0-x86_64-1.txz: Upgraded. kde/kapidox-5.86.0-x86_64-1.txz: Upgraded. kde/karchive-5.86.0-x86_64-1.txz: Upgraded. kde/kauth-5.86.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.86.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.86.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.86.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.86.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.86.0-x86_64-1.txz: Upgraded. kde/kconfig-5.86.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.86.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.86.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.86.0-x86_64-1.txz: Upgraded. kde/kcrash-5.86.0-x86_64-1.txz: Upgraded. kde/kdav-5.86.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.86.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.86.0-x86_64-1.txz: Upgraded. kde/kded-5.86.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.86.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.86.0-x86_64-1.txz: Upgraded. kde/kdesu-5.86.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.86.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.86.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.86.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.86.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.86.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.86.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.86.0-x86_64-1.txz: Upgraded. kde/kholidays-5.86.0-x86_64-1.txz: Upgraded. kde/khtml-5.86.0-x86_64-1.txz: Upgraded. kde/ki18n-5.86.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.86.0-x86_64-1.txz: Upgraded. kde/kidletime-5.86.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.86.0-x86_64-1.txz: Upgraded. kde/kinit-5.86.0-x86_64-1.txz: Upgraded. kde/kio-5.86.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.86.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.86.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.86.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.86.0-x86_64-1.txz: Upgraded. kde/kjs-5.86.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.86.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.86.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.86.0-x86_64-1.txz: Upgraded. kde/knotifications-5.86.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.86.0-x86_64-1.txz: Upgraded. kde/kpackage-5.86.0-x86_64-1.txz: Upgraded. kde/kparts-5.86.0-x86_64-1.txz: Upgraded. kde/kpeople-5.86.0-x86_64-1.txz: Upgraded. kde/kplotting-5.86.0-x86_64-1.txz: Upgraded. kde/kpty-5.86.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.86.0-x86_64-1.txz: Upgraded. kde/kross-5.86.0-x86_64-1.txz: Upgraded. kde/krunner-5.86.0-x86_64-1.txz: Upgraded. kde/kservice-5.86.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.86.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.86.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.86.0-x86_64-1.txz: Upgraded. kde/kwallet-5.86.0-x86_64-1.txz: Upgraded. kde/kwayland-5.86.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.86.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.86.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.86.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.86.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.86.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.86.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.86.0-noarch-1.txz: Upgraded. kde/plasma-framework-5.86.0-x86_64-1.txz: Upgraded. kde/prison-5.86.0-x86_64-1.txz: Upgraded. kde/purpose-5.86.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.86.0-x86_64-1.txz: Upgraded. kde/solid-5.86.0-x86_64-1.txz: Upgraded. kde/sonnet-5.86.0-x86_64-1.txz: Upgraded. kde/syndication-5.86.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.86.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.86.0-x86_64-1.txz: Upgraded. l/neon-0.32.0-x86_64-1.txz: Upgraded. n/alpine-2.25-x86_64-1.txz: Upgraded. Fixed a denial-of-service security issue where untagged responses from an IMAP server are accepted before STARTTLS. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-38370 (* Security fix *) n/fetchmail-6.4.22-x86_64-1.txz: Upgraded. x/libva-2.13.0-x86_64-2.txz: Rebuilt. Instead of disabling messaging entirely, add an /etc/libva.conf that sets it to a medium level and can be adjusted by the user. Thanks to Markus Wiesner. x/mesa-21.2.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/breeze-icons.patch2
-rw-r--r--source/kde/kde/patch/breeze-icons/breeze-icons.04a13e272dd395442e7eb9dc58de3ab55a2f22f3.patch274
-rw-r--r--source/kde/kde/patch/plasma-framework.patch2
-rw-r--r--source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch44
4 files changed, 0 insertions, 322 deletions
diff --git a/source/kde/kde/patch/breeze-icons.patch b/source/kde/kde/patch/breeze-icons.patch
deleted file mode 100644
index bf561ccf6..000000000
--- a/source/kde/kde/patch/breeze-icons.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix using this icon theme in Xfce:
-cat $CWD/patch/breeze-icons/breeze-icons.04a13e272dd395442e7eb9dc58de3ab55a2f22f3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/breeze-icons/breeze-icons.04a13e272dd395442e7eb9dc58de3ab55a2f22f3.patch b/source/kde/kde/patch/breeze-icons/breeze-icons.04a13e272dd395442e7eb9dc58de3ab55a2f22f3.patch
deleted file mode 100644
index 17c33ded5..000000000
--- a/source/kde/kde/patch/breeze-icons/breeze-icons.04a13e272dd395442e7eb9dc58de3ab55a2f22f3.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From 04a13e272dd395442e7eb9dc58de3ab55a2f22f3 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 3 Feb 2021 20:49:41 -0700
-Subject: [PATCH] Add Xfce compatibility symlinks
-
-This commit adds the necessary compatibility symlinks to allow the
-Breeze icon theme to be used on Xfce.
-
-BUG: 432333
-FIXED-IN: 5.85
----
- icons-dark/actions/22/system-hibernate.svg | 1 +
- icons-dark/actions/22/xfsm-hibernate.svg | 1 +
- icons-dark/actions/32/system-hibernate.svg | 1 +
- icons-dark/actions/32/xfsm-hibernate.svg | 1 +
- icons-dark/places/16/org.xfce.gigolo.svg | 1 +
- icons-dark/places/22/org.xfce.gigolo.svg | 1 +
- icons-dark/status/22/nm-device-wired.svg | 1 +
- icons-dark/status/22/nm-nm-signal-00.svg | 1 +
- icons-dark/status/22/nm-nm-signal-100.svg | 1 +
- icons-dark/status/22/nm-nm-signal-25.svg | 1 +
- icons-dark/status/22/nm-nm-signal-50.svg | 1 +
- icons-dark/status/22/nm-nm-signal-75.svg | 1 +
- icons-dark/status/22/nm-no-connection.svg | 1 +
- icons/actions/22/system-hibernate.svg | 1 +
- icons/actions/22/xfsm-hibernate.svg | 1 +
- icons/actions/32/system-hibernate.svg | 1 +
- icons/actions/32/xfsm-hibernate.svg | 1 +
- icons/places/16/org.xfce.gigolo.svg | 1 +
- icons/places/22/org.xfce.gigolo.svg | 1 +
- icons/status/22/nm-device-wired.svg | 1 +
- icons/status/22/nm-nm-signal-00.svg | 1 +
- icons/status/22/nm-nm-signal-100.svg | 1 +
- icons/status/22/nm-nm-signal-25.svg | 1 +
- icons/status/22/nm-nm-signal-50.svg | 1 +
- icons/status/22/nm-nm-signal-75.svg | 1 +
- icons/status/22/nm-no-connection.svg | 1 +
- 26 files changed, 26 insertions(+)
- create mode 120000 icons-dark/actions/22/system-hibernate.svg
- create mode 120000 icons-dark/actions/22/xfsm-hibernate.svg
- create mode 120000 icons-dark/actions/32/system-hibernate.svg
- create mode 120000 icons-dark/actions/32/xfsm-hibernate.svg
- create mode 120000 icons-dark/places/16/org.xfce.gigolo.svg
- create mode 120000 icons-dark/places/22/org.xfce.gigolo.svg
- create mode 120000 icons-dark/status/22/nm-device-wired.svg
- create mode 120000 icons-dark/status/22/nm-nm-signal-00.svg
- create mode 120000 icons-dark/status/22/nm-nm-signal-100.svg
- create mode 120000 icons-dark/status/22/nm-nm-signal-25.svg
- create mode 120000 icons-dark/status/22/nm-nm-signal-50.svg
- create mode 120000 icons-dark/status/22/nm-nm-signal-75.svg
- create mode 120000 icons-dark/status/22/nm-no-connection.svg
- create mode 120000 icons/actions/22/system-hibernate.svg
- create mode 120000 icons/actions/22/xfsm-hibernate.svg
- create mode 120000 icons/actions/32/system-hibernate.svg
- create mode 120000 icons/actions/32/xfsm-hibernate.svg
- create mode 120000 icons/places/16/org.xfce.gigolo.svg
- create mode 120000 icons/places/22/org.xfce.gigolo.svg
- create mode 120000 icons/status/22/nm-device-wired.svg
- create mode 120000 icons/status/22/nm-nm-signal-00.svg
- create mode 120000 icons/status/22/nm-nm-signal-100.svg
- create mode 120000 icons/status/22/nm-nm-signal-25.svg
- create mode 120000 icons/status/22/nm-nm-signal-50.svg
- create mode 120000 icons/status/22/nm-nm-signal-75.svg
- create mode 120000 icons/status/22/nm-no-connection.svg
-
-diff --git a/icons-dark/actions/22/system-hibernate.svg b/icons-dark/actions/22/system-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons-dark/actions/22/system-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons-dark/actions/22/xfsm-hibernate.svg b/icons-dark/actions/22/xfsm-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons-dark/actions/22/xfsm-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons-dark/actions/32/system-hibernate.svg b/icons-dark/actions/32/system-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons-dark/actions/32/system-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons-dark/actions/32/xfsm-hibernate.svg b/icons-dark/actions/32/xfsm-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons-dark/actions/32/xfsm-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons-dark/places/16/org.xfce.gigolo.svg b/icons-dark/places/16/org.xfce.gigolo.svg
-new file mode 120000
-index 000000000..b3a26eea3
---- /dev/null
-+++ b/icons-dark/places/16/org.xfce.gigolo.svg
-@@ -0,0 +1 @@
-+folder-network.svg
-\ No newline at end of file
-diff --git a/icons-dark/places/22/org.xfce.gigolo.svg b/icons-dark/places/22/org.xfce.gigolo.svg
-new file mode 120000
-index 000000000..b3a26eea3
---- /dev/null
-+++ b/icons-dark/places/22/org.xfce.gigolo.svg
-@@ -0,0 +1 @@
-+folder-network.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-device-wired.svg b/icons-dark/status/22/nm-device-wired.svg
-new file mode 120000
-index 000000000..141bbe50a
---- /dev/null
-+++ b/icons-dark/status/22/nm-device-wired.svg
-@@ -0,0 +1 @@
-+network-wired-activated.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-nm-signal-00.svg b/icons-dark/status/22/nm-nm-signal-00.svg
-new file mode 120000
-index 000000000..49fca1ef6
---- /dev/null
-+++ b/icons-dark/status/22/nm-nm-signal-00.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-00.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-nm-signal-100.svg b/icons-dark/status/22/nm-nm-signal-100.svg
-new file mode 120000
-index 000000000..af0386014
---- /dev/null
-+++ b/icons-dark/status/22/nm-nm-signal-100.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-100.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-nm-signal-25.svg b/icons-dark/status/22/nm-nm-signal-25.svg
-new file mode 120000
-index 000000000..bb1542d2d
---- /dev/null
-+++ b/icons-dark/status/22/nm-nm-signal-25.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-25.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-nm-signal-50.svg b/icons-dark/status/22/nm-nm-signal-50.svg
-new file mode 120000
-index 000000000..f1b34079f
---- /dev/null
-+++ b/icons-dark/status/22/nm-nm-signal-50.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-50.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-nm-signal-75.svg b/icons-dark/status/22/nm-nm-signal-75.svg
-new file mode 120000
-index 000000000..d68bc0dc4
---- /dev/null
-+++ b/icons-dark/status/22/nm-nm-signal-75.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-75.svg
-\ No newline at end of file
-diff --git a/icons-dark/status/22/nm-no-connection.svg b/icons-dark/status/22/nm-no-connection.svg
-new file mode 120000
-index 000000000..b2b468bde
---- /dev/null
-+++ b/icons-dark/status/22/nm-no-connection.svg
-@@ -0,0 +1 @@
-+network-wired-unavailable.svg
-\ No newline at end of file
-diff --git a/icons/actions/22/system-hibernate.svg b/icons/actions/22/system-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons/actions/22/system-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons/actions/22/xfsm-hibernate.svg b/icons/actions/22/xfsm-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons/actions/22/xfsm-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons/actions/32/system-hibernate.svg b/icons/actions/32/system-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons/actions/32/system-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons/actions/32/xfsm-hibernate.svg b/icons/actions/32/xfsm-hibernate.svg
-new file mode 120000
-index 000000000..2451dd60b
---- /dev/null
-+++ b/icons/actions/32/xfsm-hibernate.svg
-@@ -0,0 +1 @@
-+system-suspend-hibernate.svg
-\ No newline at end of file
-diff --git a/icons/places/16/org.xfce.gigolo.svg b/icons/places/16/org.xfce.gigolo.svg
-new file mode 120000
-index 000000000..b3a26eea3
---- /dev/null
-+++ b/icons/places/16/org.xfce.gigolo.svg
-@@ -0,0 +1 @@
-+folder-network.svg
-\ No newline at end of file
-diff --git a/icons/places/22/org.xfce.gigolo.svg b/icons/places/22/org.xfce.gigolo.svg
-new file mode 120000
-index 000000000..b3a26eea3
---- /dev/null
-+++ b/icons/places/22/org.xfce.gigolo.svg
-@@ -0,0 +1 @@
-+folder-network.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-device-wired.svg b/icons/status/22/nm-device-wired.svg
-new file mode 120000
-index 000000000..141bbe50a
---- /dev/null
-+++ b/icons/status/22/nm-device-wired.svg
-@@ -0,0 +1 @@
-+network-wired-activated.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-nm-signal-00.svg b/icons/status/22/nm-nm-signal-00.svg
-new file mode 120000
-index 000000000..49fca1ef6
---- /dev/null
-+++ b/icons/status/22/nm-nm-signal-00.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-00.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-nm-signal-100.svg b/icons/status/22/nm-nm-signal-100.svg
-new file mode 120000
-index 000000000..af0386014
---- /dev/null
-+++ b/icons/status/22/nm-nm-signal-100.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-100.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-nm-signal-25.svg b/icons/status/22/nm-nm-signal-25.svg
-new file mode 120000
-index 000000000..bb1542d2d
---- /dev/null
-+++ b/icons/status/22/nm-nm-signal-25.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-25.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-nm-signal-50.svg b/icons/status/22/nm-nm-signal-50.svg
-new file mode 120000
-index 000000000..f1b34079f
---- /dev/null
-+++ b/icons/status/22/nm-nm-signal-50.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-50.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-nm-signal-75.svg b/icons/status/22/nm-nm-signal-75.svg
-new file mode 120000
-index 000000000..d68bc0dc4
---- /dev/null
-+++ b/icons/status/22/nm-nm-signal-75.svg
-@@ -0,0 +1 @@
-+network-wireless-connected-75.svg
-\ No newline at end of file
-diff --git a/icons/status/22/nm-no-connection.svg b/icons/status/22/nm-no-connection.svg
-new file mode 120000
-index 000000000..b2b468bde
---- /dev/null
-+++ b/icons/status/22/nm-no-connection.svg
-@@ -0,0 +1 @@
-+network-wired-unavailable.svg
-\ No newline at end of file
-
diff --git a/source/kde/kde/patch/plasma-framework.patch b/source/kde/kde/patch/plasma-framework.patch
deleted file mode 100644
index b10b4a5e3..000000000
--- a/source/kde/kde/patch/plasma-framework.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix icon sizing regression:
-cat $CWD/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch b/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch
deleted file mode 100644
index 9c0e90464..000000000
--- a/source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@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
---
-GitLab
-