Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
Date: Fri, 16 Aug 2019 22:53:00
Message-Id: 1565995952.26478b3423276f5b449087ea5b6ee0349dc3d3dc.asturm@gentoo
1 commit: 26478b3423276f5b449087ea5b6ee0349dc3d3dc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 16 22:52:32 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 16 22:52:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26478b34
7
8 app-editors/kile: Drop 2.9.92-r1
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-editors/kile/Manifest | 1 -
14 app-editors/kile/files/kile-2.9.92-cmake.patch | 25 ------
15 .../kile/files/kile-2.9.92-desktopfile.patch | 24 ------
16 app-editors/kile/files/kile-2.9.92-kcrash.patch | 49 -----------
17 .../kile/files/kile-2.9.92-kf5doctools.patch | 13 ---
18 .../kile/files/kile-2.9.92-no-empty-filename.patch | 26 ------
19 .../kile/files/kile-2.9.92-nodocfiles.patch | 29 -------
20 .../kile/files/kile-2.9.92-viewtab-crash.patch | 98 ----------------------
21 app-editors/kile/kile-2.9.92-r1.ebuild | 73 ----------------
22 9 files changed, 338 deletions(-)
23
24 diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
25 index 43d82c3058b..223d9f04686 100644
26 --- a/app-editors/kile/Manifest
27 +++ b/app-editors/kile/Manifest
28 @@ -1,2 +1 @@
29 -DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
30 DIST kile-2.9.92_p20190716.tar.xz 6176728 BLAKE2B cc6b5f12c7798c806a1e78b79c32e90a3f713d65429afbddfbf75a3a666cfbea75d32be1c2e7d15ce2e414301473f03168e84428bcec161cfd12ceeba674add3 SHA512 614d6aba168f47af41e6a352e7ad838c187945b857c19654ce40ea80c359e5d88a184f1ab02b404c022b897f8ac6f3a61323c9d1043fbb0412eb3d16690e40bb
31
32 diff --git a/app-editors/kile/files/kile-2.9.92-cmake.patch b/app-editors/kile/files/kile-2.9.92-cmake.patch
33 deleted file mode 100644
34 index 8b4837f32b9..00000000000
35 --- a/app-editors/kile/files/kile-2.9.92-cmake.patch
36 +++ /dev/null
37 @@ -1,25 +0,0 @@
38 -From 2ec4c207d380bf3b97435fdf66cdb00975a1aff3 Mon Sep 17 00:00:00 2001
39 -From: Michel Ludwig <michel.ludwig@×××××××.net>
40 -Date: Sun, 13 May 2018 11:59:06 +0200
41 -Subject: Silence CMake's CMP0071 policy warning
42 -
43 ----
44 - src/CMakeLists.txt | 3 +++
45 - 1 file changed, 3 insertions(+)
46 -
47 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
48 -index e1fdeb3..1398384 100644
49 ---- a/src/CMakeLists.txt
50 -+++ b/src/CMakeLists.txt
51 -@@ -188,6 +188,9 @@ set(kile_KCFG_SRCS kileconfig.kcfgc)
52 -
53 - kconfig_add_kcfg_files(kile_SRCS ${kile_KCFG_SRCS})
54 -
55 -+set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.h" PROPERTIES SKIP_AUTOMOC ON) # otherwise we get a warning about
56 -+set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.cpp" PROPERTIES SKIP_AUTOMOC ON) # the CMP0071 policy (with CMake 3.11)
57 -+
58 - # add icon to executable on windows and mac;
59 - # workaround: as ecm_add_app_icon and kf5_add_kdeinit_executable don't work well together,
60 - # we use a variable named 'kile' at this point
61 ---
62 -cgit v1.1
63
64 diff --git a/app-editors/kile/files/kile-2.9.92-desktopfile.patch b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
65 deleted file mode 100644
66 index 25ce2d9b423..00000000000
67 --- a/app-editors/kile/files/kile-2.9.92-desktopfile.patch
68 +++ /dev/null
69 @@ -1,24 +0,0 @@
70 -From 166f57db638dd6bd06363bc207939cabb1df9c81 Mon Sep 17 00:00:00 2001
71 -From: Antonio Rojas <arojas@×××××××××.org>
72 -Date: Mon, 14 May 2018 09:51:24 +0200
73 -Subject: Remove X-DBUS-StartupType from desktop file
74 -
75 -Fixes "KInit could not launch /usr/bin/kile" error when trying to open a tex file when kile is already running
76 -
77 -Differential Revision: https://phabricator.kde.org/D8080
78 ----
79 - src/org.kde.kile.desktop | 1 -
80 - 1 file changed, 1 deletion(-)
81 -
82 -diff --git a/src/org.kde.kile.desktop b/src/org.kde.kile.desktop
83 -index 790bb5e..6d4fe9c 100644
84 ---- a/src/org.kde.kile.desktop
85 -+++ b/src/org.kde.kile.desktop
86 -@@ -177,5 +177,4 @@ GenericName[zh_CN]=LaTeX 前端
87 - GenericName[zh_TW]=LaTeX 前端介面
88 - MimeType=text/x-tex;text/x-kilepr;
89 - Categories=Qt;KDE;Office;Publishing;
90 --X-DBUS-StartupType=Multi
91 - X-DBUS-ServiceName=net.sourceforge.kile
92 ---
93 -cgit v1.1
94
95 diff --git a/app-editors/kile/files/kile-2.9.92-kcrash.patch b/app-editors/kile/files/kile-2.9.92-kcrash.patch
96 deleted file mode 100644
97 index 6dcc869fd9d..00000000000
98 --- a/app-editors/kile/files/kile-2.9.92-kcrash.patch
99 +++ /dev/null
100 @@ -1,49 +0,0 @@
101 -From 21d62face41ffd9e858108f2d45a9abe50ba0db3 Mon Sep 17 00:00:00 2001
102 -From: Harald Sitter <sitter@×××.org>
103 -Date: Mon, 19 Nov 2018 14:00:56 +0100
104 -Subject: actually initialize kcrash properly
105 -
106 -Summary:
107 -to successfully use kcrash when linking with as-needed (which is a default
108 -flag on many linux distros) one also needs to call KCrash::initialize.
109 -
110 -without this kcrash handling is not available for most users.
111 -
112 -https://markmail.org/thread/zv5pheijaze72bzs
113 -
114 -Reviewers: mludwig
115 -
116 -Reviewed By: mludwig
117 -
118 -Subscribers: #kile
119 -
120 -Tags: #kile
121 -
122 -Differential Revision: https://phabricator.kde.org/D17011
123 ----
124 - src/main.cpp | 3 +++
125 - 1 file changed, 3 insertions(+)
126 -
127 -diff --git a/src/main.cpp b/src/main.cpp
128 -index 3b02716..bd7fef6 100644
129 ---- a/src/main.cpp
130 -+++ b/src/main.cpp
131 -@@ -25,6 +25,7 @@
132 - #include <QUrl>
133 -
134 - #include <KAboutData>
135 -+#include <KCrash>
136 - #include <KDBusService>
137 - #include <KEncodingProber>
138 - #include <KLocalizedString>
139 -@@ -128,6 +129,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
140 -
141 - KAboutData::setApplicationData(aboutData);
142 -
143 -+ KCrash::initialize();
144 -+
145 - app.setApplicationDisplayName(aboutData.displayName());
146 - app.setOrganizationDomain(aboutData.organizationDomain());
147 - app.setApplicationVersion(aboutData.version());
148 ---
149 -cgit v1.1
150
151 diff --git a/app-editors/kile/files/kile-2.9.92-kf5doctools.patch b/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
152 deleted file mode 100644
153 index 2f5a70e815a..00000000000
154 --- a/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
155 +++ /dev/null
156 @@ -1,13 +0,0 @@
157 ---- a/CMakeLists.txt 2018-05-11 20:12:37.000000000 +0200
158 -+++ b/CMakeLists.txt 2019-02-09 16:33:18.953280283 +0100
159 -@@ -125,7 +125,7 @@
160 - DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
161 -
162 - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
163 --find_package(KF5I18n CONFIG REQUIRED)
164 - ki18n_install(po)
165 --find_package(KF5DocTools CONFIG REQUIRED)
166 --kdoctools_install(po)
167 -+if(KF5DocTools_FOUND)
168 -+ kdoctools_install(po)
169 -+endif()
170
171 diff --git a/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch b/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
172 deleted file mode 100644
173 index ff742921046..00000000000
174 --- a/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
175 +++ /dev/null
176 @@ -1,26 +0,0 @@
177 -From 7cfc3f74f00d13cfb1a43f01a7dbc0be486c0d47 Mon Sep 17 00:00:00 2001
178 -From: Pino Toscano <pino@×××.org>
179 -Date: Mon, 8 Oct 2018 07:42:41 +0200
180 -Subject: User menu: do not attempt to load an empty file name
181 -
182 -Do not try to install m_currentXmlFile in case it is empty, otherwise
183 -QFile will (rightfully) warn that an empty file was passed.
184 ----
185 - src/usermenu/usermenu.cpp | 2 +-
186 - 1 file changed, 1 insertion(+), 1 deletion(-)
187 -
188 -diff --git a/src/usermenu/usermenu.cpp b/src/usermenu/usermenu.cpp
189 -index 7d1d5f5..f9e3d3c 100644
190 ---- a/src/usermenu/usermenu.cpp
191 -+++ b/src/usermenu/usermenu.cpp
192 -@@ -190,7 +190,7 @@ void UserMenu::updateGUI()
193 - clear();
194 -
195 - // then install
196 -- if(installXml(m_currentXmlFile)) {
197 -+ if(!m_currentXmlFile.isEmpty() && installXml(m_currentXmlFile)) {
198 - // add changed context menu to all existing views
199 - KileView::Manager* viewManager = m_ki->viewManager();
200 - int views = viewManager->textViewCount();
201 ---
202 -cgit v1.1
203
204 diff --git a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
205 deleted file mode 100644
206 index 6687e4f0e9f..00000000000
207 --- a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
208 +++ /dev/null
209 @@ -1,29 +0,0 @@
210 -From 03e7b00321c5474330c97812b4e6a6550e54931c Mon Sep 17 00:00:00 2001
211 -From: Andreas Sturmlechner <asturm@g.o>
212 -Date: Wed, 19 Dec 2018 13:36:12 +0100
213 -Subject: [PATCH] Disable install misc files by cmake
214 -
215 -AUTHORS, README, Changelog etc. are handled by distribution packages.
216 ----
217 - CMakeLists.txt | 8 --------
218 - 1 file changed, 8 deletions(-)
219 -
220 -diff --git a/CMakeLists.txt b/CMakeLists.txt
221 -index f4a278e1..bb78d839 100644
222 ---- a/CMakeLists.txt
223 -+++ b/CMakeLists.txt
224 -@@ -117,11 +117,4 @@ install(
225 - DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
226 -
227 --install(FILES
228 -- AUTHORS
229 -- ChangeLog
230 -- README
231 -- README.cwl
232 -- kile-remote-control.txt
233 -- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
234 -
235 - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
236 ---
237 -2.20.1
238 -
239
240 diff --git a/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch b/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
241 deleted file mode 100644
242 index 2167e75cbf1..00000000000
243 --- a/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
244 +++ /dev/null
245 @@ -1,98 +0,0 @@
246 -From f9de688e223be3b77268d36e237a838555d0f533 Mon Sep 17 00:00:00 2001
247 -From: Michel Ludwig <michel.ludwig@×××××××.net>
248 -Date: Sun, 28 Oct 2018 19:58:22 +0100
249 -Subject: Search for the 'file_save_copy_as' action inside 'KTextEditor::View'
250 - now
251 -
252 -In that way, Kile doesn't crash after right-clicking on a view tab
253 -
254 -BUG: 400191
255 ----
256 - src/kileviewmanager.cpp | 47 +++++++++++++++++++++++++++++------------------
257 - 1 file changed, 29 insertions(+), 18 deletions(-)
258 -
259 -diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
260 -index c0b8254..34f8439 100644
261 ---- a/src/kileviewmanager.cpp
262 -+++ b/src/kileviewmanager.cpp
263 -@@ -506,39 +506,52 @@ void Manager::tabContext(const QPoint &pos)
264 -
265 - // 'action1' can become null if it belongs to a view that has been closed, for example
266 - QPointer<QAction> action1 = m_ki->mainWindow()->action("move_view_tab_left");
267 -- action1->setData(qVariantFromValue(view));
268 -- tabMenu.addAction(action1);
269 -+ if(action1) {
270 -+ action1->setData(qVariantFromValue(view));
271 -+ tabMenu.addAction(action1);
272 -+ }
273 -
274 - QPointer<QAction> action2 = m_ki->mainWindow()->action("move_view_tab_right");
275 -- action2->setData(qVariantFromValue(view));
276 -- tabMenu.addAction(action2);
277 -+ if(action2) {
278 -+ action2->setData(qVariantFromValue(view));
279 -+ tabMenu.addAction(action2);
280 -+ }
281 -
282 - tabMenu.addSeparator();
283 -
284 - QPointer<QAction> action3;
285 - if(view->document()->isModified()) {
286 - action3 = view->actionCollection()->action(KStandardAction::name(KStandardAction::Save));
287 -- action3->setData(qVariantFromValue(view));
288 -- tabMenu.addAction(action3);
289 -+ if(action3) {
290 -+ action3->setData(qVariantFromValue(view));
291 -+ tabMenu.addAction(action3);
292 -+ }
293 - }
294 -
295 - QPointer<QAction> action4 = view->actionCollection()->action(KStandardAction::name(KStandardAction::SaveAs));
296 -- action4->setData(qVariantFromValue(view));
297 -- tabMenu.addAction(action4);
298 -+ if(action4) {
299 -+ action4->setData(qVariantFromValue(view));
300 -+ tabMenu.addAction(action4);
301 -+ }
302 -
303 -- QPointer<QAction> action5 = m_ki->mainWindow()->action("file_save_copy_as");
304 -- action5->setData(qVariantFromValue(view));
305 -- tabMenu.addAction(action5);
306 -+ QPointer<QAction> action5 = view->action("file_save_copy_as");
307 -+ if(action5) {
308 -+ tabMenu.addAction(action5);
309 -+ }
310 -
311 - tabMenu.addSeparator();
312 -
313 - QPointer<QAction> action6 = m_ki->mainWindow()->action("file_close");
314 -- action6->setData(qVariantFromValue(view));
315 -- tabMenu.addAction(action6);
316 -+ if(action6) {
317 -+ action6->setData(qVariantFromValue(view));
318 -+ tabMenu.addAction(action6);
319 -+ }
320 -
321 - QPointer<QAction> action7 = m_ki->mainWindow()->action("file_close_all_others");
322 -- action7->setData(qVariantFromValue(view));
323 -- tabMenu.addAction(action7);
324 -+ if(action7) {
325 -+ action7->setData(qVariantFromValue(view));
326 -+ tabMenu.addAction(action7);
327 -+ }
328 - /*
329 - FIXME create proper actions which delete/add the current file without asking stupidly
330 - QAction* removeAction = m_ki->mainWindow()->action("project_remove");
331 -@@ -562,9 +575,7 @@ void Manager::tabContext(const QPoint &pos)
332 - if(action4) {
333 - action4->setData(QVariant());
334 - }
335 -- if(action5) {
336 -- action5->setData(QVariant());
337 -- }
338 -+ // action5 doesn't need to be given extra data
339 - if(action6) {
340 - action6->setData(QVariant());
341 - }
342 ---
343 -cgit v1.1
344
345 diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
346 deleted file mode 100644
347 index 7851f51335c..00000000000
348 --- a/app-editors/kile/kile-2.9.92-r1.ebuild
349 +++ /dev/null
350 @@ -1,73 +0,0 @@
351 -# Copyright 1999-2019 Gentoo Authors
352 -# Distributed under the terms of the GNU General Public License v2
353 -
354 -EAPI=6
355 -
356 -KDE_HANDBOOK="forceoptional"
357 -inherit kde5
358 -
359 -DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
360 -HOMEPAGE="https://kile.sourceforge.io/"
361 -[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
362 -
363 -LICENSE="FDL-1.2 GPL-2"
364 -KEYWORDS="amd64 x86"
365 -IUSE="+pdf +png"
366 -
367 -DEPEND="
368 - $(add_frameworks_dep kconfig)
369 - $(add_frameworks_dep kcoreaddons)
370 - $(add_frameworks_dep kcrash)
371 - $(add_frameworks_dep kdbusaddons)
372 - $(add_frameworks_dep kguiaddons)
373 - $(add_frameworks_dep khtml)
374 - $(add_frameworks_dep ki18n)
375 - $(add_frameworks_dep kiconthemes)
376 - $(add_frameworks_dep kinit)
377 - $(add_frameworks_dep kio)
378 - $(add_frameworks_dep kparts)
379 - $(add_frameworks_dep ktexteditor)
380 - $(add_frameworks_dep kwindowsystem)
381 - $(add_frameworks_dep kxmlgui)
382 - $(add_kdeapps_dep okular)
383 - $(add_qt_dep qtdbus)
384 - $(add_qt_dep qtscript)
385 - $(add_qt_dep qttest)
386 - $(add_qt_dep qtwidgets)
387 - pdf? ( app-text/poppler[qt5] )
388 -"
389 -RDEPEND="${DEPEND}
390 - !app-editors/kile:4
391 - $(add_kdeapps_dep konsole)
392 - $(add_kdeapps_dep okular 'pdf?')
393 - virtual/latex-base
394 - virtual/tex-base
395 - pdf? (
396 - >=app-text/texlive-core-2014
397 - app-text/ghostscript-gpl
398 - )
399 - png? (
400 - app-text/dvipng
401 - virtual/imagemagick-tools[png?]
402 - )
403 -"
404 -
405 -DOCS=( AUTHORS ChangeLog kile-remote-control.txt README README.cwl )
406 -
407 -PATCHES=(
408 - "${FILESDIR}/${P}-cmake.patch"
409 - "${FILESDIR}/${P}-kf5doctools.patch"
410 - "${FILESDIR}/${P}-desktopfile.patch"
411 - "${FILESDIR}/${P}-no-empty-filename.patch"
412 - "${FILESDIR}/${P}-viewtab-crash.patch"
413 - "${FILESDIR}/${P}-kcrash.patch"
414 - "${FILESDIR}/${P}-nodocfiles.patch"
415 -)
416 -
417 -src_configure() {
418 - local mycmakeargs=(
419 - $(cmake-utils_use_find_package pdf Poppler)
420 - )
421 -
422 - kde5_src_configure
423 -}