* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2015-09-24 17:56 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-09-24 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 1e209fd2d1250a7e34419a1939d53329e81e2465
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 17:56:17 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 17:56:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e209fd2
kde-apps/kate: version bump
Package-Manager: portage-2.2.20.1
kde-apps/kate/Manifest | 1 +
.../files/kate-15.08.1-initialise-libgit2.patch | 57 +++++++++++++++++
kde-apps/kate/kate-15.08.1.ebuild | 72 ++++++++++++++++++++++
3 files changed, 130 insertions(+)
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index c3d6395..cd74bc9 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,2 +1,3 @@
DIST kate-15.08.0.tar.xz 1759156 SHA256 834bd05c2e565d030cb58e47ae5a1bc0f487242bcca7b8d54de0fd73ace13656 SHA512 ad00616c8c4a2c11264be7959e751d143c9030c20413f9a972bb9c61cd425226803e04b13509761fec4597f3c0b0cb4f013f3d4a81469309f1de45693ec3e4eb WHIRLPOOL 5ffa81557b48769f2b59c62b4c9cae24f271a7fe23bc0c16b60fffdae93029dc7dfa396eaa1a23710797cae16dbc9d54c5dae64ccd9e1f0df35e397ac03f26f2
+DIST kate-15.08.1.tar.xz 1758912 SHA256 3f96756f7f4c6d178d2310a9fd1b63e816348d49cb4d53907e10fc6a29c92b43 SHA512 463e7b57f54305582a3faacbb92499a1fa54684da3a97adb072e6b613589c12eaa0ca7e618dbeea60f57ee31786c2ca1ca23a9f53d11bd986a240113ba124108 WHIRLPOOL 839e25ee5d4ae3fe7c02b3de6c2899bef4339cecff3930dbc810382b27e2e0298c7db9014233c2db5e583f66d46bfbc757517ea5426c7c46eb303df0326652d4
DIST kate-4.14.3.tar.xz 2766880 SHA256 513d4ae2c36fa6b59caf3b2b685e3ea1167093d16025859cfac90d75617e707d SHA512 0d197bb00fb9a56572e140dd3c50338c90a0cb3bb8ebc78cc0e6d6ab04d6c129537a2ab8076ff9b844e159687c0a73cbacbe678e006b2d86b57285068158e38e WHIRLPOOL bb1c499c55dc768ab936d4a2e2f6ac79ddb28d84c517bfa1ec421fdfbc6f9e727ae5c0e3f1773e3664ad263217c1b89f9c83b51ad0ca6fdee36e23b20fa964d5
diff --git a/kde-apps/kate/files/kate-15.08.1-initialise-libgit2.patch b/kde-apps/kate/files/kate-15.08.1-initialise-libgit2.patch
new file mode 100644
index 0000000..dec6ab9
--- /dev/null
+++ b/kde-apps/kate/files/kate-15.08.1-initialise-libgit2.patch
@@ -0,0 +1,57 @@
+From c6eee39e8c5185a0c330e3c70c7b1e109c69ac44 Mon Sep 17 00:00:00 2001
+From: Andrew Wilcox <AWilcox@Wilcox-Tech.com>
+Date: Sat, 12 Sep 2015 15:31:11 -0500
+Subject: [PATCH] Project plugin: Properly initialise libgit2
+
+Fixes bugs #346101, #346102, #345602
+---
+ addons/project/kateprojectworker.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/addons/project/kateprojectworker.cpp b/addons/project/kateprojectworker.cpp
+index 847f2b2..5433ee8 100644
+--- a/addons/project/kateprojectworker.cpp
++++ b/addons/project/kateprojectworker.cpp
+@@ -276,12 +276,15 @@ QStringList KateProjectWorker::filesFromGit(const QDir &dir, bool recursive)
+ return 0;
+ };
+
++ git_libgit2_init();
++
+ if (git_repository_open_ext(&repo, dir.path().toUtf8().data(), 0, NULL)) {
+ return QStringList();
+ }
+
+ if ((working_dir = git_repository_workdir(repo)) == nullptr) {
+ git_repository_free(repo);
++ git_libgit2_shutdown();
+ return files;
+ }
+
+@@ -290,6 +293,7 @@ QStringList KateProjectWorker::filesFromGit(const QDir &dir, bool recursive)
+
+ if (git_revparse_single(&root_tree, repo, "HEAD^{tree}")) {
+ git_repository_free(repo);
++ git_libgit2_shutdown();
+ return files;
+ }
+
+@@ -299,6 +303,7 @@ QStringList KateProjectWorker::filesFromGit(const QDir &dir, bool recursive)
+ if (git_object_lookup_bypath(&tree, root_tree, relpath.toUtf8().data(), GIT_OBJ_TREE)) {
+ git_object_free(root_tree);
+ git_repository_free(repo);
++ git_libgit2_shutdown();
+ return files;
+ }
+ }
+@@ -311,6 +316,7 @@ QStringList KateProjectWorker::filesFromGit(const QDir &dir, bool recursive)
+
+ git_object_free(root_tree);
+ git_repository_free(repo);
++ git_libgit2_shutdown();
+ return files;
+ }
+
+--
+2.5.2
+
diff --git a/kde-apps/kate/kate-15.08.1.ebuild b/kde-apps/kate/kate-15.08.1.ebuild
new file mode 100644
index 0000000..6b7562b
--- /dev/null
+++ b/kde-apps/kate/kate-15.08.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ addons? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep threadweaver)
+ dev-qt/qtsql:5
+ >=dev-libs/libgit2-0.22.0:=
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-initialise-libgit2.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -i -e "/add_subdirectory( kwrite )/d" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build addons)
+ -DBUILD_kwrite=FALSE
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2015-12-13 17:47 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-12-13 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 91bff47110374a4300587d55c66ef9865afb015e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 13 11:02:31 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 17:47:39 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bff471
kde-apps/kate: Fix major bug with kde-frameworks 5.17
Caused by a change in kxmlgui. Lingering kate processes in the background,
inability to open new files in kate, countless empty kate windows at login
Package-Manager: portage-2.2.24
.../kate-15.08.3-fix-lingering-processes.patch | 26 ++++++++
kde-apps/kate/kate-15.08.3-r1.ebuild | 72 ++++++++++++++++++++++
2 files changed, 98 insertions(+)
diff --git a/kde-apps/kate/files/kate-15.08.3-fix-lingering-processes.patch b/kde-apps/kate/files/kate-15.08.3-fix-lingering-processes.patch
new file mode 100644
index 0000000..e7d982e
--- /dev/null
+++ b/kde-apps/kate/files/kate-15.08.3-fix-lingering-processes.patch
@@ -0,0 +1,26 @@
+From: Andreas Hartmetz <ahartmetz@gmail.com>
+Date: Sat, 05 Dec 2015 15:31:24 +0000
+Subject: setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=cd0163d7b956ace0e786a76d8211d06790a2c174
+---
+setQuitOnLastWindowClosed(false) causes lingering processes. Remove.
+
+Previously, it was set to true again later from
+KMainWindowPrivate::init(). I have changed that in KMainWindowPrivate
+so that applications have a better chance to set the property as they
+like - commit 155f524dd79add7d in kxmlgui.
+For Kate, true seems to be the correct setting.
+---
+
+
+--- a/kate/src/main.cpp
++++ b/kate/src/main.cpp
+@@ -133,7 +133,6 @@
+ app.setApplicationDisplayName(aboutData.displayName());
+ app.setOrganizationDomain(aboutData.organizationDomain());
+ app.setApplicationVersion(aboutData.version());
+- app.setQuitOnLastWindowClosed(false);
+
+ /**
+ * set the program icon
+
diff --git a/kde-apps/kate/kate-15.08.3-r1.ebuild b/kde-apps/kate/kate-15.08.3-r1.ebuild
new file mode 100644
index 0000000..e2e4939
--- /dev/null
+++ b/kde-apps/kate/kate-15.08.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ addons? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep threadweaver)
+ dev-qt/qtsql:5
+ >=dev-libs/libgit2-0.22.0:=
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.08.3-fix-lingering-processes.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -i -e "/add_subdirectory( kwrite )/d" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ADDONS=$(usex addons)
+ -DBUILD_kwrite=FALSE
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2018-01-18 23:01 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-01-18 23:01 UTC (permalink / raw
To: gentoo-commits
commit: f5920eec8fc2b0e926a1ad12ce92625543c735ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 21:01:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 23:01:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5920eec
kde-apps/kate: Drop bogus dep
Package-Manager: Portage-2.3.19, Repoman-2.3.6
kde-apps/kate/files/kate-17.12.1-deps.patch | 79 +++++++++++++++++++++++++++++
kde-apps/kate/kate-17.12.1-r1.ebuild | 76 +++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/kde-apps/kate/files/kate-17.12.1-deps.patch b/kde-apps/kate/files/kate-17.12.1-deps.patch
new file mode 100644
index 00000000000..05f3d53ff15
--- /dev/null
+++ b/kde-apps/kate/files/kate-17.12.1-deps.patch
@@ -0,0 +1,79 @@
+From 4a157701ad3fae7fed67a92a9d9359dd36f08341 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A5re=20S=C3=A4rs?= <kare.sars@iki.fi>
+Date: Tue, 12 Dec 2017 07:24:53 +0200
+Subject: Remove obsolete QScript includes from CMake files
+
+Differential Revision: https://phabricator.kde.org/D9291
+---
+ CMakeLists.txt | 2 +-
+ addons/katesql/CMakeLists.txt | 2 +-
+ addons/project/CMakeLists.txt | 2 +-
+ addons/search/CMakeLists.txt | 2 +-
+ addons/snippets/CMakeLists.txt | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fc7d3e..b746376 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ include (CheckFunctionExists)
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
+
+ if(BUILD_TESTING)
+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/addons/katesql/CMakeLists.txt b/addons/katesql/CMakeLists.txt
+index aba9a38..c4fee13 100644
+--- a/addons/katesql/CMakeLists.txt
++++ b/addons/katesql/CMakeLists.txt
+@@ -32,6 +32,6 @@ kcoreaddons_desktop_to_json (katesqlplugin katesql.desktop)
+ target_link_libraries(katesqlplugin
+ KF5::TextEditor
+ KF5::Parts KF5::I18n KF5::Wallet
+- Qt5::Script Qt5::Sql KF5::ItemViews KF5::IconThemes)
++ Qt5::Sql KF5::ItemViews KF5::IconThemes)
+
+ install(TARGETS katesqlplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
+index 6787197..12a0ff7 100644
+--- a/addons/project/CMakeLists.txt
++++ b/addons/project/CMakeLists.txt
+@@ -38,7 +38,7 @@ target_link_libraries(kateprojectplugin
+ KF5::TextEditor
+ KF5::Parts KF5::I18n
+ KF5::GuiAddons
+- Qt5::Script KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
++ KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
+ KF5::NewStuff # For KMoreTools
+ )
+
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
+index d86c326..856221f 100644
+--- a/addons/search/CMakeLists.txt
++++ b/addons/search/CMakeLists.txt
+@@ -19,6 +19,6 @@ kcoreaddons_desktop_to_json (katesearchplugin katesearch.desktop)
+ target_link_libraries(katesearchplugin
+ KF5::TextEditor
+ KF5::Parts KF5::I18n KF5::IconThemes
+- Qt5::Script KF5::ItemViews)
++ KF5::ItemViews)
+
+ install(TARGETS katesearchplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor)
+diff --git a/addons/snippets/CMakeLists.txt b/addons/snippets/CMakeLists.txt
+index a19277e..4182866 100644
+--- a/addons/snippets/CMakeLists.txt
++++ b/addons/snippets/CMakeLists.txt
+@@ -29,6 +29,6 @@ kcoreaddons_desktop_to_json (katesnippetsplugin katesnippetsplugin.desktop)
+ target_link_libraries(katesnippetsplugin
+ KF5::TextEditor
+ KF5::Parts KF5::I18n
+- KF5::NewStuff Qt5::Script KF5::ItemViews KF5::IconThemes)
++ KF5::NewStuff KF5::ItemViews KF5::IconThemes)
+
+ install(TARGETS katesnippetsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
+--
+cgit v0.11.2
+
diff --git a/kde-apps/kate/kate-17.12.1-r1.ebuild b/kde-apps/kate/kate-17.12.1-r1.ebuild
new file mode 100644
index 00000000000..d3e0aa0fc85
--- /dev/null
+++ b/kde-apps/kate/kate-17.12.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ addons? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep threadweaver)
+ $(add_qt_dep qtsql)
+ )
+"
+RDEPEND="${DEPEND}
+ !kde-misc/ktexteditorpreviewplugin
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+ # test hangs
+ sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
+ # delete colliding kwrite translations
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ find po -type f -name "*po" -and -name "kwrite*" -delete || die
+ rm -rf po/*/docs/kwrite || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_addons=$(usex addons)
+ -DBUILD_kwrite=FALSE
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2021-04-24 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 16:52 UTC (permalink / raw
To: gentoo-commits
commit: ed4e6d1552269246fd472bc57b16edd38903768b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 16:16:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 16:51:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4e6d15
kde-apps/kate: Fix and add implicit dependency
See also: https://invent.kde.org/utilities/kate/-/merge_requests/369
Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/785412
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kate/files/kate-21.04.0-implicit-dep.patch | 70 +++++++++++++
kde-apps/kate/kate-21.04.0-r1.ebuild | 108 +++++++++++++++++++++
2 files changed, 178 insertions(+)
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
new file mode 100644
index 00000000000..055a6bc9bec
--- /dev/null
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -0,0 +1,70 @@
+From 07e6813244435c93a944cca17dc3c4364a579606 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:08:33 +0200
+Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search
+
+Implicit use via KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ addons/project/CMakeLists.txt | 5 ++++-
+ addons/search/CMakeLists.txt | 7 +++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
+index 16487f6cc..6fbf5a819 100644
+--- a/addons/project/CMakeLists.txt
++++ b/addons/project/CMakeLists.txt
+@@ -1,3 +1,4 @@
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
+ find_package(
+ KF5 ${KF5_DEP_VERSION}
+ QUIET
+@@ -9,7 +10,7 @@ find_package(
+ set_package_properties(KFGuiAddons PROPERTIES PURPOSE "Required to build the project addon")
+ set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the project addon")
+
+-if(NOT KF5_FOUND)
++if(NOT KF5_FOUND OR NOT Qt5Concurrent_FOUND)
+ return()
+ endif()
+
+@@ -18,6 +19,8 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
+
+ target_link_libraries(
+ kateprojectplugin
++ PUBLIC
++ Qt5::Concurrent
+ PRIVATE
+ KF5::GuiAddons
+ KF5::NewStuff
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
+index 9bbe2c1c9..8dc18699b 100644
+--- a/addons/search/CMakeLists.txt
++++ b/addons/search/CMakeLists.txt
+@@ -1,7 +1,8 @@
++find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET)
+ set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon")
+
+-if(NOT KF5ItemViews_FOUND)
++if(NOT KF5ItemViews_FOUND OR NOT Qt5Concurrent_FOUND)
+ return()
+ endif()
+
+@@ -9,7 +10,9 @@ add_library(katesearchplugin MODULE "")
+ target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
+
+ target_link_libraries(
+- katesearchplugin
++ katesearchplugin
++ PUBLIC
++ Qt5::Concurrent
+ PRIVATE
+ KF5::ItemViews
+ KF5::TextEditor
+--
+2.31.1
+
diff --git a/kde-apps/kate/kate-21.04.0-r1.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild
new file mode 100644
index 00000000000..595730cc0ff
--- /dev/null
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
+
+# only addons/externaltools depends on kiconthemes, too small for USE
+DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
+ lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
+ plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+ projects? (
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/threadweaver-${KFMIN}:5
+ )
+ snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
+ sql? (
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ )
+ telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412
+
+src_prepare() {
+ ecm_src_prepare
+
+ # delete colliding kwrite translations
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ find po -type f -name "*po" -and -name "kwrite*" -delete || die
+ rm -rf po/*/docs/kwrite || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ -DBUILD_filebrowser=$(usex filebrowser)
+ -DBUILD_lspclient=$(usex lspclient)
+ -DBUILD_sessionapplet=$(usex plasma)
+ -DBUILD_project=$(usex projects)
+ -DBUILD_snippets=$(usex snippets)
+ -DBUILD_katesql=$(usex sql)
+ -DBUILD_kwrite=FALSE
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # tests hang
+ local myctestargs=(
+ -E "(session_manager_test|sessions_action_test)"
+ )
+
+ ecm_src_test
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
+ optfeature "DOT graph file previews" media-gfx/kgraphviewer
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2021-04-24 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 3c88a4b530299899491dbb80ed00a09b8458f077
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 17:29:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 17:42:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c88a4b5
kde-apps/kate: Patch upstreamed; update after review
Upstream commit: 93d8c2a1887ab70455f471d8e05f346921497a36
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kate/files/kate-21.04.0-implicit-dep.patch | 25 +++++++++++-----------
kde-apps/kate/kate-21.04.0-r1.ebuild | 2 +-
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
index 055a6bc9bec..482d9a872cd 100644
--- a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -1,4 +1,4 @@
-From 07e6813244435c93a944cca17dc3c4364a579606 Mon Sep 17 00:00:00 2001
+From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 24 Apr 2021 18:08:33 +0200
Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search
@@ -9,12 +9,12 @@ See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
- addons/project/CMakeLists.txt | 5 ++++-
- addons/search/CMakeLists.txt | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
+ addons/project/CMakeLists.txt | 4 +++-
+ addons/search/CMakeLists.txt | 6 ++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
-index 16487f6cc..6fbf5a819 100644
+index 16487f6cc..b1f66ada3 100644
--- a/addons/project/CMakeLists.txt
+++ b/addons/project/CMakeLists.txt
@@ -1,3 +1,4 @@
@@ -31,17 +31,16 @@ index 16487f6cc..6fbf5a819 100644
return()
endif()
-@@ -18,6 +19,8 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
-
+@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
target_link_libraries(
kateprojectplugin
-+ PUBLIC
-+ Qt5::Concurrent
PRIVATE
++ Qt5::Concurrent
KF5::GuiAddons
KF5::NewStuff
+ KF5::TextEditor
diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
-index 9bbe2c1c9..8dc18699b 100644
+index 9bbe2c1c9..a541f78b8 100644
--- a/addons/search/CMakeLists.txt
+++ b/addons/search/CMakeLists.txt
@@ -1,7 +1,8 @@
@@ -54,17 +53,17 @@ index 9bbe2c1c9..8dc18699b 100644
return()
endif()
-@@ -9,7 +10,9 @@ add_library(katesearchplugin MODULE "")
+@@ -9,8 +10,9 @@ add_library(katesearchplugin MODULE "")
target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
target_link_libraries(
- katesearchplugin
+ katesearchplugin
-+ PUBLIC
-+ Qt5::Concurrent
PRIVATE
++ Qt5::Concurrent
KF5::ItemViews
KF5::TextEditor
+ )
--
2.31.1
diff --git a/kde-apps/kate/kate-21.04.0-r1.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild
index 595730cc0ff..c453398ad30 100644
--- a/kde-apps/kate/kate-21.04.0-r1.ebuild
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild
@@ -62,7 +62,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412, master/21.08
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-24 17:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-18 23:01 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/files/, kde-apps/kate/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-04-24 17:42 Andreas Sturmlechner
2021-04-24 16:52 Andreas Sturmlechner
2015-12-13 17:47 Michael Palimaka
2015-09-24 17:56 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox