* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2018-12-19 13:01 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-12-19 13:01 UTC (permalink / raw
To: gentoo-commits
commit: fa657ca5f61b7a3ad635b71cf0650b2705685366
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 13:00:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 13:00:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa657ca5
app-editors/kile: Assorted fixes while upstream fails to release
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/files/kile-2.9.92-cmake.patch | 25 ++++++
.../kile/files/kile-2.9.92-desktopfile.patch | 24 ++++++
app-editors/kile/files/kile-2.9.92-kcrash.patch | 49 +++++++++++
.../kile/files/kile-2.9.92-no-empty-filename.patch | 26 ++++++
.../kile/files/kile-2.9.92-nodocfiles.patch | 29 +++++++
.../kile/files/kile-2.9.92-viewtab-crash.patch | 98 ++++++++++++++++++++++
app-editors/kile/kile-2.9.92-r1.ebuild | 73 ++++++++++++++++
7 files changed, 324 insertions(+)
diff --git a/app-editors/kile/files/kile-2.9.92-cmake.patch b/app-editors/kile/files/kile-2.9.92-cmake.patch
new file mode 100644
index 00000000000..8b4837f32b9
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-cmake.patch
@@ -0,0 +1,25 @@
+From 2ec4c207d380bf3b97435fdf66cdb00975a1aff3 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 13 May 2018 11:59:06 +0200
+Subject: Silence CMake's CMP0071 policy warning
+
+---
+ src/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e1fdeb3..1398384 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -188,6 +188,9 @@ set(kile_KCFG_SRCS kileconfig.kcfgc)
+
+ kconfig_add_kcfg_files(kile_SRCS ${kile_KCFG_SRCS})
+
++set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.h" PROPERTIES SKIP_AUTOMOC ON) # otherwise we get a warning about
++set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.cpp" PROPERTIES SKIP_AUTOMOC ON) # the CMP0071 policy (with CMake 3.11)
++
+ # add icon to executable on windows and mac;
+ # workaround: as ecm_add_app_icon and kf5_add_kdeinit_executable don't work well together,
+ # we use a variable named 'kile' at this point
+--
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-desktopfile.patch b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
new file mode 100644
index 00000000000..25ce2d9b423
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
@@ -0,0 +1,24 @@
+From 166f57db638dd6bd06363bc207939cabb1df9c81 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 14 May 2018 09:51:24 +0200
+Subject: Remove X-DBUS-StartupType from desktop file
+
+Fixes "KInit could not launch /usr/bin/kile" error when trying to open a tex file when kile is already running
+
+Differential Revision: https://phabricator.kde.org/D8080
+---
+ src/org.kde.kile.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/org.kde.kile.desktop b/src/org.kde.kile.desktop
+index 790bb5e..6d4fe9c 100644
+--- a/src/org.kde.kile.desktop
++++ b/src/org.kde.kile.desktop
+@@ -177,5 +177,4 @@ GenericName[zh_CN]=LaTeX 前端
+ GenericName[zh_TW]=LaTeX 前端介面
+ MimeType=text/x-tex;text/x-kilepr;
+ Categories=Qt;KDE;Office;Publishing;
+-X-DBUS-StartupType=Multi
+ X-DBUS-ServiceName=net.sourceforge.kile
+--
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-kcrash.patch b/app-editors/kile/files/kile-2.9.92-kcrash.patch
new file mode 100644
index 00000000000..6dcc869fd9d
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-kcrash.patch
@@ -0,0 +1,49 @@
+From 21d62face41ffd9e858108f2d45a9abe50ba0db3 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 19 Nov 2018 14:00:56 +0100
+Subject: actually initialize kcrash properly
+
+Summary:
+to successfully use kcrash when linking with as-needed (which is a default
+flag on many linux distros) one also needs to call KCrash::initialize.
+
+without this kcrash handling is not available for most users.
+
+https://markmail.org/thread/zv5pheijaze72bzs
+
+Reviewers: mludwig
+
+Reviewed By: mludwig
+
+Subscribers: #kile
+
+Tags: #kile
+
+Differential Revision: https://phabricator.kde.org/D17011
+---
+ src/main.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 3b02716..bd7fef6 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -25,6 +25,7 @@
+ #include <QUrl>
+
+ #include <KAboutData>
++#include <KCrash>
+ #include <KDBusService>
+ #include <KEncodingProber>
+ #include <KLocalizedString>
+@@ -128,6 +129,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+
+ KAboutData::setApplicationData(aboutData);
+
++ KCrash::initialize();
++
+ app.setApplicationDisplayName(aboutData.displayName());
+ app.setOrganizationDomain(aboutData.organizationDomain());
+ app.setApplicationVersion(aboutData.version());
+--
+cgit v1.1
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
new file mode 100644
index 00000000000..ff742921046
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
@@ -0,0 +1,26 @@
+From 7cfc3f74f00d13cfb1a43f01a7dbc0be486c0d47 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Mon, 8 Oct 2018 07:42:41 +0200
+Subject: User menu: do not attempt to load an empty file name
+
+Do not try to install m_currentXmlFile in case it is empty, otherwise
+QFile will (rightfully) warn that an empty file was passed.
+---
+ src/usermenu/usermenu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usermenu/usermenu.cpp b/src/usermenu/usermenu.cpp
+index 7d1d5f5..f9e3d3c 100644
+--- a/src/usermenu/usermenu.cpp
++++ b/src/usermenu/usermenu.cpp
+@@ -190,7 +190,7 @@ void UserMenu::updateGUI()
+ clear();
+
+ // then install
+- if(installXml(m_currentXmlFile)) {
++ if(!m_currentXmlFile.isEmpty() && installXml(m_currentXmlFile)) {
+ // add changed context menu to all existing views
+ KileView::Manager* viewManager = m_ki->viewManager();
+ int views = viewManager->textViewCount();
+--
+cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
new file mode 100644
index 00000000000..6687e4f0e9f
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
@@ -0,0 +1,29 @@
+From 03e7b00321c5474330c97812b4e6a6550e54931c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Dec 2018 13:36:12 +0100
+Subject: [PATCH] Disable install misc files by cmake
+
+AUTHORS, README, Changelog etc. are handled by distribution packages.
+---
+ CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4a278e1..bb78d839 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,11 +117,4 @@ install(
+ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+
+-install(FILES
+- AUTHORS
+- ChangeLog
+- README
+- README.cwl
+- kile-remote-control.txt
+- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.20.1
+
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
new file mode 100644
index 00000000000..2167e75cbf1
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
@@ -0,0 +1,98 @@
+From f9de688e223be3b77268d36e237a838555d0f533 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 28 Oct 2018 19:58:22 +0100
+Subject: Search for the 'file_save_copy_as' action inside 'KTextEditor::View'
+ now
+
+In that way, Kile doesn't crash after right-clicking on a view tab
+
+BUG: 400191
+---
+ src/kileviewmanager.cpp | 47 +++++++++++++++++++++++++++++------------------
+ 1 file changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
+index c0b8254..34f8439 100644
+--- a/src/kileviewmanager.cpp
++++ b/src/kileviewmanager.cpp
+@@ -506,39 +506,52 @@ void Manager::tabContext(const QPoint &pos)
+
+ // 'action1' can become null if it belongs to a view that has been closed, for example
+ QPointer<QAction> action1 = m_ki->mainWindow()->action("move_view_tab_left");
+- action1->setData(qVariantFromValue(view));
+- tabMenu.addAction(action1);
++ if(action1) {
++ action1->setData(qVariantFromValue(view));
++ tabMenu.addAction(action1);
++ }
+
+ QPointer<QAction> action2 = m_ki->mainWindow()->action("move_view_tab_right");
+- action2->setData(qVariantFromValue(view));
+- tabMenu.addAction(action2);
++ if(action2) {
++ action2->setData(qVariantFromValue(view));
++ tabMenu.addAction(action2);
++ }
+
+ tabMenu.addSeparator();
+
+ QPointer<QAction> action3;
+ if(view->document()->isModified()) {
+ action3 = view->actionCollection()->action(KStandardAction::name(KStandardAction::Save));
+- action3->setData(qVariantFromValue(view));
+- tabMenu.addAction(action3);
++ if(action3) {
++ action3->setData(qVariantFromValue(view));
++ tabMenu.addAction(action3);
++ }
+ }
+
+ QPointer<QAction> action4 = view->actionCollection()->action(KStandardAction::name(KStandardAction::SaveAs));
+- action4->setData(qVariantFromValue(view));
+- tabMenu.addAction(action4);
++ if(action4) {
++ action4->setData(qVariantFromValue(view));
++ tabMenu.addAction(action4);
++ }
+
+- QPointer<QAction> action5 = m_ki->mainWindow()->action("file_save_copy_as");
+- action5->setData(qVariantFromValue(view));
+- tabMenu.addAction(action5);
++ QPointer<QAction> action5 = view->action("file_save_copy_as");
++ if(action5) {
++ tabMenu.addAction(action5);
++ }
+
+ tabMenu.addSeparator();
+
+ QPointer<QAction> action6 = m_ki->mainWindow()->action("file_close");
+- action6->setData(qVariantFromValue(view));
+- tabMenu.addAction(action6);
++ if(action6) {
++ action6->setData(qVariantFromValue(view));
++ tabMenu.addAction(action6);
++ }
+
+ QPointer<QAction> action7 = m_ki->mainWindow()->action("file_close_all_others");
+- action7->setData(qVariantFromValue(view));
+- tabMenu.addAction(action7);
++ if(action7) {
++ action7->setData(qVariantFromValue(view));
++ tabMenu.addAction(action7);
++ }
+ /*
+ FIXME create proper actions which delete/add the current file without asking stupidly
+ QAction* removeAction = m_ki->mainWindow()->action("project_remove");
+@@ -562,9 +575,7 @@ void Manager::tabContext(const QPoint &pos)
+ if(action4) {
+ action4->setData(QVariant());
+ }
+- if(action5) {
+- action5->setData(QVariant());
+- }
++ // action5 doesn't need to be given extra data
+ if(action6) {
+ action6->setData(QVariant());
+ }
+--
+cgit v1.1
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
new file mode 100644
index 00000000000..98f5a152873
--- /dev/null
+++ b/app-editors/kile/kile-2.9.92-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://kile.sourceforge.io/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="FDL-1.2 GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep okular)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwidgets)
+ pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+ !app-editors/kile:4
+ $(add_kdeapps_dep konsole)
+ $(add_kdeapps_dep okular 'pdf?')
+ virtual/latex-base
+ virtual/tex-base
+ pdf? (
+ >=app-text/texlive-core-2014
+ app-text/ghostscript-gpl
+ )
+ png? (
+ app-text/dvipng
+ virtual/imagemagick-tools[png?]
+ )
+"
+
+DOCS=( AUTHORS ChangeLog kile-remote-control.txt README README.cwl )
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-desktopfile.patch"
+ "${FILESDIR}/${P}-no-empty-filename.patch"
+ "${FILESDIR}/${P}-viewtab-crash.patch"
+ "${FILESDIR}/${P}-kcrash.patch"
+ "${FILESDIR}/${P}-nodocfiles.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package pdf Poppler)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2019-02-09 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-02-09 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 5ffc52eb5d798a0fce8647f8b87e0459148849c2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 9 15:37:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 16:06:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffc52eb
app-editors/kile: Patch to make KF5DocTools really optional
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/files/kile-2.9.92-kf5doctools.patch | 13 +++++++++++++
app-editors/kile/kile-2.9.92-r1.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app-editors/kile/files/kile-2.9.92-kf5doctools.patch b/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
new file mode 100644
index 00000000000..2f5a70e815a
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2018-05-11 20:12:37.000000000 +0200
++++ b/CMakeLists.txt 2019-02-09 16:33:18.953280283 +0100
+@@ -125,7 +125,7 @@
+ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
+-find_package(KF5DocTools CONFIG REQUIRED)
+-kdoctools_install(po)
++if(KF5DocTools_FOUND)
++ kdoctools_install(po)
++endif()
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
index 97b4fd675bf..7851f51335c 100644
--- a/app-editors/kile/kile-2.9.92-r1.ebuild
+++ b/app-editors/kile/kile-2.9.92-r1.ebuild
@@ -19,7 +19,6 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdoctools)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
@@ -57,6 +56,7 @@ DOCS=( AUTHORS ChangeLog kile-remote-control.txt README README.cwl )
PATCHES=(
"${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-kf5doctools.patch"
"${FILESDIR}/${P}-desktopfile.patch"
"${FILESDIR}/${P}-no-empty-filename.patch"
"${FILESDIR}/${P}-viewtab-crash.patch"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2019-08-16 22:52 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-08-16 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 26478b3423276f5b449087ea5b6ee0349dc3d3dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 22:52:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 22:52:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26478b34
app-editors/kile: Drop 2.9.92-r1
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/Manifest | 1 -
app-editors/kile/files/kile-2.9.92-cmake.patch | 25 ------
.../kile/files/kile-2.9.92-desktopfile.patch | 24 ------
app-editors/kile/files/kile-2.9.92-kcrash.patch | 49 -----------
.../kile/files/kile-2.9.92-kf5doctools.patch | 13 ---
.../kile/files/kile-2.9.92-no-empty-filename.patch | 26 ------
.../kile/files/kile-2.9.92-nodocfiles.patch | 29 -------
.../kile/files/kile-2.9.92-viewtab-crash.patch | 98 ----------------------
app-editors/kile/kile-2.9.92-r1.ebuild | 73 ----------------
9 files changed, 338 deletions(-)
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 43d82c3058b..223d9f04686 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1 @@
-DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
DIST kile-2.9.92_p20190716.tar.xz 6176728 BLAKE2B cc6b5f12c7798c806a1e78b79c32e90a3f713d65429afbddfbf75a3a666cfbea75d32be1c2e7d15ce2e414301473f03168e84428bcec161cfd12ceeba674add3 SHA512 614d6aba168f47af41e6a352e7ad838c187945b857c19654ce40ea80c359e5d88a184f1ab02b404c022b897f8ac6f3a61323c9d1043fbb0412eb3d16690e40bb
diff --git a/app-editors/kile/files/kile-2.9.92-cmake.patch b/app-editors/kile/files/kile-2.9.92-cmake.patch
deleted file mode 100644
index 8b4837f32b9..00000000000
--- a/app-editors/kile/files/kile-2.9.92-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2ec4c207d380bf3b97435fdf66cdb00975a1aff3 Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 13 May 2018 11:59:06 +0200
-Subject: Silence CMake's CMP0071 policy warning
-
----
- src/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e1fdeb3..1398384 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -188,6 +188,9 @@ set(kile_KCFG_SRCS kileconfig.kcfgc)
-
- kconfig_add_kcfg_files(kile_SRCS ${kile_KCFG_SRCS})
-
-+set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.h" PROPERTIES SKIP_AUTOMOC ON) # otherwise we get a warning about
-+set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/kileconfig.cpp" PROPERTIES SKIP_AUTOMOC ON) # the CMP0071 policy (with CMake 3.11)
-+
- # add icon to executable on windows and mac;
- # workaround: as ecm_add_app_icon and kf5_add_kdeinit_executable don't work well together,
- # we use a variable named 'kile' at this point
---
-cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-desktopfile.patch b/app-editors/kile/files/kile-2.9.92-desktopfile.patch
deleted file mode 100644
index 25ce2d9b423..00000000000
--- a/app-editors/kile/files/kile-2.9.92-desktopfile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 166f57db638dd6bd06363bc207939cabb1df9c81 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 14 May 2018 09:51:24 +0200
-Subject: Remove X-DBUS-StartupType from desktop file
-
-Fixes "KInit could not launch /usr/bin/kile" error when trying to open a tex file when kile is already running
-
-Differential Revision: https://phabricator.kde.org/D8080
----
- src/org.kde.kile.desktop | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/org.kde.kile.desktop b/src/org.kde.kile.desktop
-index 790bb5e..6d4fe9c 100644
---- a/src/org.kde.kile.desktop
-+++ b/src/org.kde.kile.desktop
-@@ -177,5 +177,4 @@ GenericName[zh_CN]=LaTeX 前端
- GenericName[zh_TW]=LaTeX 前端介面
- MimeType=text/x-tex;text/x-kilepr;
- Categories=Qt;KDE;Office;Publishing;
--X-DBUS-StartupType=Multi
- X-DBUS-ServiceName=net.sourceforge.kile
---
-cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-kcrash.patch b/app-editors/kile/files/kile-2.9.92-kcrash.patch
deleted file mode 100644
index 6dcc869fd9d..00000000000
--- a/app-editors/kile/files/kile-2.9.92-kcrash.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 21d62face41ffd9e858108f2d45a9abe50ba0db3 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 19 Nov 2018 14:00:56 +0100
-Subject: actually initialize kcrash properly
-
-Summary:
-to successfully use kcrash when linking with as-needed (which is a default
-flag on many linux distros) one also needs to call KCrash::initialize.
-
-without this kcrash handling is not available for most users.
-
-https://markmail.org/thread/zv5pheijaze72bzs
-
-Reviewers: mludwig
-
-Reviewed By: mludwig
-
-Subscribers: #kile
-
-Tags: #kile
-
-Differential Revision: https://phabricator.kde.org/D17011
----
- src/main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 3b02716..bd7fef6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -25,6 +25,7 @@
- #include <QUrl>
-
- #include <KAboutData>
-+#include <KCrash>
- #include <KDBusService>
- #include <KEncodingProber>
- #include <KLocalizedString>
-@@ -128,6 +129,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
-
- KAboutData::setApplicationData(aboutData);
-
-+ KCrash::initialize();
-+
- app.setApplicationDisplayName(aboutData.displayName());
- app.setOrganizationDomain(aboutData.organizationDomain());
- app.setApplicationVersion(aboutData.version());
---
-cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-kf5doctools.patch b/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
deleted file mode 100644
index 2f5a70e815a..00000000000
--- a/app-editors/kile/files/kile-2.9.92-kf5doctools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt 2018-05-11 20:12:37.000000000 +0200
-+++ b/CMakeLists.txt 2019-02-09 16:33:18.953280283 +0100
-@@ -125,7 +125,7 @@
- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
--find_package(KF5DocTools CONFIG REQUIRED)
--kdoctools_install(po)
-+if(KF5DocTools_FOUND)
-+ kdoctools_install(po)
-+endif()
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
deleted file mode 100644
index ff742921046..00000000000
--- a/app-editors/kile/files/kile-2.9.92-no-empty-filename.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7cfc3f74f00d13cfb1a43f01a7dbc0be486c0d47 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Mon, 8 Oct 2018 07:42:41 +0200
-Subject: User menu: do not attempt to load an empty file name
-
-Do not try to install m_currentXmlFile in case it is empty, otherwise
-QFile will (rightfully) warn that an empty file was passed.
----
- src/usermenu/usermenu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/usermenu/usermenu.cpp b/src/usermenu/usermenu.cpp
-index 7d1d5f5..f9e3d3c 100644
---- a/src/usermenu/usermenu.cpp
-+++ b/src/usermenu/usermenu.cpp
-@@ -190,7 +190,7 @@ void UserMenu::updateGUI()
- clear();
-
- // then install
-- if(installXml(m_currentXmlFile)) {
-+ if(!m_currentXmlFile.isEmpty() && installXml(m_currentXmlFile)) {
- // add changed context menu to all existing views
- KileView::Manager* viewManager = m_ki->viewManager();
- int views = viewManager->textViewCount();
---
-cgit v1.1
diff --git a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch b/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
deleted file mode 100644
index 6687e4f0e9f..00000000000
--- a/app-editors/kile/files/kile-2.9.92-nodocfiles.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 03e7b00321c5474330c97812b4e6a6550e54931c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 19 Dec 2018 13:36:12 +0100
-Subject: [PATCH] Disable install misc files by cmake
-
-AUTHORS, README, Changelog etc. are handled by distribution packages.
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4a278e1..bb78d839 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,11 +117,4 @@ install(
- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
-
--install(FILES
-- AUTHORS
-- ChangeLog
-- README
-- README.cwl
-- kile-remote-control.txt
-- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.20.1
-
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
deleted file mode 100644
index 2167e75cbf1..00000000000
--- a/app-editors/kile/files/kile-2.9.92-viewtab-crash.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From f9de688e223be3b77268d36e237a838555d0f533 Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 28 Oct 2018 19:58:22 +0100
-Subject: Search for the 'file_save_copy_as' action inside 'KTextEditor::View'
- now
-
-In that way, Kile doesn't crash after right-clicking on a view tab
-
-BUG: 400191
----
- src/kileviewmanager.cpp | 47 +++++++++++++++++++++++++++++------------------
- 1 file changed, 29 insertions(+), 18 deletions(-)
-
-diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
-index c0b8254..34f8439 100644
---- a/src/kileviewmanager.cpp
-+++ b/src/kileviewmanager.cpp
-@@ -506,39 +506,52 @@ void Manager::tabContext(const QPoint &pos)
-
- // 'action1' can become null if it belongs to a view that has been closed, for example
- QPointer<QAction> action1 = m_ki->mainWindow()->action("move_view_tab_left");
-- action1->setData(qVariantFromValue(view));
-- tabMenu.addAction(action1);
-+ if(action1) {
-+ action1->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action1);
-+ }
-
- QPointer<QAction> action2 = m_ki->mainWindow()->action("move_view_tab_right");
-- action2->setData(qVariantFromValue(view));
-- tabMenu.addAction(action2);
-+ if(action2) {
-+ action2->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action2);
-+ }
-
- tabMenu.addSeparator();
-
- QPointer<QAction> action3;
- if(view->document()->isModified()) {
- action3 = view->actionCollection()->action(KStandardAction::name(KStandardAction::Save));
-- action3->setData(qVariantFromValue(view));
-- tabMenu.addAction(action3);
-+ if(action3) {
-+ action3->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action3);
-+ }
- }
-
- QPointer<QAction> action4 = view->actionCollection()->action(KStandardAction::name(KStandardAction::SaveAs));
-- action4->setData(qVariantFromValue(view));
-- tabMenu.addAction(action4);
-+ if(action4) {
-+ action4->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action4);
-+ }
-
-- QPointer<QAction> action5 = m_ki->mainWindow()->action("file_save_copy_as");
-- action5->setData(qVariantFromValue(view));
-- tabMenu.addAction(action5);
-+ QPointer<QAction> action5 = view->action("file_save_copy_as");
-+ if(action5) {
-+ tabMenu.addAction(action5);
-+ }
-
- tabMenu.addSeparator();
-
- QPointer<QAction> action6 = m_ki->mainWindow()->action("file_close");
-- action6->setData(qVariantFromValue(view));
-- tabMenu.addAction(action6);
-+ if(action6) {
-+ action6->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action6);
-+ }
-
- QPointer<QAction> action7 = m_ki->mainWindow()->action("file_close_all_others");
-- action7->setData(qVariantFromValue(view));
-- tabMenu.addAction(action7);
-+ if(action7) {
-+ action7->setData(qVariantFromValue(view));
-+ tabMenu.addAction(action7);
-+ }
- /*
- FIXME create proper actions which delete/add the current file without asking stupidly
- QAction* removeAction = m_ki->mainWindow()->action("project_remove");
-@@ -562,9 +575,7 @@ void Manager::tabContext(const QPoint &pos)
- if(action4) {
- action4->setData(QVariant());
- }
-- if(action5) {
-- action5->setData(QVariant());
-- }
-+ // action5 doesn't need to be given extra data
- if(action6) {
- action6->setData(QVariant());
- }
---
-cgit v1.1
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
deleted file mode 100644
index 7851f51335c..00000000000
--- a/app-editors/kile/kile-2.9.92-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pdf +png"
-
-DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kinit)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep okular)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtscript)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwidgets)
- pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
- !app-editors/kile:4
- $(add_kdeapps_dep konsole)
- $(add_kdeapps_dep okular 'pdf?')
- virtual/latex-base
- virtual/tex-base
- pdf? (
- >=app-text/texlive-core-2014
- app-text/ghostscript-gpl
- )
- png? (
- app-text/dvipng
- virtual/imagemagick-tools[png?]
- )
-"
-
-DOCS=( AUTHORS ChangeLog kile-remote-control.txt README README.cwl )
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-kf5doctools.patch"
- "${FILESDIR}/${P}-desktopfile.patch"
- "${FILESDIR}/${P}-no-empty-filename.patch"
- "${FILESDIR}/${P}-viewtab-crash.patch"
- "${FILESDIR}/${P}-kcrash.patch"
- "${FILESDIR}/${P}-nodocfiles.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package pdf Poppler)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2019-10-20 14:21 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-10-20 14:21 UTC (permalink / raw
To: gentoo-commits
commit: af63aa7ded6c3e4ced83e871084ead870229957e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 13:43:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:19:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af63aa7d
app-editors/kile: 2.9.93 version bump
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/Manifest | 1 +
app-editors/kile/files/kile-2.9.93-cmake.patch | 20 ++++++++
app-editors/kile/kile-2.9.93.ebuild | 66 ++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 223d9f04686..be88a52da8b 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1 +1,2 @@
DIST kile-2.9.92_p20190716.tar.xz 6176728 BLAKE2B cc6b5f12c7798c806a1e78b79c32e90a3f713d65429afbddfbf75a3a666cfbea75d32be1c2e7d15ce2e414301473f03168e84428bcec161cfd12ceeba674add3 SHA512 614d6aba168f47af41e6a352e7ad838c187945b857c19654ce40ea80c359e5d88a184f1ab02b404c022b897f8ac6f3a61323c9d1043fbb0412eb3d16690e40bb
+DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
diff --git a/app-editors/kile/files/kile-2.9.93-cmake.patch b/app-editors/kile/files/kile-2.9.93-cmake.patch
new file mode 100644
index 00000000000..94e39c46351
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-cmake.patch
@@ -0,0 +1,20 @@
+I know upstream wants to help us but it doesn't work...
+
+--- a/CMakeLists.txt 2019-10-19 14:23:41.000000000 +0200
++++ b/CMakeLists.txt 2019-10-20 15:50:52.606325681 +0200
+@@ -116,15 +116,6 @@
+ kile2.0-5_upd.pl
+ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+
+-install(FILES
+- AUTHORS
+- ChangeLog
+- README
+- README.cwl
+- kile-remote-control.txt
+- README.MacOSX
+- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+-
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
diff --git a/app-editors/kile/kile-2.9.93.ebuild b/app-editors/kile/kile-2.9.93.ebuild
new file mode 100644
index 00000000000..ad69bc67ec6
--- /dev/null
+++ b/app-editors/kile/kile-2.9.93.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://kile.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="FDL-1.2 GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep okular)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwidgets)
+ pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+ !app-editors/kile:4
+ $(add_kdeapps_dep konsole)
+ $(add_kdeapps_dep okular 'pdf?')
+ virtual/latex-base
+ virtual/tex-base
+ pdf? (
+ >=app-text/texlive-core-2014
+ app-text/ghostscript-gpl
+ )
+ png? (
+ app-text/dvipng
+ virtual/imagemagick-tools[png?]
+ )
+"
+
+DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package pdf Poppler)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2020-10-18 15:47 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-10-18 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 7931d9873c4f988e34b873dc77213818c6e4e110
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 19:57:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:44:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7931d987
app-editors/kile: Drop kde-frameworks/khtml dep, various fixes
- update HOMEPAGE while at it
- drop obsolete blocker
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=413473
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=413506
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-2.9.93-fix-crash-when-deleting-templates.patch | 35 +++++
.../files/kile-2.9.93-fix-ktoolbar-usage.patch | 25 ++++
...-2.9.93-fix-overriding-existing-templates.patch | 164 +++++++++++++++++++++
app-editors/kile/files/kile-2.9.93-no-khtml.patch | 58 ++++++++
app-editors/kile/kile-2.9.93-r1.ebuild | 76 ++++++++++
5 files changed, 358 insertions(+)
diff --git a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
new file mode 100644
index 00000000000..232bd389483
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
@@ -0,0 +1,35 @@
+From 483743aa9f194376a8b496ac4e58a946070a36af Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 1 Dec 2019 09:09:55 +0100
+Subject: [PATCH] Don't crash when deleting templates
+
+BUG: 413506
+---
+ src/dialogs/managetemplatesdialog.cpp | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
+index fe6537ad..c5298b21 100644
+--- a/src/dialogs/managetemplatesdialog.cpp
++++ b/src/dialogs/managetemplatesdialog.cpp
+@@ -317,17 +317,6 @@ bool ManageTemplatesDialog::removeTemplate()
+
+ KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
+
+- KIO::StatJob* statJob = KIO::stat(QUrl::fromUserInput(templateInfo.path), KIO::StatJob::DestinationSide, 0);
+- KIO::StatJob* statJob2 = KIO::stat(QUrl::fromUserInput(templateInfo.icon), KIO::StatJob::DestinationSide, 0);
+- KJobWidgets::setWindow(statJob, this);
+- KJobWidgets::setWindow(statJob2, this);
+- statJob->exec();
+- statJob2->exec();
+- if ((statJob->error() && statJob2->error()) || !QFileInfo(templateInfo.icon).exists()) {
+- KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template."));
+- return false;
+- }
+-
+ if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?", templateInfo.name)) == KMessageBox::No) {
+ return false;
+ }
+--
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
new file mode 100644
index 00000000000..2afd0622ea3
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
@@ -0,0 +1,25 @@
+From 5c268679da2fb2cdc414890bdd79a5592e37cb22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Tue, 15 Sep 2020 15:33:51 +0100
+Subject: [PATCH] Fix KToolbar usage.
+
+---
+ src/widgets/scriptsmanagementwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/scriptsmanagementwidget.cpp b/src/widgets/scriptsmanagementwidget.cpp
+index 79552da3..94f58f18 100644
+--- a/src/widgets/scriptsmanagementwidget.cpp
++++ b/src/widgets/scriptsmanagementwidget.cpp
+@@ -66,7 +66,7 @@ ScriptsManagement::ScriptsManagement(KileInfo *kileInfo, QWidget *parent, const
+ baseLayout->setContentsMargins(0, 0, 0, 0);
+ setLayout(baseLayout);
+
+- m_toolBar = new KToolBar(this, "scriptControlToolBar");
++ m_toolBar = new KToolBar("scriptControlToolBar", this);
+ m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+ m_toolBar->setIconDimensions(KIconLoader::SizeSmall);
+
+--
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
new file mode 100644
index 00000000000..f303cff0b0f
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
@@ -0,0 +1,164 @@
+From 7a55cf2d93c9daa13f2fa2ec1ae25646507cfc0c Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Sun, 1 Dec 2019 15:56:05 +0100
+Subject: [PATCH] Fix overriding of existing templates
+
+Also, don't delete the original file after the template has been
+created from it.
+
+BUG: 413473
+
+* asturm 2020-10-17: backport to 2.9.93 (drop unnecessary string change)
+
+---
+ src/dialogs/managetemplatesdialog.cpp | 7 ++-
+ src/templates.cpp | 78 ++-------------------------
+ src/templates.h | 10 ++--
+ 3 files changed, 12 insertions(+), 83 deletions(-)
+
+diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
+index c5298b21..77d5d6ff 100644
+--- a/src/dialogs/managetemplatesdialog.cpp
++++ b/src/dialogs/managetemplatesdialog.cpp
+@@ -292,11 +292,10 @@ void ManageTemplatesDialog::addTemplate()
+ reject();
+ return;
+ }
+- returnValue = m_templateManager->replace(templateInfo, m_sourceURL, templateName, iconURL);
+- }
+- else {
+- returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
+ }
++
++ returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
++
+ if (!returnValue) {
+ KMessageBox::error(this, i18n("Failed to create the template."));
+ reject();
+diff --git a/src/templates.cpp b/src/templates.cpp
+--- a/src/templates.cpp
++++ b/src/templates.cpp
+@@ -82,7 +82,10 @@ bool Manager::copyAppData(const QUrl &src, const QString& subdir, const QString&
+ testDir.mkpath(dir);
+ }
+ // copy file
+- KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL);
++ if(src == targetURL) { // copying a file over itself
++ return true;
++ }
++ KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL, -1, KIO::Overwrite);
+ KJobWidgets::setWindow(copyJob, m_kileInfo->mainWindow());
+ return copyJob->exec();
+ }
+@@ -130,77 +133,6 @@ bool Manager::remove(Info ti) {
+ return removeAppData(ti.path) && removeAppData(ti.icon);
+ }
+
+-bool Manager::replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon) {
+- KileDocument::Type type = m_kileInfo->extensions()->determineDocumentType(newTemplateSourceURL);
+-
+- //start by copying the files that belong to the new template to a safe place
+- QString templateTempFile, iconTempFile;
+-
+- if( newTemplateSourceURL.isLocalFile() ) {
+- // file protocol. We do not need the network
+- templateTempFile = newTemplateSourceURL.toLocalFile();
+- }
+- else {
+- QTemporaryFile tmpFile;
+- tmpFile.setAutoRemove( false );
+- tmpFile.open();
+-
+- templateTempFile = tmpFile.fileName();
+- m_TempFilePath = tmpFile.fileName();
+- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newTemplateSourceURL, QUrl::fromLocalFile(templateTempFile), -1, KIO::Overwrite );
+- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
+-
+- if( ! fileCopyJob->exec() ) {
+- return false;
+- }
+- }
+-
+- if( newIcon.isLocalFile() ) {
+- // file protocol. We do not need the network
+- iconTempFile = newIcon.toLocalFile();
+- }
+- else {
+- QTemporaryFile tmpFile;
+- tmpFile.setAutoRemove( false );
+- tmpFile.open();
+-
+- iconTempFile = tmpFile.fileName();
+- m_TempFilePath = tmpFile.fileName();
+- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newIcon, QUrl::fromLocalFile(iconTempFile), -1, KIO::Overwrite );
+- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
+-
+- if( ! fileCopyJob->exec() ) {
+- if( ! templateTempFile.isEmpty() )
+- QFile::remove( templateTempFile );
+- return false;
+- }
+- }
+-
+- //now delete the template that should be replaced
+- if(!remove(toBeReplaced)) {
+- if( ! templateTempFile.isEmpty() )
+- QFile::remove( templateTempFile );
+- if( ! iconTempFile.isEmpty() )
+- QFile::remove( iconTempFile );
+- }
+-
+- //finally, create the new template
+- if(!add(QUrl::fromUserInput(templateTempFile), type, newName, QUrl::fromUserInput(iconTempFile))) {
+- if( ! templateTempFile.isEmpty() )
+- QFile::remove( templateTempFile );
+- if( ! iconTempFile.isEmpty() )
+- QFile::remove( iconTempFile );
+- return false;
+- }
+-
+- if( ! templateTempFile.isEmpty() )
+- QFile::remove( templateTempFile );
+- if( ! iconTempFile.isEmpty() )
+- QFile::remove( iconTempFile );
+-
+- return true;
+-}
+-
+ void Manager::scanForTemplates() {
+ KILE_DEBUG_MAIN << "===scanForTemplates()===================";
+ QStringList dirs = KileUtilities::locateAll(QStandardPaths::AppDataLocation, "templates", QStandardPaths::LocateDirectory);
+diff --git a/src/templates.h b/src/templates.h
+--- a/src/templates.h
++++ b/src/templates.h
+@@ -1,7 +1,7 @@
+ /***************************************************************************************
+ begin : Sat Apr 26 2003
+ copyright : (C) 2003 by Jeroen Wijnhout (wijnhout@science.uva.nl)
+- 2007, 2008 by Michel Ludwig (michel.ludwig@kdemail.net)
++ 2007-2019 by Michel Ludwig (michel.ludwig@kdemail.net)
+ ***************************************************************************************/
+
+ /***************************************************************************
+@@ -79,15 +79,13 @@ public:
+ **/
+ bool searchForTemplate(const QString& name, KileDocument::Type& type) const;
+
+- // add a template in $HOME/kile/templates/
++ // Add a template in .kde/share/kile/templates/
++ // This function will override any existing template.
+ bool add(const QUrl &templateSourceURL, const QString &name, const QUrl &icon);
+
+- // remove a template from $HOME/kile/templates/
++ // Remove a template from .kde/share/kile/templates/
+ bool remove(KileTemplate::Info ti);
+
+- // replaces a template
+- bool replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon);
+-
+ // these have to be methods as we cannot use i18n calls in global objects
+ static QString defaultEmptyTemplateCaption();
+ static QString defaultEmptyLaTeXTemplateCaption();
+--
+GitLab
+
diff --git a/app-editors/kile/files/kile-2.9.93-no-khtml.patch b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
new file mode 100644
index 00000000000..cf055fc8449
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
@@ -0,0 +1,58 @@
+From 7c050b5e306cab115573aea1bfc951aaaa1203e9 Mon Sep 17 00:00:00 2001
+From: Michel Ludwig <michel.ludwig@kdemail.net>
+Date: Fri, 22 Nov 2019 09:40:53 +0100
+Subject: [PATCH] Remove dependency on KHTML
+
+---
+ CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 2 --
+ src/kilelauncher.cpp | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bea621f..1b25e3a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ find_package(KF5 5.31 REQUIRED COMPONENTS
+ I18n
+ IconThemes
+ Init
+- KHtml
+ KIO
+ Parts
+ TextEditor
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 77626894..e23480fd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,7 +55,6 @@ set(kile_SRCS
+ dialogs/usermenu/usermenuitem.cpp
+ dialogs/usermenu/usermenutree.cpp
+ dialogs/validatorinputdialog.cpp
+- docpart.cpp
+ documentinfo.cpp
+ editorcommands.cpp
+ editorextension.cpp
+@@ -238,7 +237,6 @@ PUBLIC
+ KF5::Crash
+ KF5::DBusAddons
+ KF5::GuiAddons
+- KF5::KHtml
+ KF5::I18n
+ KF5::IconThemes
+ KF5::KIOCore
+diff --git a/src/kilelauncher.cpp b/src/kilelauncher.cpp
+index c0bcdf9d..24a1f5b4 100644
+--- a/src/kilelauncher.cpp
++++ b/src/kilelauncher.cpp
+@@ -16,7 +16,6 @@
+
+ #include <config.h>
+
+-#include "docpart.h"
+ #include "kileconfig.h"
+ #include "kileinfo.h"
+ #include "kiletool.h"
+--
+GitLab
+
diff --git a/app-editors/kile/kile-2.9.93-r1.ebuild b/app-editors/kile/kile-2.9.93-r1.ebuild
new file mode 100644
index 00000000000..853588a26eb
--- /dev/null
+++ b/app-editors/kile/kile-2.9.93-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_CATEGORY="office"
+KFMIN=5.74.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/en/kile https://kile.sourceforge.io/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="FDL-1.2 GPL-2"
+SLOT="5"
+IUSE="+pdf +png"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qttest-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ kde-apps/okular:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdoctools-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+ kde-apps/konsole:5
+ kde-apps/okular:5[pdf?]
+ virtual/latex-base
+ virtual/tex-base
+ pdf? (
+ app-text/ghostscript-gpl
+ app-text/texlive-core
+ )
+ png? (
+ app-text/dvipng
+ virtual/imagemagick-tools[png?]
+ )
+"
+
+DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-no-khtml.patch"
+ "${FILESDIR}/${P}-fix-crash-when-deleting-templates.patch"
+ "${FILESDIR}/${P}-fix-overriding-existing-templates.patch"
+ "${FILESDIR}/${P}-fix-ktoolbar-usage.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package pdf Poppler)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2022-11-23 20:19 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-11-23 20:19 UTC (permalink / raw
To: gentoo-commits
commit: d068a891570785cf7ebae953fa3ec0b33604a5f5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 19:07:21 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:19:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d068a891
app-editors/kile: add 2.9.93_p20221123, EAPI-8 bump
w/o KEYWORDS to let mirrors pick up the distfile.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/Manifest | 1 +
.../kile/files/kile-2.9.93_p20221123-cmake.patch | 31 ++++++++++
app-editors/kile/kile-2.9.93_p20221123.ebuild | 67 ++++++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 83e824de2f59..edc99c2cde6c 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1 +1,2 @@
DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
+DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
new file mode 100644
index 000000000000..0095adf9548c
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
@@ -0,0 +1,31 @@
+From 2974fba837aef46711d9e1b26cd367aab68ba53a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Dec 2018 13:36:12 +0100
+Subject: [PATCH] Disable install misc files by cmake
+
+AUTHORS, README, Changelog etc. are handled by distribution packages.
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 91a732ab..c69c168c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,13 +114,6 @@ install(
+ kile2.0-5_upd.pl
+ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+
+-install(FILES
+- AUTHORS
+- ChangeLog
+- README
+- README.cwl
+- kile-remote-control.txt
+- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+
+ ki18n_install(po)
+
+--
+2.38.1
+
diff --git a/app-editors/kile/kile-2.9.93_p20221123.ebuild b/app-editors/kile/kile-2.9.93_p20221123.ebuild
new file mode 100644
index 000000000000..a3165b4e1290
--- /dev/null
+++ b/app-editors/kile/kile-2.9.93_p20221123.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_CATEGORY="office"
+KDE_ORG_COMMIT="1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af"
+KFMIN=5.82.0
+QTMIN=5.15.5
+MY_P=${P/_beta/b}
+inherit ecm kde.org
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
+
+LICENSE="FDL-1.2 GPL-2"
+SLOT="5"
+# KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qttest-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ kde-apps/okular:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdoctools-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+ kde-apps/konsole:5
+ kde-apps/okular:5[pdf?]
+ virtual/latex-base
+ virtual/tex-base
+ pdf? (
+ app-text/ghostscript-gpl
+ app-text/texlive-core
+ )
+ png? (
+ app-text/dvipng
+ virtual/imagemagick-tools[png?]
+ )
+"
+
+DOCS=( kile-remote-control.txt )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package pdf Poppler)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2022-12-15 19:26 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-12-15 19:26 UTC (permalink / raw
To: gentoo-commits
commit: 2edfeb3e86a2545299625e0ab520911f86f87443
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 19:21:18 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 19:26:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edfeb3e
app-editors/kile: drop 2.9.93-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/Manifest | 1 -
app-editors/kile/files/kile-2.9.93-cmake.patch | 20 ---
...-2.9.93-fix-crash-when-deleting-templates.patch | 35 -----
.../files/kile-2.9.93-fix-ktoolbar-usage.patch | 25 ----
...-2.9.93-fix-overriding-existing-templates.patch | 164 ---------------------
app-editors/kile/files/kile-2.9.93-no-khtml.patch | 58 --------
app-editors/kile/kile-2.9.93-r1.ebuild | 76 ----------
7 files changed, 379 deletions(-)
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index edc99c2cde6c..b4b9bfcc5c35 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1 @@
-DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
diff --git a/app-editors/kile/files/kile-2.9.93-cmake.patch b/app-editors/kile/files/kile-2.9.93-cmake.patch
deleted file mode 100644
index 94e39c463517..000000000000
--- a/app-editors/kile/files/kile-2.9.93-cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-I know upstream wants to help us but it doesn't work...
-
---- a/CMakeLists.txt 2019-10-19 14:23:41.000000000 +0200
-+++ b/CMakeLists.txt 2019-10-20 15:50:52.606325681 +0200
-@@ -116,15 +116,6 @@
- kile2.0-5_upd.pl
- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
-
--install(FILES
-- AUTHORS
-- ChangeLog
-- README
-- README.cwl
-- kile-remote-control.txt
-- README.MacOSX
-- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
--
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
diff --git a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
deleted file mode 100644
index 232bd3894833..000000000000
--- a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 483743aa9f194376a8b496ac4e58a946070a36af Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 1 Dec 2019 09:09:55 +0100
-Subject: [PATCH] Don't crash when deleting templates
-
-BUG: 413506
----
- src/dialogs/managetemplatesdialog.cpp | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
-index fe6537ad..c5298b21 100644
---- a/src/dialogs/managetemplatesdialog.cpp
-+++ b/src/dialogs/managetemplatesdialog.cpp
-@@ -317,17 +317,6 @@ bool ManageTemplatesDialog::removeTemplate()
-
- KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
-
-- KIO::StatJob* statJob = KIO::stat(QUrl::fromUserInput(templateInfo.path), KIO::StatJob::DestinationSide, 0);
-- KIO::StatJob* statJob2 = KIO::stat(QUrl::fromUserInput(templateInfo.icon), KIO::StatJob::DestinationSide, 0);
-- KJobWidgets::setWindow(statJob, this);
-- KJobWidgets::setWindow(statJob2, this);
-- statJob->exec();
-- statJob2->exec();
-- if ((statJob->error() && statJob2->error()) || !QFileInfo(templateInfo.icon).exists()) {
-- KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template."));
-- return false;
-- }
--
- if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?", templateInfo.name)) == KMessageBox::No) {
- return false;
- }
---
-GitLab
-
diff --git a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
deleted file mode 100644
index 2afd0622ea3d..000000000000
--- a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c268679da2fb2cdc414890bdd79a5592e37cb22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
-Date: Tue, 15 Sep 2020 15:33:51 +0100
-Subject: [PATCH] Fix KToolbar usage.
-
----
- src/widgets/scriptsmanagementwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/scriptsmanagementwidget.cpp b/src/widgets/scriptsmanagementwidget.cpp
-index 79552da3..94f58f18 100644
---- a/src/widgets/scriptsmanagementwidget.cpp
-+++ b/src/widgets/scriptsmanagementwidget.cpp
-@@ -66,7 +66,7 @@ ScriptsManagement::ScriptsManagement(KileInfo *kileInfo, QWidget *parent, const
- baseLayout->setContentsMargins(0, 0, 0, 0);
- setLayout(baseLayout);
-
-- m_toolBar = new KToolBar(this, "scriptControlToolBar");
-+ m_toolBar = new KToolBar("scriptControlToolBar", this);
- m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
- m_toolBar->setIconDimensions(KIconLoader::SizeSmall);
-
---
-GitLab
-
diff --git a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
deleted file mode 100644
index f303cff0b0f0..000000000000
--- a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 7a55cf2d93c9daa13f2fa2ec1ae25646507cfc0c Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 1 Dec 2019 15:56:05 +0100
-Subject: [PATCH] Fix overriding of existing templates
-
-Also, don't delete the original file after the template has been
-created from it.
-
-BUG: 413473
-
-* asturm 2020-10-17: backport to 2.9.93 (drop unnecessary string change)
-
----
- src/dialogs/managetemplatesdialog.cpp | 7 ++-
- src/templates.cpp | 78 ++-------------------------
- src/templates.h | 10 ++--
- 3 files changed, 12 insertions(+), 83 deletions(-)
-
-diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
-index c5298b21..77d5d6ff 100644
---- a/src/dialogs/managetemplatesdialog.cpp
-+++ b/src/dialogs/managetemplatesdialog.cpp
-@@ -292,11 +292,10 @@ void ManageTemplatesDialog::addTemplate()
- reject();
- return;
- }
-- returnValue = m_templateManager->replace(templateInfo, m_sourceURL, templateName, iconURL);
-- }
-- else {
-- returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
- }
-+
-+ returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
-+
- if (!returnValue) {
- KMessageBox::error(this, i18n("Failed to create the template."));
- reject();
-diff --git a/src/templates.cpp b/src/templates.cpp
---- a/src/templates.cpp
-+++ b/src/templates.cpp
-@@ -82,7 +82,10 @@ bool Manager::copyAppData(const QUrl &src, const QString& subdir, const QString&
- testDir.mkpath(dir);
- }
- // copy file
-- KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL);
-+ if(src == targetURL) { // copying a file over itself
-+ return true;
-+ }
-+ KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL, -1, KIO::Overwrite);
- KJobWidgets::setWindow(copyJob, m_kileInfo->mainWindow());
- return copyJob->exec();
- }
-@@ -130,77 +133,6 @@ bool Manager::remove(Info ti) {
- return removeAppData(ti.path) && removeAppData(ti.icon);
- }
-
--bool Manager::replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon) {
-- KileDocument::Type type = m_kileInfo->extensions()->determineDocumentType(newTemplateSourceURL);
--
-- //start by copying the files that belong to the new template to a safe place
-- QString templateTempFile, iconTempFile;
--
-- if( newTemplateSourceURL.isLocalFile() ) {
-- // file protocol. We do not need the network
-- templateTempFile = newTemplateSourceURL.toLocalFile();
-- }
-- else {
-- QTemporaryFile tmpFile;
-- tmpFile.setAutoRemove( false );
-- tmpFile.open();
--
-- templateTempFile = tmpFile.fileName();
-- m_TempFilePath = tmpFile.fileName();
-- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newTemplateSourceURL, QUrl::fromLocalFile(templateTempFile), -1, KIO::Overwrite );
-- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
--
-- if( ! fileCopyJob->exec() ) {
-- return false;
-- }
-- }
--
-- if( newIcon.isLocalFile() ) {
-- // file protocol. We do not need the network
-- iconTempFile = newIcon.toLocalFile();
-- }
-- else {
-- QTemporaryFile tmpFile;
-- tmpFile.setAutoRemove( false );
-- tmpFile.open();
--
-- iconTempFile = tmpFile.fileName();
-- m_TempFilePath = tmpFile.fileName();
-- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newIcon, QUrl::fromLocalFile(iconTempFile), -1, KIO::Overwrite );
-- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
--
-- if( ! fileCopyJob->exec() ) {
-- if( ! templateTempFile.isEmpty() )
-- QFile::remove( templateTempFile );
-- return false;
-- }
-- }
--
-- //now delete the template that should be replaced
-- if(!remove(toBeReplaced)) {
-- if( ! templateTempFile.isEmpty() )
-- QFile::remove( templateTempFile );
-- if( ! iconTempFile.isEmpty() )
-- QFile::remove( iconTempFile );
-- }
--
-- //finally, create the new template
-- if(!add(QUrl::fromUserInput(templateTempFile), type, newName, QUrl::fromUserInput(iconTempFile))) {
-- if( ! templateTempFile.isEmpty() )
-- QFile::remove( templateTempFile );
-- if( ! iconTempFile.isEmpty() )
-- QFile::remove( iconTempFile );
-- return false;
-- }
--
-- if( ! templateTempFile.isEmpty() )
-- QFile::remove( templateTempFile );
-- if( ! iconTempFile.isEmpty() )
-- QFile::remove( iconTempFile );
--
-- return true;
--}
--
- void Manager::scanForTemplates() {
- KILE_DEBUG_MAIN << "===scanForTemplates()===================";
- QStringList dirs = KileUtilities::locateAll(QStandardPaths::AppDataLocation, "templates", QStandardPaths::LocateDirectory);
-diff --git a/src/templates.h b/src/templates.h
---- a/src/templates.h
-+++ b/src/templates.h
-@@ -1,7 +1,7 @@
- /***************************************************************************************
- begin : Sat Apr 26 2003
- copyright : (C) 2003 by Jeroen Wijnhout (wijnhout@science.uva.nl)
-- 2007, 2008 by Michel Ludwig (michel.ludwig@kdemail.net)
-+ 2007-2019 by Michel Ludwig (michel.ludwig@kdemail.net)
- ***************************************************************************************/
-
- /***************************************************************************
-@@ -79,15 +79,13 @@ public:
- **/
- bool searchForTemplate(const QString& name, KileDocument::Type& type) const;
-
-- // add a template in $HOME/kile/templates/
-+ // Add a template in .kde/share/kile/templates/
-+ // This function will override any existing template.
- bool add(const QUrl &templateSourceURL, const QString &name, const QUrl &icon);
-
-- // remove a template from $HOME/kile/templates/
-+ // Remove a template from .kde/share/kile/templates/
- bool remove(KileTemplate::Info ti);
-
-- // replaces a template
-- bool replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon);
--
- // these have to be methods as we cannot use i18n calls in global objects
- static QString defaultEmptyTemplateCaption();
- static QString defaultEmptyLaTeXTemplateCaption();
---
-GitLab
-
diff --git a/app-editors/kile/files/kile-2.9.93-no-khtml.patch b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
deleted file mode 100644
index cf055fc84490..000000000000
--- a/app-editors/kile/files/kile-2.9.93-no-khtml.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7c050b5e306cab115573aea1bfc951aaaa1203e9 Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Fri, 22 Nov 2019 09:40:53 +0100
-Subject: [PATCH] Remove dependency on KHTML
-
----
- CMakeLists.txt | 1 -
- src/CMakeLists.txt | 2 --
- src/kilelauncher.cpp | 1 -
- 3 files changed, 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bea621f..1b25e3a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ find_package(KF5 5.31 REQUIRED COMPONENTS
- I18n
- IconThemes
- Init
-- KHtml
- KIO
- Parts
- TextEditor
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 77626894..e23480fd 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -55,7 +55,6 @@ set(kile_SRCS
- dialogs/usermenu/usermenuitem.cpp
- dialogs/usermenu/usermenutree.cpp
- dialogs/validatorinputdialog.cpp
-- docpart.cpp
- documentinfo.cpp
- editorcommands.cpp
- editorextension.cpp
-@@ -238,7 +237,6 @@ PUBLIC
- KF5::Crash
- KF5::DBusAddons
- KF5::GuiAddons
-- KF5::KHtml
- KF5::I18n
- KF5::IconThemes
- KF5::KIOCore
-diff --git a/src/kilelauncher.cpp b/src/kilelauncher.cpp
-index c0bcdf9d..24a1f5b4 100644
---- a/src/kilelauncher.cpp
-+++ b/src/kilelauncher.cpp
-@@ -16,7 +16,6 @@
-
- #include <config.h>
-
--#include "docpart.h"
- #include "kileconfig.h"
- #include "kileinfo.h"
- #include "kiletool.h"
---
-GitLab
-
diff --git a/app-editors/kile/kile-2.9.93-r1.ebuild b/app-editors/kile/kile-2.9.93-r1.ebuild
deleted file mode 100644
index 60a8f8484e9c..000000000000
--- a/app-editors/kile/kile-2.9.93-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_CATEGORY="office"
-KFMIN=5.74.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="FDL-1.2 GPL-2"
-SLOT="5"
-IUSE="+pdf +png"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- kde-apps/okular:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdoctools-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
- kde-apps/konsole:5
- kde-apps/okular:5[pdf?]
- virtual/latex-base
- virtual/tex-base
- pdf? (
- app-text/ghostscript-gpl
- app-text/texlive-core
- )
- png? (
- app-text/dvipng
- virtual/imagemagick-tools[png?]
- )
-"
-
-DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-no-khtml.patch"
- "${FILESDIR}/${P}-fix-crash-when-deleting-templates.patch"
- "${FILESDIR}/${P}-fix-overriding-existing-templates.patch"
- "${FILESDIR}/${P}-fix-ktoolbar-usage.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package pdf Poppler)
- )
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/
@ 2024-09-02 12:44 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-09-02 12:44 UTC (permalink / raw
To: gentoo-commits
commit: c695a71209f312aebbcd70cc9ff94329d95de31c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 21:46:00 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 12:41:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c695a712
app-editors/kile: drop 2.9.93_p20221123-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-editors/kile/Manifest | 1 -
.../files/kile-2.9.93_p20221123-okularpart.patch | 70 -------------------
app-editors/kile/kile-2.9.93_p20221123-r1.ebuild | 79 ----------------------
3 files changed, 150 deletions(-)
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 6b54e8a4c12d..7117f02b8323 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1 @@
-DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
DIST kile-2.9.94.tar.bz2 7505095 BLAKE2B b42d7237f612f2d6017bdde3cfea29a74b4756b96cc707b178217e0ab5b599d86b2ffc8e0283fcd6e351746151738bcbff65183b93a347c6fb11250233b7fe5a SHA512 4638e81374243a8b2716183bf28cec02bcb455f2b1a9295e7e04f20833b77c962bddfeb81e527606209c338862af48a38d9f6009a9f7b96aac37f874ae3f725c
diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
deleted file mode 100644
index 7a66dfcc4f80..000000000000
--- a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6cf4549217e95659c8dfd14f9166fb8b80bad333 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 15 Mar 2024 12:45:51 +0100
-Subject: [PATCH] Switch okular headers to okular5
-
-Otherwise it will be using okular6's.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/configtester.cpp | 2 +-
- src/kileviewmanager.cpp | 2 +-
- src/kileviewmanager.h | 2 +-
- src/livepreview.cpp | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/configtester.cpp b/src/configtester.cpp
-index 35ce3e71..cd7ed588 100644
---- a/src/configtester.cpp
-+++ b/src/configtester.cpp
-@@ -14,7 +14,7 @@
-
- #include "configtester.h"
-
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
-
- #include <QTimer>
-
-diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp
-index 34f84397..f5ac0cdc 100644
---- a/src/kileviewmanager.cpp
-+++ b/src/kileviewmanager.cpp
-@@ -15,7 +15,7 @@
- #include "kileviewmanager.h"
- #include <config.h>
-
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
-
- #include <KAcceleratorManager>
- #include <KActionCollection>
-diff --git a/src/kileviewmanager.h b/src/kileviewmanager.h
-index 42367291..e0b3ca09 100644
---- a/src/kileviewmanager.h
-+++ b/src/kileviewmanager.h
-@@ -15,7 +15,7 @@
- #ifndef KILEVIEWKILEVIEWMANAGER_H
- #define KILEVIEWKILEVIEWMANAGER_H
-
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
-
- #include <KTextEditor/Cursor>
- #include <KTextEditor/ModificationInterface>
-diff --git a/src/livepreview.cpp b/src/livepreview.cpp
-index dbd7ff13..fcfa2a6d 100644
---- a/src/livepreview.cpp
-+++ b/src/livepreview.cpp
-@@ -40,7 +40,7 @@
- #include <KParts/MainWindow>
- #include <KXMLGUIFactory>
-
--#include <okular/interfaces/viewerinterface.h>
-+#include <okular5/interfaces/viewerinterface.h>
-
- #include "errorhandler.h"
- #include "kiledebug.h"
---
-2.44.0
-
diff --git a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
deleted file mode 100644
index 3c11cf77aae7..000000000000
--- a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_CATEGORY="office"
-KDE_ORG_COMMIT="1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
-
-LICENSE="FDL-1.2 GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+pdf +png"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- || (
- media-gfx/okularpart:5[pdf?]
- kde-apps/okular:5[pdf?]
- )
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdoctools-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
- || (
- kde-apps/konsolepart:5
- kde-apps/konsole:5
- )
- virtual/latex-base
- virtual/tex-base
- pdf? (
- app-text/ghostscript-gpl
- app-text/texlive-core
- )
- png? (
- app-text/dvipng
- virtual/imagemagick-tools[png?]
- )
-"
-
-DOCS=( kile-remote-control.txt )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
- if has_version "media-gfx/okularpart:5"; then
- eapply "${FILESDIR}/${P}-okularpart.patch"
- fi
-
- ecm_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package pdf Poppler)
- )
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-02 12:44 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-09 16:07 [gentoo-commits] repo/gentoo:master commit in: app-editors/kile/files/, app-editors/kile/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-02 12:44 Andreas Sturmlechner
2022-12-15 19:26 Andreas Sturmlechner
2022-11-23 20:19 Andreas Sturmlechner
2020-10-18 15:47 Andreas Sturmlechner
2019-10-20 14:21 Andreas Sturmlechner
2019-08-16 22:52 Andreas Sturmlechner
2018-12-19 13:01 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox