Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/oxygen/files/, kde-plasma/oxygen/
Date: Wed, 12 Sep 2018 11:04:35
Message-Id: 1536750206.9d72b9cc56d6c34c819ba50b6c92d1e4c44752bc.asturm@gentoo
1 commit: 9d72b9cc56d6c34c819ba50b6c92d1e4c44752bc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 12 11:02:32 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 12 11:03:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d72b9cc
7
8 kde-plasma/oxygen: Fix incorrect symlinks
9
10 Closes: https://bugs.gentoo.org/629550
11 Package-Manager: Portage-2.3.49, Repoman-2.3.10
12
13 .../oxygen/files/oxygen-5.13.5-symlinks.patch | 162 +++++++++++++++++++++
14 kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild | 48 ++++++
15 2 files changed, 210 insertions(+)
16
17 diff --git a/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch b/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch
18 new file mode 100644
19 index 00000000000..755ddde8cd3
20 --- /dev/null
21 +++ b/kde-plasma/oxygen/files/oxygen-5.13.5-symlinks.patch
22 @@ -0,0 +1,162 @@
23 +From 5bf9dfe906b50f2455210a29a00ec5494d8e26b7 Mon Sep 17 00:00:00 2001
24 +From: Jack Ostroff <ostroffjh@×××××××××××××××××.net>
25 +Date: Thu, 30 Aug 2018 19:02:11 -0400
26 +Subject: Correcting symlinks between col- and row-resize and split_v and _h
27 + cursors
28 +
29 +Summary: BUG: 384864
30 +
31 +Reviewers: #plasma, apol, cfeck
32 +
33 +Reviewed By: cfeck
34 +
35 +Subscribers: davidedmundson, rdieter, tfoster, apol, asturmlechner, cfeck, plasma-devel
36 +
37 +Tags: #plasma
38 +
39 +Differential Revision: https://phabricator.kde.org/D8267
40 +---
41 + cursors/KDE_Classic/cursors/col-resize | 2 +-
42 + cursors/KDE_Classic/cursors/row-resize | 2 +-
43 + cursors/Oxygen_Black/cursors/col-resize | 2 +-
44 + cursors/Oxygen_Black/cursors/row-resize | 2 +-
45 + cursors/Oxygen_Blue/cursors/col-resize | 2 +-
46 + cursors/Oxygen_Blue/cursors/row-resize | 2 +-
47 + cursors/Oxygen_White/cursors/col-resize | 2 +-
48 + cursors/Oxygen_White/cursors/row-resize | 2 +-
49 + cursors/Oxygen_Yellow/cursors/col-resize | 2 +-
50 + cursors/Oxygen_Yellow/cursors/row-resize | 2 +-
51 + cursors/Oxygen_Zion/cursors/col-resize | 2 +-
52 + cursors/Oxygen_Zion/cursors/row-resize | 2 +-
53 + cursors/src/symlinks/col-resize | 2 +-
54 + cursors/src/symlinks/row-resize | 2 +-
55 + 14 files changed, 14 insertions(+), 14 deletions(-)
56 +
57 +diff --git a/cursors/KDE_Classic/cursors/col-resize b/cursors/KDE_Classic/cursors/col-resize
58 +index 179b52b..e3aa748 120000
59 +--- a/cursors/KDE_Classic/cursors/col-resize
60 ++++ b/cursors/KDE_Classic/cursors/col-resize
61 +@@ -1 +1 @@
62 +-split_v
63 +\ No newline at end of file
64 ++split_h
65 +\ No newline at end of file
66 +diff --git a/cursors/KDE_Classic/cursors/row-resize b/cursors/KDE_Classic/cursors/row-resize
67 +index e3aa748..179b52b 120000
68 +--- a/cursors/KDE_Classic/cursors/row-resize
69 ++++ b/cursors/KDE_Classic/cursors/row-resize
70 +@@ -1 +1 @@
71 +-split_h
72 +\ No newline at end of file
73 ++split_v
74 +\ No newline at end of file
75 +diff --git a/cursors/Oxygen_Black/cursors/col-resize b/cursors/Oxygen_Black/cursors/col-resize
76 +index 179b52b..e3aa748 120000
77 +--- a/cursors/Oxygen_Black/cursors/col-resize
78 ++++ b/cursors/Oxygen_Black/cursors/col-resize
79 +@@ -1 +1 @@
80 +-split_v
81 +\ No newline at end of file
82 ++split_h
83 +\ No newline at end of file
84 +diff --git a/cursors/Oxygen_Black/cursors/row-resize b/cursors/Oxygen_Black/cursors/row-resize
85 +index e3aa748..179b52b 120000
86 +--- a/cursors/Oxygen_Black/cursors/row-resize
87 ++++ b/cursors/Oxygen_Black/cursors/row-resize
88 +@@ -1 +1 @@
89 +-split_h
90 +\ No newline at end of file
91 ++split_v
92 +\ No newline at end of file
93 +diff --git a/cursors/Oxygen_Blue/cursors/col-resize b/cursors/Oxygen_Blue/cursors/col-resize
94 +index 179b52b..e3aa748 120000
95 +--- a/cursors/Oxygen_Blue/cursors/col-resize
96 ++++ b/cursors/Oxygen_Blue/cursors/col-resize
97 +@@ -1 +1 @@
98 +-split_v
99 +\ No newline at end of file
100 ++split_h
101 +\ No newline at end of file
102 +diff --git a/cursors/Oxygen_Blue/cursors/row-resize b/cursors/Oxygen_Blue/cursors/row-resize
103 +index e3aa748..179b52b 120000
104 +--- a/cursors/Oxygen_Blue/cursors/row-resize
105 ++++ b/cursors/Oxygen_Blue/cursors/row-resize
106 +@@ -1 +1 @@
107 +-split_h
108 +\ No newline at end of file
109 ++split_v
110 +\ No newline at end of file
111 +diff --git a/cursors/Oxygen_White/cursors/col-resize b/cursors/Oxygen_White/cursors/col-resize
112 +index 179b52b..e3aa748 120000
113 +--- a/cursors/Oxygen_White/cursors/col-resize
114 ++++ b/cursors/Oxygen_White/cursors/col-resize
115 +@@ -1 +1 @@
116 +-split_v
117 +\ No newline at end of file
118 ++split_h
119 +\ No newline at end of file
120 +diff --git a/cursors/Oxygen_White/cursors/row-resize b/cursors/Oxygen_White/cursors/row-resize
121 +index e3aa748..179b52b 120000
122 +--- a/cursors/Oxygen_White/cursors/row-resize
123 ++++ b/cursors/Oxygen_White/cursors/row-resize
124 +@@ -1 +1 @@
125 +-split_h
126 +\ No newline at end of file
127 ++split_v
128 +\ No newline at end of file
129 +diff --git a/cursors/Oxygen_Yellow/cursors/col-resize b/cursors/Oxygen_Yellow/cursors/col-resize
130 +index 179b52b..e3aa748 120000
131 +--- a/cursors/Oxygen_Yellow/cursors/col-resize
132 ++++ b/cursors/Oxygen_Yellow/cursors/col-resize
133 +@@ -1 +1 @@
134 +-split_v
135 +\ No newline at end of file
136 ++split_h
137 +\ No newline at end of file
138 +diff --git a/cursors/Oxygen_Yellow/cursors/row-resize b/cursors/Oxygen_Yellow/cursors/row-resize
139 +index e3aa748..179b52b 120000
140 +--- a/cursors/Oxygen_Yellow/cursors/row-resize
141 ++++ b/cursors/Oxygen_Yellow/cursors/row-resize
142 +@@ -1 +1 @@
143 +-split_h
144 +\ No newline at end of file
145 ++split_v
146 +\ No newline at end of file
147 +diff --git a/cursors/Oxygen_Zion/cursors/col-resize b/cursors/Oxygen_Zion/cursors/col-resize
148 +index 179b52b..e3aa748 120000
149 +--- a/cursors/Oxygen_Zion/cursors/col-resize
150 ++++ b/cursors/Oxygen_Zion/cursors/col-resize
151 +@@ -1 +1 @@
152 +-split_v
153 +\ No newline at end of file
154 ++split_h
155 +\ No newline at end of file
156 +diff --git a/cursors/Oxygen_Zion/cursors/row-resize b/cursors/Oxygen_Zion/cursors/row-resize
157 +index e3aa748..179b52b 120000
158 +--- a/cursors/Oxygen_Zion/cursors/row-resize
159 ++++ b/cursors/Oxygen_Zion/cursors/row-resize
160 +@@ -1 +1 @@
161 +-split_h
162 +\ No newline at end of file
163 ++split_v
164 +\ No newline at end of file
165 +diff --git a/cursors/src/symlinks/col-resize b/cursors/src/symlinks/col-resize
166 +index 179b52b..e3aa748 120000
167 +--- a/cursors/src/symlinks/col-resize
168 ++++ b/cursors/src/symlinks/col-resize
169 +@@ -1 +1 @@
170 +-split_v
171 +\ No newline at end of file
172 ++split_h
173 +\ No newline at end of file
174 +diff --git a/cursors/src/symlinks/row-resize b/cursors/src/symlinks/row-resize
175 +index e3aa748..179b52b 120000
176 +--- a/cursors/src/symlinks/row-resize
177 ++++ b/cursors/src/symlinks/row-resize
178 +@@ -1 +1 @@
179 +-split_h
180 +\ No newline at end of file
181 ++split_v
182 +\ No newline at end of file
183 +--
184 +cgit v0.11.2
185
186 diff --git a/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
187 new file mode 100644
188 index 00000000000..607c3ab579a
189 --- /dev/null
190 +++ b/kde-plasma/oxygen/oxygen-5.13.5-r1.ebuild
191 @@ -0,0 +1,48 @@
192 +# Copyright 1999-2018 Gentoo Foundation
193 +# Distributed under the terms of the GNU General Public License v2
194 +
195 +EAPI=6
196 +
197 +inherit kde5
198 +
199 +DESCRIPTION="Oxygen visual style for the Plasma desktop"
200 +HOMEPAGE="https://cgit.kde.org/oxygen.git"
201 +KEYWORDS="~amd64 ~arm ~x86"
202 +IUSE="wayland"
203 +
204 +COMMON_DEPEND="
205 + $(add_frameworks_dep frameworkintegration)
206 + $(add_frameworks_dep kcmutils)
207 + $(add_frameworks_dep kcompletion)
208 + $(add_frameworks_dep kconfig)
209 + $(add_frameworks_dep kconfigwidgets)
210 + $(add_frameworks_dep kcoreaddons)
211 + $(add_frameworks_dep kguiaddons)
212 + $(add_frameworks_dep ki18n)
213 + $(add_frameworks_dep kwidgetsaddons)
214 + $(add_frameworks_dep kwindowsystem)
215 + $(add_plasma_dep kdecoration)
216 + $(add_qt_dep qtdbus)
217 + $(add_qt_dep qtdeclarative)
218 + $(add_qt_dep qtgui)
219 + $(add_qt_dep qtwidgets)
220 + $(add_qt_dep qtx11extras)
221 + x11-libs/libxcb
222 + wayland? ( $(add_frameworks_dep kwayland) )
223 +"
224 +DEPEND="${COMMON_DEPEND}
225 + $(add_frameworks_dep kservice)
226 +"
227 +RDEPEND="${COMMON_DEPEND}
228 + $(add_plasma_dep kde-cli-tools)
229 + !kde-plasma/kdebase-cursors:4
230 +"
231 +
232 +PATCHES=( "${FILESDIR}/${P}-symlinks.patch" )
233 +
234 +src_configure() {
235 + local mycmakeargs=(
236 + $(cmake-utils_use_find_package wayland KF5Wayland)
237 + )
238 + kde5_src_configure
239 +}