1 |
commit: 16d166ea8aae5d5f4246c1ef3bdf1fd88b7e3b8d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 30 16:24:09 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 30 16:24:09 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d166ea |
7 |
|
8 |
kde-frameworks/ktexteditor: Allow changing the marker size again |
9 |
|
10 |
Fixes a regression from 5.54.0. |
11 |
|
12 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=403422 |
13 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
...exteditor-5.54.0-allow-change-marker-size.patch | 78 ++++++++++++++++++++++ |
17 |
.../ktexteditor/ktexteditor-5.54.0-r1.ebuild | 57 ++++++++++++++++ |
18 |
2 files changed, 135 insertions(+) |
19 |
|
20 |
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..032fbc99367 |
23 |
--- /dev/null |
24 |
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch |
25 |
@@ -0,0 +1,78 @@ |
26 |
+From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001 |
27 |
+From: Dominik Haumann <dhaumann@×××.org> |
28 |
+Date: Wed, 30 Jan 2019 17:16:32 +0100 |
29 |
+Subject: Fix bug 403422: Allow changing the marker size again |
30 |
+ |
31 |
+This bug was introduced with https://phabricator.kde.org/D17661 |
32 |
+with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8 |
33 |
+ |
34 |
+FIXED-IN: 5.55 |
35 |
+BUG: 403422 |
36 |
+--- |
37 |
+ src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------ |
38 |
+ 1 file changed, 21 insertions(+), 6 deletions(-) |
39 |
+ |
40 |
+diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui |
41 |
+index 02a0d54..cc44a39 100644 |
42 |
+--- a/src/dialogs/textareaappearanceconfigwidget.ui |
43 |
++++ b/src/dialogs/textareaappearanceconfigwidget.ui |
44 |
+@@ -185,10 +185,10 @@ |
45 |
+ <string>Size of the visible highlight marker.</string> |
46 |
+ </property> |
47 |
+ <property name="minimum"> |
48 |
+- <number>-1</number> |
49 |
++ <number>1</number> |
50 |
+ </property> |
51 |
+ <property name="maximum"> |
52 |
+- <number>-1</number> |
53 |
++ <number>5</number> |
54 |
+ </property> |
55 |
+ <property name="singleStep"> |
56 |
+ <number>1</number> |
57 |
+@@ -301,6 +301,21 @@ beginning of a file.</string> |
58 |
+ <header>kcombobox.h</header> |
59 |
+ </customwidget> |
60 |
+ </customwidgets> |
61 |
++ <tabstops> |
62 |
++ <tabstop>gbWordWrap</tabstop> |
63 |
++ <tabstop>chkDynWrapAtStaticMarker</tabstop> |
64 |
++ <tabstop>cmbDynamicWordWrapIndicator</tabstop> |
65 |
++ <tabstop>sbDynamicWordWrapDepth</tabstop> |
66 |
++ <tabstop>chkShowTabs</tabstop> |
67 |
++ <tabstop>chkShowSpaces</tabstop> |
68 |
++ <tabstop>sliSetMarkerSize</tabstop> |
69 |
++ <tabstop>chkShowIndentationLines</tabstop> |
70 |
++ <tabstop>chkShowWholeBracketExpression</tabstop> |
71 |
++ <tabstop>chkAnimateBracketMatching</tabstop> |
72 |
++ <tabstop>chkFoldFirstLine</tabstop> |
73 |
++ <tabstop>chkShowWordCount</tabstop> |
74 |
++ <tabstop>chkShowLineCount</tabstop> |
75 |
++ </tabstops> |
76 |
+ <resources/> |
77 |
+ <connections> |
78 |
+ <connection> |
79 |
+@@ -314,8 +329,8 @@ beginning of a file.</string> |
80 |
+ <y>7</y> |
81 |
+ </hint> |
82 |
+ <hint type="destinationlabel"> |
83 |
+- <x>340</x> |
84 |
+- <y>44</y> |
85 |
++ <x>559</x> |
86 |
++ <y>117</y> |
87 |
+ </hint> |
88 |
+ </hints> |
89 |
+ </connection> |
90 |
+@@ -330,8 +345,8 @@ beginning of a file.</string> |
91 |
+ <y>6</y> |
92 |
+ </hint> |
93 |
+ <hint type="destinationlabel"> |
94 |
+- <x>385</x> |
95 |
+- <y>72</y> |
96 |
++ <x>559</x> |
97 |
++ <y>162</y> |
98 |
+ </hint> |
99 |
+ </hints> |
100 |
+ </connection> |
101 |
+-- |
102 |
+cgit v1.1 |
103 |
+ |
104 |
|
105 |
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild |
106 |
new file mode 100644 |
107 |
index 00000000000..72fcd5e1261 |
108 |
--- /dev/null |
109 |
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild |
110 |
@@ -0,0 +1,57 @@ |
111 |
+# Copyright 1999-2019 Gentoo Authors |
112 |
+# Distributed under the terms of the GNU General Public License v2 |
113 |
+ |
114 |
+EAPI=6 |
115 |
+ |
116 |
+VIRTUALX_REQUIRED="test" |
117 |
+inherit kde5 |
118 |
+ |
119 |
+DESCRIPTION="Framework providing a full text editor component" |
120 |
+LICENSE="LGPL-2+" |
121 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
122 |
+IUSE="editorconfig git" |
123 |
+ |
124 |
+RDEPEND=" |
125 |
+ $(add_frameworks_dep karchive) |
126 |
+ $(add_frameworks_dep kauth) |
127 |
+ $(add_frameworks_dep kcodecs) |
128 |
+ $(add_frameworks_dep kcompletion) |
129 |
+ $(add_frameworks_dep kconfig) |
130 |
+ $(add_frameworks_dep kconfigwidgets) |
131 |
+ $(add_frameworks_dep kcoreaddons) |
132 |
+ $(add_frameworks_dep kguiaddons) |
133 |
+ $(add_frameworks_dep ki18n) |
134 |
+ $(add_frameworks_dep kiconthemes) |
135 |
+ $(add_frameworks_dep kio) |
136 |
+ $(add_frameworks_dep kitemviews) |
137 |
+ $(add_frameworks_dep kjobwidgets) |
138 |
+ $(add_frameworks_dep kparts) |
139 |
+ $(add_frameworks_dep ktextwidgets) |
140 |
+ $(add_frameworks_dep kwidgetsaddons) |
141 |
+ $(add_frameworks_dep kxmlgui) |
142 |
+ $(add_frameworks_dep sonnet) |
143 |
+ $(add_frameworks_dep syntax-highlighting) |
144 |
+ $(add_qt_dep qtdeclarative) |
145 |
+ $(add_qt_dep qtgui) |
146 |
+ $(add_qt_dep qtprintsupport) |
147 |
+ $(add_qt_dep qtwidgets) |
148 |
+ $(add_qt_dep qtxml) |
149 |
+ editorconfig? ( app-text/editorconfig-core-c ) |
150 |
+ git? ( dev-libs/libgit2:= ) |
151 |
+" |
152 |
+DEPEND="${RDEPEND} |
153 |
+ test? ( $(add_frameworks_dep kservice) ) |
154 |
+" |
155 |
+ |
156 |
+RESTRICT+=" test" |
157 |
+ |
158 |
+PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" ) |
159 |
+ |
160 |
+src_configure() { |
161 |
+ local mycmakeargs=( |
162 |
+ $(cmake-utils_use_find_package editorconfig EditorConfig) |
163 |
+ $(cmake-utils_use_find_package git LibGit2) |
164 |
+ ) |
165 |
+ |
166 |
+ kde5_src_configure |
167 |
+} |