public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2015-01-21 22:52 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2015-01-21 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     1113ca15d1439bd3356275cf5dbcf135dba8cc0b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jan 21 21:17:34 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 22:52:41 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1113ca15

[kde-apps/kate] Make tests optional

---
 kde-apps/kate/files/kate-9999-tests-optional.patch | 15 +++++++++++++++
 kde-apps/kate/kate-9999.ebuild                     |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kate/files/kate-9999-tests-optional.patch b/kde-apps/kate/files/kate-9999-tests-optional.patch
new file mode 100644
index 0000000..f7e29ef
--- /dev/null
+++ b/kde-apps/kate/files/kate-9999-tests-optional.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2015-01-21 21:44:44.786490427 +0100
++++ b/CMakeLists.txt	2015-01-21 22:07:15.833138021 +0100
+@@ -30,7 +30,11 @@
+ include(KDECMakeSettings)
+ include(KDECompilerSettings)
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql Test)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
++
++if(BUILD_TESTING)
++  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ 
+ # Load the frameworks we need
+ find_package(KF5 REQUIRED COMPONENTS

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index af4c41b..6f556c7 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
@@ -53,6 +54,8 @@ RDEPEND="${DEPEND}
 	!kde-base/kate:4
 "
 
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build addons)


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2015-09-13 18:57 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-09-13 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     57c2a20a71386e86ad4e49d5540b7e99ab28dd8d
Author:     Andrew Wilcox <AWilcox <AT> Wilcox-Tech <DOT> com>
AuthorDate: Sun Sep 13 15:08:18 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:57:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=57c2a20a

kde-apps/kate: Patch to properly initialise libgit2

