[neon/extras/itinerary/Neon/unstable] debian/patches: remove patch now in branch

Jonathan Riddell null at kde.org
Thu Jun 10 14:38:43 BST 2021


Git commit cb370d90b3a40290bec1c4ba3750efde3ee19dee by Jonathan Riddell.
Committed on 10/06/2021 at 13:38.
Pushed by jriddell into branch 'Neon/unstable'.

remove patch now in branch

D  +0    -45   debian/patches/kcrash.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/itinerary/commit/cb370d90b3a40290bec1c4ba3750efde3ee19dee

diff --git a/debian/patches/kcrash.diff b/debian/patches/kcrash.diff
deleted file mode 100644
index a1cd823..0000000
--- a/debian/patches/kcrash.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac8ad0b..603a0ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ endif()
- # build-time dependencies
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Quick Positioning Location QuickControls2)
- find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
--find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Contacts Notifications)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Contacts Notifications Crash)
- find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS Holidays NetworkManagerQt)
- find_package(KPimPkPass CONFIG REQUIRED)
- find_package(KPimItinerary 5.17.41 CONFIG REQUIRED)
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index b82586c..037b8ba 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -80,6 +80,7 @@ target_link_libraries(itinerary-app PRIVATE
-     itinerary
-     KOSMIndoorMap
-     Qt5::QuickControls2
-+    KF5::Crash
- )
- if (ANDROID)
-     target_include_directories(itinerary-app PRIVATE ${Qt5Core_PRIVATE_INCLUDE_DIRS})
-diff --git a/src/app/main.cpp b/src/app/main.cpp
-index b02a436..100a78a 100644
---- a/src/app/main.cpp
-+++ b/src/app/main.cpp
-@@ -53,6 +53,7 @@
- #include <KLocalizedString>
- 
- #include <KAboutData>
-+#include <KCrash>
- 
- #include <QQuickStyle>
- #include <QQmlApplicationEngine>
-@@ -215,6 +216,7 @@ int main(int argc, char **argv)
-     parser.addPositionalArgument(QStringLiteral("file"), i18n("PkPass or JSON-LD file to import."));
-     parser.process(app);
-     aboutData.processCommandLine(&parser);
-+    KCrash::initialize();
- 
- #ifndef Q_OS_ANDROID
-     KDBusService service(KDBusService::Unique);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 038d921..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kcrash.diff


More information about the Neon-commits mailing list