summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/plasma-desktop')
-rw-r--r--kde-plasma/plasma-desktop/Manifest18
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch32
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch44
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch37
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch49
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch108
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch140
-rw-r--r--kde-plasma/plasma-desktop/metadata.xml2
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild)71
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild48
10 files changed, 333 insertions, 216 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 5d8e2835d118..ca887e1e033e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,13 +1,11 @@
-AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
AUX plasma-desktop-5.18.4.1-synaptics-header.patch 821 BLAKE2B 96cbad72391a1d361b009b25362980c8b0ec3e583368ffc4d599b73289e6e6228afc65d08236d704af8878c6b21a9bd1a15f3fad952855d88bc660f73feb9bf4 SHA512 02cf404a9bce33e689f40597d35afb1ca3625e7caaf775a50ed70217bd8034f842001a16e1084bf81bba9dff0361a4e57a6e08853beb7d90216bf1519d305516
+AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668605a0994577bef4eb2308846d8f2e403b6546f22f9d5c05f83717abd5e27e137b199376927367227d0cad593b3d7bef859ec3791a3013bca46c930a27d459 SHA512 386c35e1f77f68ce81013d7fa7ecbe8f240ffd16507dd501eb4f9950902d21cfcc7d239b4210ac5b700a9ed59fa45799daf3ac2a5d53251a02b940df53841b28
+AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703
AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
-AUX plasma-desktop-5.18.5-override-include-dirs.patch 3334 BLAKE2B f715aba5b555d7adec73748233398337b18e70e3ae069ee0ca48b3ea661ba386ef81d5f34f851b6b6b68e945ee6ea200f17ed58ac057b603a8460c53bb8f1c9c SHA512 3aa585f2c51d7efd77503fbb49cb516d4d92ece3f8c163edb96c8e45a7f8e64d55e6c7c3956127841b4c48126857308b950fc06f9ac52821463fa04322c50822
-DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
-DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
-DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
+AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
+AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
-DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
-DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
-EBUILD plasma-desktop-5.17.5-r1.ebuild 4071 BLAKE2B 8710be965b9fa342a9c8d4331181cf4ccb1f258fccff4cd19ce2b17a6e0c79a3ef3ef79a5bee41e11ba19a9334c800c57723b18089211111ca5879bc0d2b216a SHA512 669dd8f639d8b7c36b4cd45268972935c18dfe8a274c532100573d65d20d714dedce1c2d4879a543dfc1534827e1a9ab1d1ecca39c7036ef25d4f753ebfd838a
-EBUILD plasma-desktop-5.18.5.ebuild 5597 BLAKE2B 94551323951fba190ecf92d133d9c06f8abd22aa5d552dc97034ce27e2330d6137643ed8fa9fea0421077dbe52754c6c91b74260e9d5960c8bbe5f802fb5e8c0 SHA512 0cc26d88f21646abf3858865def961b8c43a0d9075bbcebef408d24c84d49b9d3184ec83f7f795af42eae0ea390ccf4886241a26af6ef6f6323d1c00b0108259
-MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
+DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
+EBUILD plasma-desktop-5.18.5-r1.ebuild 4868 BLAKE2B 473b0603ce3954570fc675f48229b7dbead2211a3d686ad3e3cf09a33b86f8a699948f054a8a88f784fd46119cabed4748f84b4c9000444b8144e45968f0dbea SHA512 25181e9d3352bf852bb1dbebbb616fddea612b61d38c019df12f07ac2ecf0f89c1a19478bbc15002e63cf23444b8d965e66d37ab8f75747c5b6bfb2e64664a13
+EBUILD plasma-desktop-5.18.5.ebuild 4512 BLAKE2B 1e139447f604f0aa4ca1041a742b5137fa934508675a1ad14ae3f584fbd45df8bd0d62f9c1806b9a8dc43cf4f68d2456faed8bb71359932c71ff2746a4b02dfa SHA512 4fe5864070bbcf16283e2fa821b02e56674304b836511662a21e60a6ae4e6be84f6727f8d7ce41f28f6284cbc28a5420c5a4866299c12b591feb493e705d28bb
+MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
deleted file mode 100644
index fac8bab91b6b..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 12 Jan 2020 08:39:29 -0700
-Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on
- high DPI systems"
-
-This reverts commit 567f71714faac305947573e307f486a9960cf1d1.
-
-The commit in question was pushed without review and should not have
-been. It worked fine for me in local testing but somehow was broken
-anyway. Sorry. :(
-
-BUG: 416158
----
- kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-index 531ef9f..aac13a2 100644
---- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-+++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-@@ -52,8 +52,6 @@ ColumnLayout {
- height: Kirigami.Units.iconSizes.medium
- width: height
- source: model.icon
-- sourceSize.width: model.icon.width
-- sourceSize.height: model.icon.height
- }
-
- QQC2.Label {
---
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
new file mode 100644
index 000000000000..17db7fc5b516
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
@@ -0,0 +1,44 @@
+From 2c46f28170c785f04fa396803037a608c8077025 Mon Sep 17 00:00:00 2001
+From: Matej Mrenica <matejm98mthw@gmail.com>
+Date: Wed, 6 May 2020 07:50:01 -0600
+Subject: Fix blurry icons in KColorSchemeEditor
+
+Summary:
+When using fractional scaling, bottom icons are blurred. This patch fixes the issue.
+
+BUG: 418165
+
+Test Plan:
+No side effects.
+
+Before:
+{F8289358}
+After:
+{F8289369}
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29481
+---
+ kcms/colors/editor/kcolorschemeeditor.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kcms/colors/editor/kcolorschemeeditor.cpp b/kcms/colors/editor/kcolorschemeeditor.cpp
+index 774d66e..03caa51 100644
+--- a/kcms/colors/editor/kcolorschemeeditor.cpp
++++ b/kcms/colors/editor/kcolorschemeeditor.cpp
+@@ -28,6 +28,8 @@
+
+ int main(int argc, char* argv[])
+ {
++ // Fixes blurry icons with fractional scaling
++ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ QApplication app(argc, argv);
+
+ KAboutData aboutData(
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
new file mode 100644
index 000000000000..d7603e434a69
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
@@ -0,0 +1,37 @@
+From 3a6795548fd755121084b6a77f9de23bece8f534 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 17 Jan 2020 14:41:47 +0000
+Subject: [widgetexplorer] Animate column moves
+
+Test Plan:
+Search for something in the second column
+Now it doesn't jump
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D26699
+---
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index 1d98e59..56a0c22 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -326,7 +326,7 @@ Item {
+ //moved due to filtering
+ displaced: Transition {
+ NumberAnimation {
+- properties: "y"
++ properties: "x,y"
+ duration: units.shortDuration * 3
+ }
+ }
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
new file mode 100644
index 000000000000..cc39c1e46488
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
@@ -0,0 +1,49 @@
+From 977665254990892411c74e8a04a8fdb10ef68547 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 17 Jan 2020 14:41:42 +0000
+Subject: [widgetexplorer] Fix animate in animation
+
+Summary:
+The animation in comes in from offscreen on the left.
+
+"to: 0" was correct when we had one column. With the 2 column view it
+means we animate two items on top of each other and jump when the
+animation completes. We want to animate to the final position the item
+will end up in.
+
+It bugs me more than it probably should.
+
+Test Plan:
+Search for "asdfasdfsadfsadf"
+Remove search
+Animation now looks ok, instead of horrific
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D26698
+---
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index b7bbce8..1d98e59 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -305,9 +305,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ from: -list.width
+- to: 0
+ duration: units.shortDuration * 3
+-
+ }
+ }
+
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
deleted file mode 100644
index ffbf2b644292..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides for various input
- drivers
-
-FindEvdev - evdev-properties.h
-FindSynaptics - synaptics-properties.h
-FindXorgLibinput - libinput-properties.h
-FindXorgServer - xserver-properties.h
----
- cmake/modules/FindEvdev.cmake | 4 ++++
- cmake/modules/FindSynaptics.cmake | 4 ++++
- cmake/modules/FindXorgLibinput.cmake | 4 ++++
- cmake/modules/FindXorgServer.cmake | 4 ++++
- 4 files changed, 16 insertions(+)
-
-diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
-index 153128a90..c19c31a96 100644
---- a/cmake/modules/FindEvdev.cmake
-+++ b/cmake/modules/FindEvdev.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Evdev_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
-
-@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
- HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
-index fb5f9bc3e..eb56965e0 100644
---- a/cmake/modules/FindSynaptics.cmake
-+++ b/cmake/modules/FindSynaptics.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Synaptics_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
-
-@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
- HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
-index 1550751ae..5b7af5e79 100644
---- a/cmake/modules/FindXorgLibinput.cmake
-+++ b/cmake/modules/FindXorgLibinput.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGLIBINPUT_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
-
-@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
- HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-index 5248c6d25..9de16dba0 100644
---- a/cmake/modules/FindXorgServer.cmake
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGSERVER_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGSERVER xorg-server)
-
-@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
- HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-
---
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
new file mode 100644
index 000000000000..593665a53c58
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,140 @@
+From f3bbc0ba0e34ea1b34b106228c02d85865ed904a Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 24 Mar 2020 08:15:12 -0600
+Subject: Stop multiplying duration values
+
+Summary:
+After D28144, some animations are now too long because they were inappropriately
+multiplying a duration value. That's no longer necessary, so let's remove the
+multiplication.
+
+Depends on D28144
+
+Test Plan: Various things that were a bit too slow before feel just right now
+
+Reviewers: #vdg, #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D28239
+---
+ applets/taskmanager/package/contents/ui/Task.qml | 2 +-
+ applets/taskmanager/package/contents/ui/TaskList.qml | 2 +-
+ desktoppackage/contents/configuration/PanelConfiguration.qml | 4 ++--
+ desktoppackage/contents/explorer/WidgetExplorer.qml | 6 +++---
+ toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml | 6 +++---
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
+index 2bf8b88..9683fab 100644
+--- a/applets/taskmanager/package/contents/ui/Task.qml
++++ b/applets/taskmanager/package/contents/ui/Task.qml
+@@ -293,7 +293,7 @@ MouseArea {
+ Timer {
+ id: timer
+
+- interval: units.longDuration * 2
++ interval: units.longDuration
+ repeat: false
+
+ onTriggered: {
+diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml
+index 594420b..6d6bc45 100644
+--- a/applets/taskmanager/package/contents/ui/TaskList.qml
++++ b/applets/taskmanager/package/contents/ui/TaskList.qml
+@@ -34,7 +34,7 @@ Flow {
+ NumberAnimation {
+ properties: "x, y"
+ easing.type: Easing.OutQuad
+- duration: units.longDuration * 2
++ duration: units.longDuration
+ }
+
+ PropertyAction { target: taskList; property: "animating"; value: false }
+diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml
+index 0e11a96..33e3fbc 100644
+--- a/desktoppackage/contents/configuration/PanelConfiguration.qml
++++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
+@@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem {
+ return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance
+ }
+ }
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+
+ NumberAnimation {
+@@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem {
+ return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance
+ }
+ }
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+ //END Animations
+diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
+index 1648708..e26cc40 100644
+--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
+@@ -306,7 +306,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ from: -list.width
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+@@ -315,7 +315,7 @@ Item {
+ NumberAnimation {
+ properties: "x"
+ to: list.width
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+@@ -328,7 +328,7 @@ Item {
+ displaced: Transition {
+ NumberAnimation {
+ properties: "x,y"
+- duration: units.shortDuration * 3
++ duration: units.shortDuration
+ }
+ }
+
+diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
+index 06524c3..eb6b190 100644
+--- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
++++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
+@@ -54,14 +54,14 @@ Item {
+ }
+ Behavior on rotation {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+ }
+ Behavior on x {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+@@ -69,7 +69,7 @@ Item {
+ }
+ Behavior on y {
+ NumberAnimation {
+- duration: units.shortDuration * 3;
++ duration: units.shortDuration;
+ easing.type: Easing.InOutExpo;
+ }
+ enabled: visible
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index cf13ed12c3b9..52f99fa25fe2 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -7,8 +7,6 @@
</maintainer>
<use>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
- <flag name="mouse">Enable mouse KCM</flag>
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
- <flag name="touchpad">Enable touchpad KCM</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
index 36d9ae8b74ae..0a0651b0385a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
@@ -5,19 +5,33 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
+KFMIN=5.66.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/attica-${KFMIN}:5
>=kde-frameworks/kactivities-${KFMIN}:5
>=kde-frameworks/kactivities-stats-${KFMIN}:5
@@ -57,18 +71,8 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
>=kde-plasma/plasma-workspace-${PVCUT}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
media-libs/phonon[qt5(+)]
x11-libs/libX11
x11-libs/libXcursor
@@ -83,49 +87,57 @@ COMMON_DEPEND="
x11-libs/xcb-util-image
)
ibus? (
- >=dev-qt/qtx11extras-${QTMIN}:5
app-i18n/ibus
dev-libs/glib:2
+ >=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libxcb
x11-libs/xcb-util-keysyms
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-base/xorg-proto
fontconfig? ( x11-libs/libXrender )
- mouse? (
- x11-drivers/xf86-input-evdev
- x11-drivers/xf86-input-libinput
- )
"
RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
>=kde-plasma/breeze-${PVCUT}:5
>=kde-plasma/kde-cli-tools-${PVCUT}:5
>=kde-plasma/oxygen-${PVCUT}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
sys-apps/util-linux
x11-apps/setxkbmap
!<kde-plasma/kdeplasma-addons-5.15.80
"
-PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
+ "${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+
+ "${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
+
+ # Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
+ # https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
+ "${FILESDIR}/${P}-fix-animate-in-animation.patch"
+ "${FILESDIR}/${P}-animate-column-moves.patch"
+ "${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package ibus IBus)
- $(cmake_use_find_package mouse Evdev)
- $(cmake_use_find_package mouse XorgLibinput)
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
ecm_src_configure
@@ -133,10 +145,11 @@ src_configure() {
src_test() {
# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # needs D-Bus, bug #634166
+ # test_kio_fonts needs D-Bus, bug #634166
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918
local myctestargs=(
-j1
- -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
)
ecm_src_test
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
index 2560f8c7928d..78ba5b38ae68 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
@@ -12,24 +12,12 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
- ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
- ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
- ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
- ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="+fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
@@ -129,29 +117,18 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
- "${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
-)
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-src_unpack() {
- kde.org_src_unpack
- mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
- cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
- "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
- cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
- "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
- cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
- "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
- cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
- "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
+ "${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
- -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package ibus IBus)
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
@@ -162,10 +139,11 @@ src_configure() {
src_test() {
# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # needs D-Bus, bug #634166
+ # test_kio_fonts needs D-Bus, bug #634166
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918
local myctestargs=(
-j1
- -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
)
ecm_src_test
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 10:53:54 +0000