[neon/neon-packaging/marknote/Neon/unstable] debian/patches: drop patches since they have been upstreamed

[Carlos De Maine]

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

drop patches since they have been upstreamed

D  +0    -47   debian/patches/fix_kcrash.diff
D  +0    -29   debian/patches/fix_kcrash_2.diff
D  +0    -2    debian/patches/series

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

diff --git a/debian/patches/fix_kcrash.diff b/debian/patches/fix_kcrash.diff
deleted file mode 100644
index dae093b..0000000
--- a/debian/patches/fix_kcrash.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-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/debian/patches/fix_kcrash_2.diff b/debian/patches/fix_kcrash_2.diff
deleted file mode 100644
index a4c7f9a..0000000
--- a/debian/patches/fix_kcrash_2.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 6569b50..c9327f3 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -5,13 +5,13 @@
- */
- 
- #include <KAboutData>
--#include <KirigamiAppDefaults>
--#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 19, 0) && __has_include("KCrash")
-+#ifdef HAVE_KCRASH
- #include <KCrash>
- #endif
- #include <KIconTheme>
- #include <KLocalizedContext>
- #include <KLocalizedString>
-+#include <KirigamiAppDefaults>
- #ifndef Q_OS_ANDROID
- #include <QApplication>
- #endif
-@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
- 
-     KAboutData::setApplicationData(about);
- 
--#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 19, 0) && __has_include("KCrash")
-+#ifdef HAVE_KCRASH
-     KCrash::initialize();
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 03863fa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_kcrash.diff
-fix_kcrash_2.diff