summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-11-25 22:54:51 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-11-26 19:17:55 +0100
commitc3bafa1312d3b43fd29ec9c9545b0df01ded44a8 (patch)
tree104014a9e77f590d4ed9818c010afa24f59bf76f
parent7490a4fe09fe59daa42a17164d50785d385aa26a (diff)
downloadkde-c3bafa1312d3b43fd29ec9c9545b0df01ded44a8.tar.gz
kde-c3bafa1312d3b43fd29ec9c9545b0df01ded44a8.tar.bz2
kde-c3bafa1312d3b43fd29ec9c9545b0df01ded44a8.zip
kde-plasma/keditfiletype: new package, add 6.2.49.9999, 9999
Bug: https://bugs.gentoo.org/944812 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/keditfiletype/files/keditfiletype-6.2.4-build-restrict.patch74
-rw-r--r--kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-dep.patch26
-rw-r--r--kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-include.patch25
-rw-r--r--kde-plasma/keditfiletype/keditfiletype-6.2.49.9999.ebuild52
-rw-r--r--kde-plasma/keditfiletype/keditfiletype-9999.ebuild49
-rw-r--r--kde-plasma/keditfiletype/metadata.xml12
6 files changed, 238 insertions, 0 deletions
diff --git a/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-build-restrict.patch b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-build-restrict.patch
new file mode 100644
index 00000000000..fa04a57f388
--- /dev/null
+++ b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-build-restrict.patch
@@ -0,0 +1,74 @@
+From aca455335ebcbc8818aacb75ffb7ef026ccc82e4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF6 and Qt6 modules optional, disable all subdirs
+ except kdesu
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1092bf8..4667f06d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+
+ include(KDEGitCommitHooks)
+
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG COMPONENTS
+ Widgets
+ Svg
+ DBus
+@@ -44,7 +44,7 @@ if (NOT Qt6Test_FOUND)
+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+
+-find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS
+ Config
+ DocTools
+ IconThemes
+@@ -79,23 +79,23 @@ function(install_compat_symlink executable_target)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${executable_target}5 DESTINATION ${KDE_INSTALL_FULL_BINDIR})
+ endfunction()
+
+ add_subdirectory(keditfiletype)
+-add_subdirectory(kmimetypefinder)
+-add_subdirectory(kioclient)
+-add_subdirectory(ksvgtopng)
+-add_subdirectory(kdeinhibit)
+-add_subdirectory(plasma-open-settings)
+-add_subdirectory(kinfo)
+-add_subdirectory(kstart)
++#add_subdirectory(kmimetypefinder)
++#add_subdirectory(kioclient)
++#add_subdirectory(ksvgtopng)
++#add_subdirectory(kdeinhibit)
++#add_subdirectory(plasma-open-settings)
++#add_subdirectory(kinfo)
++#add_subdirectory(kstart)
+
+-if(KF6Su_FOUND AND KF6WidgetsAddons_FOUND)
+- add_subdirectory(kdesu)
+-endif()
++#if(KF6Su_FOUND AND KF6WidgetsAddons_FOUND)
++# add_subdirectory(kdesu)
++#endif()
+
+-if(UNIX)
+- add_subdirectory(kdeeject)
+- add_subdirectory(kbroadcastnotification)
+-endif()
++#if(UNIX)
++# add_subdirectory(kdeeject)
++# add_subdirectory(kbroadcastnotification)
++#endif()
+
+ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+
+--
+2.46.0
+
diff --git a/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-dep.patch b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-dep.patch
new file mode 100644
index 00000000000..84f0a2ac0c5
--- /dev/null
+++ b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-dep.patch
@@ -0,0 +1,26 @@
+From 73cc55ac619067339afc9741a62e6ad47f1cf2df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 25 Nov 2024 21:53:19 +0100
+Subject: [PATCH] keditfiletype: KF6ConfigCore is used, not KF6ConfigWidgets
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ keditfiletype/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keditfiletype/CMakeLists.txt b/keditfiletype/CMakeLists.txt
+index 7fdf6f2e..a3c6df3f 100644
+--- a/keditfiletype/CMakeLists.txt
++++ b/keditfiletype/CMakeLists.txt
+@@ -40,7 +40,7 @@ kcoreaddons_add_plugin(kcm_filetypes SOURCES ${kcm_filetypes_SRCS} INSTALL_NAMES
+
+ kcmutils_generate_desktop_file(kcm_filetypes)
+ target_link_libraries(kcm_filetypes
+- KF6::ConfigWidgets
++ KF6::ConfigCore
+ KF6::IconThemes
+ KF6::IconWidgets
+ KF6::I18n
+--
+2.47.0
+
diff --git a/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-include.patch b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-include.patch
new file mode 100644
index 00000000000..d0a3843463e
--- /dev/null
+++ b/kde-plasma/keditfiletype/files/keditfiletype-6.2.4-unused-include.patch
@@ -0,0 +1,25 @@
+From 34dcc4b9787eb73a658acded7fa93469f4b5cb8b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 25 Nov 2024 23:02:56 +0100
+Subject: [PATCH] keditfiletype: Drop unused KMessageBox include
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ keditfiletype/kservicelistwidget.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/keditfiletype/kservicelistwidget.cpp b/keditfiletype/kservicelistwidget.cpp
+index 6c638fd5..32b2a413 100644
+--- a/keditfiletype/kservicelistwidget.cpp
++++ b/keditfiletype/kservicelistwidget.cpp
+@@ -17,7 +17,6 @@
+
+ // KDE
+ #include <KLocalizedString>
+-#include <KMessageBox>
+ #include <KOpenWithDialog>
+ #include <KPropertiesDialog>
+
+--
+2.47.0
+
diff --git a/kde-plasma/keditfiletype/keditfiletype-6.2.49.9999.ebuild b/kde-plasma/keditfiletype/keditfiletype-6.2.49.9999.ebuild
new file mode 100644
index 00000000000..6b4eb8d1241
--- /dev/null
+++ b/kde-plasma/keditfiletype/keditfiletype-6.2.49.9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KDE_ORG_NAME="kde-cli-tools"
+KFMIN=6.6.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="File Type Editor"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+ !<${CATEGORY}/${KDE_ORG_NAME}-6.2.4:*
+ >=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-6.2.4-build-restrict.patch" # downstream split
+ "${FILESDIR}/${PN}-6.2.4-unused-dep.patch" # in 6.3
+ "${FILESDIR}/${PN}-6.2.4-unused-include.patch" # pending for 6.3
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
diff --git a/kde-plasma/keditfiletype/keditfiletype-9999.ebuild b/kde-plasma/keditfiletype/keditfiletype-9999.ebuild
new file mode 100644
index 00000000000..a397850d656
--- /dev/null
+++ b/kde-plasma/keditfiletype/keditfiletype-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KDE_ORG_NAME="kde-cli-tools"
+KFMIN=9999
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="File Type Editor"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# requires running Plasma environment
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+ !<${CATEGORY}/${KDE_ORG_NAME}-6.2.4:*
+ >=${CATEGORY}/${KDE_ORG_NAME}-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+# downstream split
+PATCHES=( "${FILESDIR}/${PN}-6.2.4-build-restrict.patch" )
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
diff --git a/kde-plasma/keditfiletype/metadata.xml b/kde-plasma/keditfiletype/metadata.xml
new file mode 100644
index 00000000000..7e9d56c900d
--- /dev/null
+++ b/kde-plasma/keditfiletype/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">plasma/kde-cli-tools</remote-id>
+ </upstream>
+</pkgmetadata>