1 |
commit: 69d39a82485753c7cfc90ce55438148076a3bfa3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 2 22:07:26 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 2 23:17:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d39a82 |
7 |
|
8 |
kde-plasma/plasma-workspace: Backport upstream fixes |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
.../files/plasma-workspace-5.10.4-ghns-https.patch | 34 +++++++++++ |
13 |
.../plasma-workspace-5.10.4-notifications.patch | 69 ++++++++++++++++++++++ |
14 |
.../plasma-workspace-5.10.4-r2.ebuild | 2 + |
15 |
3 files changed, 105 insertions(+) |
16 |
|
17 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..2a805e32f0f |
20 |
--- /dev/null |
21 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-ghns-https.patch |
22 |
@@ -0,0 +1,34 @@ |
23 |
+commit ae943198bf74d563adcb1f3d36ee4ba1b7b274a9 |
24 |
+Author: Aleix Pol <aleixpol@×××.org> |
25 |
+Date: Fri Jul 28 13:21:38 2017 +0200 |
26 |
+ |
27 |
+ Prefer using https for kns providers |
28 |
+ |
29 |
+ CCBUG: 382820 |
30 |
+ |
31 |
+diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc |
32 |
+index c683a257..03c7de0e 100644 |
33 |
+--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc |
34 |
++++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc |
35 |
+@@ -36,7 +36,7 @@ Name[x-test]=xxPlasma Widgetsxx |
36 |
+ Name[zh_CN]=Plasma 部件 |
37 |
+ Name[zh_TW]=Plasma 元件 |
38 |
+ |
39 |
+-ProvidersUrl=http://download.kde.org/ocs/providers.xml |
40 |
++ProvidersUrl=https://download.kde.org/ocs/providers.xml |
41 |
+ Categories=Plasma 5 Plasmoid |
42 |
+ StandardResource=tmp |
43 |
+ InstallationCommand=kpackagetool5 --install %f --type Plasma/Applet |
44 |
+diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc |
45 |
+index 4a0cf2d6..2decc7e7 100644 |
46 |
+--- a/wallpapers/image/wallpaper.knsrc |
47 |
++++ b/wallpapers/image/wallpaper.knsrc |
48 |
+@@ -36,7 +36,7 @@ Name[x-test]=xxWallpapersxx |
49 |
+ Name[zh_CN]=壁纸 |
50 |
+ Name[zh_TW]=桌布 |
51 |
+ |
52 |
+-ProvidersUrl=http://download.kde.org/ocs/providers.xml |
53 |
++ProvidersUrl=https://download.kde.org/ocs/providers.xml |
54 |
+ Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other) |
55 |
+ StandardResource=wallpaper |
56 |
+ Uncompress=archive |
57 |
|
58 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..e964eeb8beb |
61 |
--- /dev/null |
62 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.4-notifications.patch |
63 |
@@ -0,0 +1,69 @@ |
64 |
+commit 7e2a29b0b18abe31df68c2f176124acfbc15c438 |
65 |
+Author: Kai Uwe Broulik <kde@××××××××××××××.de> |
66 |
+Date: Tue Aug 1 12:53:38 2017 +0200 |
67 |
+ |
68 |
+ [Notifications] Improve mouse handling |
69 |
+ |
70 |
+ * Make links clickable again |
71 |
+ * Don't pass visualParent to context menu as we already give it a position, fixes it being positioned incorrectly |
72 |
+ * Open context menu on press already like is done everywhere else |
73 |
+ * Give "Copy" the edit-copy icon |
74 |
+ * Deselect text after copying again, otherwise it stays selected but the user cannot unselect it. |
75 |
+ |
76 |
+ BUG: 382263 |
77 |
+ FIXED-IN: 5.10.5 |
78 |
+ |
79 |
+ Differential Revision: https://phabricator.kde.org/D7029 |
80 |
+ |
81 |
+diff --git a/applets/notifications/package/contents/ui/NotificationItem.qml b/applets/notifications/package/contents/ui/NotificationItem.qml |
82 |
+index dabf1b90..c260d588 100644 |
83 |
+--- a/applets/notifications/package/contents/ui/NotificationItem.qml |
84 |
++++ b/applets/notifications/package/contents/ui/NotificationItem.qml |
85 |
+@@ -282,8 +282,6 @@ MouseArea { |
86 |
+ wrapMode: Text.Wrap |
87 |
+ textFormat: TextEdit.RichText |
88 |
+ |
89 |
+- onLinkActivated: Qt.openUrlExternally(link) |
90 |
+- |
91 |
+ // ensure selecting text scrolls the view as needed... |
92 |
+ onCursorRectangleChanged: { |
93 |
+ var flick = bodyTextScrollArea.flickableItem |
94 |
+@@ -297,23 +295,33 @@ MouseArea { |
95 |
+ anchors.fill: parent |
96 |
+ acceptedButtons: Qt.RightButton | Qt.LeftButton |
97 |
+ |
98 |
+- onClicked: { |
99 |
+- if (mouse.button == Qt.RightButton) |
100 |
++ onPressed: { |
101 |
++ if (mouse.button === Qt.RightButton) { |
102 |
+ contextMenu.open(mouse.x, mouse.y) |
103 |
+- else { |
104 |
+- notificationItem.clicked(mouse) |
105 |
++ } |
106 |
++ } |
107 |
++ |
108 |
++ onClicked: { |
109 |
++ if (mouse.button === Qt.LeftButton) { |
110 |
++ var link = bodyText.linkAt(mouse.x, mouse.y) |
111 |
++ if (link) { |
112 |
++ Qt.openUrlExternally(link) |
113 |
++ } else { |
114 |
++ notificationItem.clicked(mouse) |
115 |
++ } |
116 |
+ } |
117 |
+ } |
118 |
+ |
119 |
+ PlasmaComponents.ContextMenu { |
120 |
+ id: contextMenu |
121 |
+- visualParent: parent |
122 |
+ |
123 |
+ PlasmaComponents.MenuItem { |
124 |
+ text: i18n("Copy") |
125 |
++ icon: "edit-copy" |
126 |
+ onClicked: { |
127 |
+ bodyText.selectAll() |
128 |
+ bodyText.copy() |
129 |
++ bodyText.deselect() |
130 |
+ } |
131 |
+ } |
132 |
+ } |
133 |
|
134 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild |
135 |
index 9f18cb3c6c8..939cbb96364 100644 |
136 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild |
137 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.4-r2.ebuild |
138 |
@@ -122,6 +122,8 @@ DEPEND="${COMMON_DEPEND} |
139 |
PATCHES=( |
140 |
"${FILESDIR}/${PN}-5.4-startkde-script.patch" |
141 |
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" |
142 |
+ "${FILESDIR}/${P}-ghns-https.patch" |
143 |
+ "${FILESDIR}/${P}-notifications.patch" |
144 |
"${FILESDIR}/${P}-unused-dep.patch" |
145 |
) |