app-text/marknote: add 1.4.1

The upstream fix that was previosly backported doesn't do enough.

Closes: https://bugs.gentoo.org/969201
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45519
Closes: https://github.com/gentoo/gentoo/pull/45519
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate
2026-01-26 05:48:44 +02:00
committed by Sam James
parent 723452aff4
commit a27e835592
3 changed files with 86 additions and 0 deletions

View File

@@ -1 +1,2 @@
DIST marknote-1.4.0.tar.xz 156084 BLAKE2B abe2c714c9779cbd902b2775a2134fab996fb3802af08cfc18a1f35fd009f09a8af5348e40cf5645f984232afebe322128535ff3ed55777435a0eaa247ed7a41 SHA512 688c60be526ec5a522526c3debf9de8f909515e0ae433939a9191b778e522356c03f3b0b1921c5b20dc15cb94ce147f9f72f0c930fa3ac299e566cc89162148b
DIST marknote-1.4.1.tar.xz 156312 BLAKE2B 82640fcb2e02c9296645df4e6480f47aadb0a2b4db9b924e84a8d46a40a7728af8197617a61b38d6cf19d3bd8ef240839f3d57045f3fd8a71f73174b8127efbf SHA512 7a54911f2a011b745fee30adf3df7cc91fc635ff9d2c40b490b073291d8e6f6bca018866cc8edff0a57a5a0363ca0fcfd943423e7ba59819189448dc921b069c

View File

@@ -0,0 +1,29 @@
https://bugs.gentoo.org/969201
API change in kmime
https://invent.kde.org/pim/kmime/-/commit/85384cfe2ff1881ed0e4cef578fb80522c0e0250
Fixes
https://invent.kde.org/office/marknote/-/commit/144241bef2a57c0edd4c614cfd52039abad5e7cb
Previous upstream fix that didn't work
https://invent.kde.org/office/marknote/-/commit/a9717cde83b59511f15bb6ca277a2447a6d89e16
diff --git a/src/maildirimport.cpp b/src/maildirimport.cpp
index aa60fee..e45c07f 100644
--- a/src/maildirimport.cpp
+++ b/src/maildirimport.cpp
@@ -85,10 +85,11 @@ void MaildirImport::import(const QUrl &maildir, const QUrl &destinationDir)
#if KMIME_VERSION >= QT_VERSION_CHECK(6, 6, 44)
const auto subject = msg->subject(KMime::CreatePolicy::Create)->asUnicodeString();
+ const auto content = msg->decodedBody();
#else
const auto subject = msg->subject(true)->asUnicodeString();
+ const auto content = msg->decodedContent();
#endif
- const auto content = msg->decodedBody();
QFile markdownFile(destinationDir.toLocalFile() + u'/' + cleanFileName(subject) + u".md"_s);
if (!markdownFile.open(QIODevice::WriteOnly)) {

View File

@@ -0,0 +1,56 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="true"
KFMIN=6.19.0
QTMIN=6.9.1
inherit ecm flag-o-matic kde.org xdg
DESCRIPTION="Markdown editor with a wide range of formating options for everyday notes"
HOMEPAGE="https://apps.kde.org/marknote/"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="GPL-2+"
SLOT="0"
# TODO: md4c not packaged
DEPEND="
>=dev-libs/kirigami-addons-1.7.0:6
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
kde-apps/kmime:6=
>=kde-frameworks/breeze-icons-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
>=kde-frameworks/kirigami-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-kmime-pre-26.04.patch" )
src_configure() {
# marknote-1.4.0/src/config.h:9:7:
# error: type ‘struct ConfigHelper’ violates the C++ One Definition Rule [-Werror=odr]
# 9 | class ConfigHelper : public QObject
# | ^
# marknote-1.4.0_build/src/marknotesettings.cpp:10:7:
# note: a type with different bases is defined in another translation unit
# 10 | class ConfigHelper
# | ^
filter-lto
ecm_src_configure
}