* [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/
@ 2022-02-21 16:48 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-02-21 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 6adfde4ce0da5899b61d1fe5ff2ecf1e6251f371
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 14:57:26 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 16:45:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adfde4c
app-editors/okteta: EAPI-8 bump, upstream crash fix
Upstream commit 607390315750815b0009b95ecd65699e2a1d110a
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444405
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../okteta/files/okteta-0.26.6-crashfix.patch | 34 +++++++++++
app-editors/okteta/okteta-0.26.6-r1.ebuild | 71 ++++++++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
new file mode 100644
index 000000000000..8967fc788f5c
--- /dev/null
+++ b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
@@ -0,0 +1,34 @@
+From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Thu, 11 Nov 2021 15:57:54 +0100
+Subject: [PATCH] String extraction tool: fix crash with marked strings in
+ closed view
+
+BUG: 444405
+
+FIXED-IN: 0.26.7
+---
+ .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+index 0d629999a..bcb6b6734 100644
+--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
++++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t
+ void StringsExtractTool::setTargetModel(AbstractModel* model)
+ {
+ if (mByteArrayView) {
+- mByteArrayView->disconnect(this);
++ // disconnect explicitly from all connects but QObject::detroyed,
++ // for the case mSourceByteArrayView is mByteArrayView
++ disconnect(mByteArrayView, &ByteArrayView::selectedDataChanged,
++ this, &StringsExtractTool::onSelectionChanged);
++ disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged,
++ this, &StringsExtractTool::offsetCodingChanged);
+ }
+
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
+--
+GitLab
+
diff --git a/app-editors/okteta/okteta-0.26.6-r1.ebuild b/app-editors/okteta/okteta-0.26.6-r1.ebuild
new file mode 100644
index 000000000000..069fb020a206
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+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/kcmutils-${KFMIN}: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/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${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
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DOMIT_EXAMPLES=ON
+ $(cmake_use_find_package crypt Qca-qt5)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local myctestargs=( -j1 )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/
@ 2022-02-24 16:06 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-02-24 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 632b1b27aaeda67e8e3c357b60e4d1ee03248175
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 16:00:41 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:06:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632b1b27
app-editors/okteta: Drop 0.26.6-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../okteta/files/okteta-0.26.6-crashfix.patch | 34 -----------
app-editors/okteta/okteta-0.26.6-r1.ebuild | 71 ----------------------
2 files changed, 105 deletions(-)
diff --git a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
deleted file mode 100644
index 8967fc788f5c..000000000000
--- a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Thu, 11 Nov 2021 15:57:54 +0100
-Subject: [PATCH] String extraction tool: fix crash with marked strings in
- closed view
-
-BUG: 444405
-
-FIXED-IN: 0.26.7
----
- .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-index 0d629999a..bcb6b6734 100644
---- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-+++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t
- void StringsExtractTool::setTargetModel(AbstractModel* model)
- {
- if (mByteArrayView) {
-- mByteArrayView->disconnect(this);
-+ // disconnect explicitly from all connects but QObject::detroyed,
-+ // for the case mSourceByteArrayView is mByteArrayView
-+ disconnect(mByteArrayView, &ByteArrayView::selectedDataChanged,
-+ this, &StringsExtractTool::onSelectionChanged);
-+ disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged,
-+ this, &StringsExtractTool::offsetCodingChanged);
- }
-
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
---
-GitLab
-
diff --git a/app-editors/okteta/okteta-0.26.6-r1.ebuild b/app-editors/okteta/okteta-0.26.6-r1.ebuild
deleted file mode 100644
index 069fb020a206..000000000000
--- a/app-editors/okteta/okteta-0.26.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-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/kcmutils-${KFMIN}: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/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${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
- crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DOMIT_EXAMPLES=ON
- $(cmake_use_find_package crypt Qca-qt5)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- local myctestargs=( -j1 )
-
- ecm_src_test
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/
@ 2023-08-27 20:56 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-08-27 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 6228099a74fb31ded95477a2a20aec69d381b050
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 20:47:23 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 20:55:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6228099a
app-editors/okteta: Fix build w/ USE=-handbook
See also:
https://github.com/gentoo/gentoo/pull/32474
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/okteta-0.26.13-doctools-optional.patch | 35 ++++++++++++++++++++++
app-editors/okteta/okteta-0.26.13.ebuild | 2 ++
2 files changed, 37 insertions(+)
diff --git a/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch
new file mode 100644
index 000000000000..65beb70faae9
--- /dev/null
+++ b/app-editors/okteta/files/okteta-0.26.13-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(KF5DocTools ${REQUIRED_KF_VERSION} REQUIRED)
+ add_subdirectory( doc )
+ endif()
+
+--
+2.42.0
+
diff --git a/app-editors/okteta/okteta-0.26.13.ebuild b/app-editors/okteta/okteta-0.26.13.ebuild
index 4d7c709b3373..6a2d27d2f802 100644
--- a/app-editors/okteta/okteta-0.26.13.ebuild
+++ b/app-editors/okteta/okteta-0.26.13.ebuild
@@ -53,6 +53,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-doctools-optional.patch" ) # downstream
+
src_configure() {
local mycmakeargs=(
-DOMIT_EXAMPLES=ON
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-27 20:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-27 20:56 [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-02-24 16:06 Andreas Sturmlechner
2022-02-21 16:48 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox