[neon/neon-packaging/marknote/Neon/unstable] debian/patches: refresh patch

[Carlos De Maine]

Git commit e67e71ff1b471cea829cacd50a0056a6c53405a8 by Carlos De Maine.
Committed on 09/04/2026 at 03:27.
Pushed by carlosdem into branch 'Neon/unstable'.

refresh patch

M  +61   -12   debian/patches/fix_kcrash.diff

https://invent.kde.org/neon/neon-packaging/marknote/-/commit/e67e71ff1b471cea829cacd50a0056a6c53405a8

diff --git a/debian/patches/fix_kcrash.diff b/debian/patches/fix_kcrash.diff
index 87e426a..10ef961 100644
--- a/debian/patches/fix_kcrash.diff
+++ b/debian/patches/fix_kcrash.diff
@@ -1,24 +1,73 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 6569b50..5577179 100644
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62c5e39..17a491a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,17 +53,25 @@ endif()
+ find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg)
+ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami I18n Config CoreAddons IconThemes ColorScheme Notifications)
+ 
++if (NOT ANDROID AND KF6CoreAddons_VERSION VERSION_LESS "6.19.0")
++    option(WITH_KCRASH "Build with KCrash support as KCoreAddons is not new enough." ON)
++endif()
++
+ if (WITH_KRUNNER)
+     find_package(Qt6DBus ${QT_MIN_VERSION} REQUIRED)
+     find_package(KF6WindowSystem ${KF_MIN_VERSION} REQUIRED)
+ endif()
+ 
++if (WITH_KCRASH)
++    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Crash)
++endif()
++
+ ecm_find_qmlmodule(org.kde.syntaxhighlighting ${KF_MIN_VERSION})
+ 
+ if (NOT ANDROID)
+     find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets)
+-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Crash)
+ endif()
++
+ if (BUILD_TESTING)
+     find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test)
+ endif()
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e136bf..db8d603 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -171,8 +171,9 @@ if (APPLE)
+         MACOSX_BUNDLE_COPYRIGHT "2002-2024 The Marknote Developers")
+ endif()
+ 
+-if (TARGET KF6::Crash)
++if (WITH_KCRASH)
+    target_link_libraries(marknote PRIVATE KF6::Crash)
++    target_compile_definitions(marknote_static PUBLIC HAVE_KCRASH)
+ endif()
+ 
+ if (BUILD_TESTING)
+
+ diff --git a/src/main.cpp b/src/main.cpp
+index c7db205..c9327f3 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -6,9 +6,7 @@
+@@ -5,7 +5,7 @@
+ */
  
  #include <KAboutData>
- #include <KirigamiAppDefaults>
--#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 19, 0) && __has_include("KCrash")
+-#ifndef Q_OS_ANDROID
++#ifdef HAVE_KCRASH
  #include <KCrash>
--#endif
+ #endif
  #include <KIconTheme>
- #include <KLocalizedContext>
- #include <KLocalizedString>
-@@ -132,9 +130,7 @@ int main(int argc, char *argv[])
+@@ -132,9 +132,10 @@ int main(int argc, char *argv[])
  
      KAboutData::setApplicationData(about);
  
--#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 19, 0) && __has_include("KCrash")
+-#ifndef Q_OS_ANDROID
++#ifdef HAVE_KCRASH
      KCrash::initialize();
--#endif
- 
+ #endif
++
      ColorSchemer colorScheme;
      if (!Config::self()->colorScheme().isEmpty()) {
+         colorScheme.apply(Config::self()->colorScheme());