diff options
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/okteta/files/okteta-0.26.60-doctools-optional.patch | 35 | ||||
| -rw-r--r-- | app-editors/okteta/okteta-9999.ebuild | 69 |
2 files changed, 75 insertions, 29 deletions
diff --git a/app-editors/okteta/files/okteta-0.26.60-doctools-optional.patch b/app-editors/okteta/files/okteta-0.26.60-doctools-optional.patch new file mode 100644 index 00000000000..4f69d305e26 --- /dev/null +++ b/app-editors/okteta/files/okteta-0.26.60-doctools-optional.patch @@ -0,0 +1,35 @@ +From 5ca1bc18272c0ddbb3496fa29076ac2d65c034cf Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 27 Aug 2023 21:55:17 +0200 +Subject: [PATCH] Search for KF5DocTools individually + +Makes our ECM_HANDBOOK=forceoptional facility work while upstream is against it. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17203b22f..3c914f178 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,6 @@ if( BUILD_DESKTOPPROGRAM ) + list(APPEND ADDITIONAL_REQUIRED_KF_COMPONENTS + Crash + DBusAddons +- DocTools + ) + endif() + find_package(KF5 ${REQUIRED_KF_VERSION} REQUIRED +@@ -117,6 +116,7 @@ ecm_set_disabled_deprecation_versions( + # helper libs + add_subdirectory( libs ) + if( BUILD_DESKTOPPROGRAM ) ++ find_package(KF6DocTools ${REQUIRED_KF_VERSION} REQUIRED) + add_subdirectory( doc ) + endif() + +-- +2.42.0 + diff --git a/app-editors/okteta/okteta-9999.ebuild b/app-editors/okteta/okteta-9999.ebuild index b1f13ea0847..1242eeee1c6 100644 --- a/app-editors/okteta/okteta-9999.ebuild +++ b/app-editors/okteta/okteta-9999.ebuild @@ -6,9 +6,10 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.116.0 -QTMIN=5.15.17 -inherit ecm kde.org +EGIT_BRANCH="work/kossebau/kf6" +KFMIN=6.16.0 +QTMIN=6.8.1 +inherit ecm kde.org xdg DESCRIPTION="Hex editor by KDE" HOMEPAGE="https://apps.kde.org/okteta/" @@ -19,37 +20,47 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then fi LICENSE="GPL-2 handbook? ( FDL-1.2 )" -SLOT="5" +SLOT="0/4" IUSE="" +# TODO: re-add whatever JS engine they are going to use instead +# >=dev-qt/qtscript-${QTMIN}:5[scripttools] DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5[scripttools] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${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/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" + +PATCHES=( "${FILESDIR}/${PN}-0.26.60-doctools-optional.patch" ) # downstream -PATCHES=( "${FILESDIR}/${PN}-0.26.13-doctools-optional.patch" ) # downstream +pkg_setup() { + einfo "This ebuild is building upstream's work/kossebau/kf6 branch, which:" + einfo "- contains the complete dump of the \"it builds, starts and does not crash" + einfo " on simple usage\" changes" + einfo "- [is] continuously rebased to master branch, the latest current Qt5/KF5-based" + einfo "- [has] Structures tool disabled from build, needs QtScript port - so do NOT" + einfo " file a bug about that missing." +} src_configure() { local mycmakeargs=( |