From 9d926f5e5ba118910e7b77dff9dae0b55f8b6b2e Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 15 Mar 2026 05:59:41 +0100 Subject: [PATCH] marknote, downgrade to 1.4.1 untill Qt is updated (#13828) --- kde-apps/marknote/marknote-1.4.1.recipe | 131 ++++++++++++++++++ kde-apps/marknote/marknote-1.5.0.recipe | 4 +- .../marknote/patches/marknote-1.4.1.patchset | 25 ++++ 3 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 kde-apps/marknote/marknote-1.4.1.recipe create mode 100644 kde-apps/marknote/patches/marknote-1.4.1.patchset diff --git a/kde-apps/marknote/marknote-1.4.1.recipe b/kde-apps/marknote/marknote-1.4.1.recipe new file mode 100644 index 000000000..09cf02991 --- /dev/null +++ b/kde-apps/marknote/marknote-1.4.1.recipe @@ -0,0 +1,131 @@ +SUMMARY="Write down your thoughts" +DESCRIPTION="Marknote lets you create rich text notes and easily organise them into notebooks. \ +You can personalise your notebooks by choosing an icon and accent color for each one, making it \ +easy to distinguish between them and keep your notes at your fingertips. Your notes are saved as \ +Markdown files in your Documents folder, making it easy to use your notes outside of Marknote as \ +well as inside the app." +HOMEPAGE="https://invent.kde.org/office/marknote" +COPYRIGHT="2010-2026 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/marknote/marknote-$portVersion.tar.xz" +CHECKSUM_SHA256="96c2f551c3d9a09cdbc2d6cc242e64b3a9c811df7f29410d5b85871ec2ad2799" +SOURCE_DIR="marknote-$portVersion" +PATCHES="marknote-$portVersion.patchset" +ADDITIONAL_FILES="marknote.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + marknote$secondaryArchSuffix = $portVersion + app:Marknote = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix + lib:libmd4c$secondaryArchSuffix + lib:libmd4c_html$secondaryArchSuffix + # KF6 + qqc2_desktop_style6$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix + lib:libKF6ItemModels$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + lib:libKirigami$secondaryArchSuffix + # KPim6 + lib:libKPim6Mime$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix + devel:libmd4c$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix + devel:libKF6Notifications$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + devel:libKirigami$secondaryArchSuffix + # KPim6 + devel:libKPim6Mime$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:xsltproc + " + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -Wno-dev + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # cleanup + rm -rf $dataDir/{applications,metainfo} + + mv $appsDir/marknote $appsDir/Marknote + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="Marknote" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.marknote" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/marknote.rdef.in > marknote.rdef + + addResourcesToBinaries marknote.rdef $appsDir/Marknote + addAppDeskbarSymlink $appsDir/Marknote +} diff --git a/kde-apps/marknote/marknote-1.5.0.recipe b/kde-apps/marknote/marknote-1.5.0.recipe index 3d9b50bd9..d6d2e0350 100644 --- a/kde-apps/marknote/marknote-1.5.0.recipe +++ b/kde-apps/marknote/marknote-1.5.0.recipe @@ -14,8 +14,8 @@ SOURCE_DIR="marknote-$portVersion" PATCHES="marknote-$portVersion.patchset" ADDITIONAL_FILES="marknote.rdef.in" -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="?all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" marknote$secondaryArchSuffix = $portVersion diff --git a/kde-apps/marknote/patches/marknote-1.4.1.patchset b/kde-apps/marknote/patches/marknote-1.4.1.patchset new file mode 100644 index 000000000..405ba57d8 --- /dev/null +++ b/kde-apps/marknote/patches/marknote-1.4.1.patchset @@ -0,0 +1,25 @@ +From 54eb213db08efbdb6f52e1730ae81f345795b02d Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sun, 15 Mar 2026 05:55:43 +0100 +Subject: Use software rendering, use Haiku's icon theme + + +diff --git a/src/main.cpp b/src/main.cpp +index 9a4774b..7f82596 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -39,7 +39,10 @@ using namespace Qt::Literals::StringLiterals; + + int main(int argc, char *argv[]) + { +- KIconTheme::initTheme(); ++#if defined(Q_OS_HAIKU) ++ qputenv("QT_QUICK_BACKEND", "software"); ++#endif ++// KIconTheme::initTheme(); + QIcon::setFallbackThemeName(u"breeze"_s); + QApplication app(argc, argv); + // Default to org.kde.desktop style unless the user forces another style +-- +2.52.0 +