If dev-libs/libgit2 is installed on a system where Kate is subsequently
built, it will attempt to use the library incorrectly and segfault.  Add
a patch to work around this bug (upstream #352627).

 .../files/kate-15.08.1-initialise-libgit2.patch    | 57 ++++++++++++++++++++++
 kde-apps/kate/kate-15.08.1.ebuild                  |  2 +
 2 files changed, 59 insertions(+)

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
index 2b66932..e676619 100644
--- a/kde-apps/kate/kate-15.08.1.ebuild
+++ b/kde-apps/kate/kate-15.08.1.ebuild
@@ -54,6 +54,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( ${FILESDIR}/${P}-initialise-libgit2.patch )
+
 src_prepare() {
 	kde5_src_prepare
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2018-01-18 21:29 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-01-18 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     287a7e5af4faf529d1757f4cd76f5798652435a6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 21:02:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 21:02:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=287a7e5a

kde-apps/kate: Drop obsolete DEPEND

Upstream commit 4a157701ad3fae7fed67a92a9d9359dd36f08341
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.49.9999.ebuild     |  2 +
 kde-apps/kate/kate-9999.ebuild              |  1 -
 3 files changed, 81 insertions(+), 1 deletion(-)

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 0000000000..05f3d53ff1
--- /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.49.9999.ebuild b/kde-apps/kate/kate-17.12.49.9999.ebuild
index ae0924c282..861377cb79 100644
--- a/kde-apps/kate/kate-17.12.49.9999.ebuild
+++ b/kde-apps/kate/kate-17.12.49.9999.ebuild
@@ -54,6 +54,8 @@ RDEPEND="${DEPEND}
 	!kde-misc/ktexteditorpreviewplugin
 "
 
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-deps.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	# test hangs

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index ae0924c282..7760f20e57 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -38,7 +38,6 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	addons? (


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2018-07-08 15:48 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-07-08 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a16ef3874678c775f2fb5e5b6ef1fdb2184034be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 15:47:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 15:47:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a16ef387

kde-apps/kate: Backport start-as-root

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 kde-apps/kate/files/kate-18.04.3-root-user.patch | 62 ++++++++++++++++++++++++
 kde-apps/kate/kate-18.04.49.9999.ebuild          |  2 +
 2 files changed, 64 insertions(+)

diff --git a/kde-apps/kate/files/kate-18.04.3-root-user.patch b/kde-apps/kate/files/kate-18.04.3-root-user.patch
new file mode 100644
index 0000000000..320c174035
--- /dev/null
+++ b/kde-apps/kate/files/kate-18.04.3-root-user.patch
@@ -0,0 +1,62 @@
+From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
+From: Nathaniel Graham <nate@kde.org>
+Date: Sat, 26 May 2018 14:50:24 -0600
+Subject: Re-allow running Kate and KWrite as the actual root user (but still
+ not using sudo)
+
+Summary:
+The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
+
+This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
+
+I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
+
+BUG: 387973
+FIXED-IN: 18.08.0
+
+Test Plan:
+- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
+- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
+- Log in as the root user and run Kate or KWrite normally: it works.
+
+Reviewers: #kate, dhaumann, cullmann, #ktexteditor
+
+Reviewed By: #kate, dhaumann, #ktexteditor
+
+Subscribers: kwrite-devel, elvisangelaccio
+
+Tags: #kate
+
+Differential Revision: https://phabricator.kde.org/D13138
+---
+ kate/main.cpp   | 14 ++++++++------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/kate/main.cpp b/kate/main.cpp
+index e20fcff..19f7a99 100644
+--- a/kate/main.cpp
++++ b/kate/main.cpp
+@@ -61,13 +61,15 @@
+ int main(int argc, char **argv)
+ {
+ #ifndef Q_OS_WIN
+-    /**
+-     * Check whether we are running as root
+-     **/
++    // Prohibit using sudo or kdesu (but allow using the root user directly)
+     if (getuid() == 0) {
+-        std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl;
+-        std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl;
+-        return 0;
++        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
++            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
++            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
++            return EXIT_FAILURE;
++        }
+     }
+ #endif
+     /**
+-- 
+cgit v0.11.2

diff --git a/kde-apps/kate/kate-18.04.49.9999.ebuild b/kde-apps/kate/kate-18.04.49.9999.ebuild
index ce8e6b9061..5998918660 100644
--- a/kde-apps/kate/kate-18.04.49.9999.ebuild
+++ b/kde-apps/kate/kate-18.04.49.9999.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}
 	!kde-misc/ktexteditorpreviewplugin
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	# test hangs


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/
@ 2022-07-23 10:36 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-07-23 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     60ac6dd3ca12ca42e14b17864f33cb412343aeea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 10:27:45 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 10:36:29 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60ac6dd3

kde-apps/kate: Workaround upstream's reshuffling of build system

Fixing kate vs. kwrite conflicting in shared kateprivate library.

Patch pending upstream:
https://invent.kde.org/utilities/kate/-/merge_requests/815

Upstream commits:
5ef89b41cfc1c78fe9dc91e93f9bc8c63984a1cb
8ebf728518162248bd7178c1f55678f2d4c6b77c

Closes: https://bugs.gentoo.org/859358
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kate-22.07.80-split-build-from-source.patch    | 75 ++++++++++++++++++++++
 kde-apps/kate/kate-22.07.80.ebuild                 |  5 +-
 kde-apps/kate/kate-22.08.49.9999.ebuild            |  5 +-
 kde-apps/kate/kate-9999.ebuild                     |  5 +-
 4 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kate/files/kate-22.07.80-split-build-from-source.patch b/kde-apps/kate/files/kate-22.07.80-split-build-from-source.patch
new file mode 100644
index 0000000000..a574058b9a
--- /dev/null
+++ b/kde-apps/kate/files/kate-22.07.80-split-build-from-source.patch
@@ -0,0 +1,75 @@
+From 9062475ec3ef15ff9355cbbdc581a59653589534 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 23 Jul 2022 12:09:28 +0200
+Subject: [PATCH 1/2] lib is not optional, so don't pretend it is
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ apps/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index 04b048482..669f10a35 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # kateprivate shared library used by Kate & KWrite (and addons)
+-ecm_optional_add_subdirectory(lib)
++add_subdirectory(lib)
+ 
+ # the Kate application
+ ecm_optional_add_subdirectory(kate)
+-- 
+2.35.1
+
+
+From def5d43a015779e26b6e438e1b2f38afb7bd8b27 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 23 Jul 2022 12:16:26 +0200
+Subject: [PATCH 2/2] Add option to -DBUILD_SPLIT_FROM_SOURCE
+
+This will enable source-based distributions like Gentoo to keep split
+kate/kwrite packaging not conflicting with one another by not
+requiring to install a duplicate kateprivate lib.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt          | 5 +++++
+ apps/lib/CMakeLists.txt | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e7fff38db..1ec401c55 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,6 +35,11 @@ include(ECMDeprecationSettings)
+ 
+ include(FeatureSummary)
+ 
++option(BUILD_SPLIT_FROM_SOURCE "This will build kateprivate as a static library" OFF)
++set(KATEPRIVATE_LIB_MODE "SHARED")
++if(BUILD_SPLIT_FROM_SOURCE)
++    set(KATEPRIVATE_LIB_MODE "STATIC")
++endif()
+ 
+ ecm_set_disabled_deprecation_versions(
+     QT 5.15
+diff --git a/apps/lib/CMakeLists.txt b/apps/lib/CMakeLists.txt
+index a883cf5c5..04dcb340c 100644
+--- a/apps/lib/CMakeLists.txt
++++ b/apps/lib/CMakeLists.txt
+@@ -1,7 +1,9 @@
+ # Kate shared library, used by Kate/KWrite and the addons
+-add_library(kateprivate SHARED "")
++add_library(kateprivate ${KATEPRIVATE_LIB_MODE} "")
+ set_target_properties(kateprivate PROPERTIES VERSION ${RELEASE_SERVICE_VERSION})
+-install(TARGETS kateprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
++if(NOT BUILD_SPLIT_FROM_SOURCE)
++  install(TARGETS kateprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
++endif()
+ 
+ # ensure right translations domain, we use one kate.po(t) for lib + apps
+ target_compile_definitions(kateprivate PRIVATE TRANSLATION_DOMAIN="kate")
+-- 
+2.35.1
+

diff --git a/kde-apps/kate/kate-22.07.80.ebuild b/kde-apps/kate/kate-22.07.80.ebuild
index 09d0429d2a..61bf6cc268 100644
--- a/kde-apps/kate/kate-22.07.80.ebuild
+++ b/kde-apps/kate/kate-22.07.80.ebuild
@@ -61,6 +61,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.07.80-split-build-from-source.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 
@@ -73,6 +75,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SPLIT_FROM_SOURCE=ON
+		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
@@ -80,7 +84,6 @@ src_configure() {
 		-DBUILD_project=$(usex projects)
 		-DBUILD_snippets=$(usex snippets)
 		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 

diff --git a/kde-apps/kate/kate-22.08.49.9999.ebuild b/kde-apps/kate/kate-22.08.49.9999.ebuild
index 1e728c4adb..f53f645395 100644
--- a/kde-apps/kate/kate-22.08.49.9999.ebuild
+++ b/kde-apps/kate/kate-22.08.49.9999.ebuild
@@ -61,6 +61,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.07.80-split-build-from-source.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 
@@ -73,6 +75,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SPLIT_FROM_SOURCE=ON
+		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
@@ -80,7 +84,6 @@ src_configure() {
 		-DBUILD_project=$(usex projects)
 		-DBUILD_snippets=$(usex snippets)
 		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 

diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index 1e728c4adb..f53f645395 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-9999.ebuild
@@ -61,6 +61,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.07.80-split-build-from-source.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 
@@ -73,6 +75,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SPLIT_FROM_SOURCE=ON
+		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package activities KF5Activities)
 		-DBUILD_filebrowser=$(usex filebrowser)
 		-DBUILD_lspclient=$(usex lspclient)
@@ -80,7 +84,6 @@ src_configure() {
 		-DBUILD_project=$(usex projects)
 		-DBUILD_snippets=$(usex snippets)
 		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-07-23 10:36 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-23 10:36 [gentoo-commits] proj/kde:master commit in: kde-apps/kate/files/, kde-apps/kate/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-07-08 15:48 Andreas Sturmlechner
2018-01-18 21:29 Andreas Sturmlechner
2015-09-13 18:57 Michael Palimaka
2015-01-21 22:52 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox