summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-08-20 23:23:12 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-08-20 23:35:15 +0200
commit1be7bbd1b1a16bd9e6d03f1269a545c5c6325be4 (patch)
treefd0f63975d184f8e00e84ebb4018c3e3e14e01f5
parent6ee31f6ae0e5de4c04fbb7172b615355342c7323 (diff)
downloadkde-1be7bbd1b1a16bd9e6d03f1269a545c5c6325be4.tar.gz
kde-1be7bbd1b1a16bd9e6d03f1269a545c5c6325be4.tar.bz2
kde-1be7bbd1b1a16bd9e6d03f1269a545c5c6325be4.zip
kde-apps/kwrite: drop 22.07.90
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/kwrite/Manifest1
-rw-r--r--kde-apps/kwrite/files/kate-22.07.80-split-build-from-source.patch75
-rw-r--r--kde-apps/kwrite/kwrite-22.07.90.ebuild64
3 files changed, 0 insertions, 140 deletions
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 62cf1d6acc4..7560099051f 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,2 +1 @@
-DIST kate-22.07.90.tar.xz 7655928 BLAKE2B cf4635b22f00863539899d9e3aecdc58bd49d8274683320fb8cd3d3e8810d92a1386b0380e6c385708034a0697e92cfc453770cbe9be0d087756cc94e1ff8380 SHA512 7d7c8842e28a630c1a7e9a93421dca9f54418c3b9071bb89e973d4a5983dec420ca78027792da9cd340360768bbc50bba9f4d96722dcaf221a091b8b3ea1a7ac
DIST kate-22.08.0.tar.xz 7655384 BLAKE2B 7f8ccf67f6e29c3047b3ad4cdbd28d373d35b5d4cb580aa29097229ad5910ed2393fe97acc742c755a4b35711086aaa55c698fc3fe3fbd0d3e64d9df021b15e8 SHA512 637e5314cabe87efdd6f8162b955d9b369a6bc12e77006325dd3038d517208ef5aca457ca2932cd37c1f98301b7a1968f30859e5c7a5cb16ce0b974910d7c5bc
diff --git a/kde-apps/kwrite/files/kate-22.07.80-split-build-from-source.patch b/kde-apps/kwrite/files/kate-22.07.80-split-build-from-source.patch
deleted file mode 100644
index a574058b9a9..00000000000
--- a/kde-apps/kwrite/files/kate-22.07.80-split-build-from-source.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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/kwrite/kwrite-22.07.90.ebuild b/kde-apps/kwrite/kwrite-22.07.90.ebuild
deleted file mode 100644
index d48569c60ce..00000000000
--- a/kde-apps/kwrite/kwrite-22.07.90.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kate"
-ECM_HANDBOOK="optional"
-KFMIN=5.96.0
-QTMIN=5.15.5
-inherit ecm gear.kde.org
-
-DESCRIPTION="Simple text editor based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kwrite/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities telemetry"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}: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/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${KDE_ORG_NAME}-22.07.80-split-build-from-source.patch" )
-
-src_prepare() {
- ecm_src_prepare
- # delete colliding kate translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
- rm -rf po/*/docs/kate* || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SPLIT_FROM_SOURCE=ON
- -DBUILD_addons=FALSE
- -DBUILD_kate=FALSE
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
- use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
- ecm_src_configure
-}