[neon/neon-packaging/gitklient/Neon/unstable] debian/patches: Update 0001-test-kcrash.patch

Carlos De Maine null at kde.org
Tue Feb 7 22:49:36 GMT 2023


Git commit 4b4e74ae2f4edfd2793ac09f15b04714d11d3002 by Carlos De Maine.
Committed on 07/02/2023 at 22:49.
Pushed by carlosdem into branch 'Neon/unstable'.

Update 0001-test-kcrash.patch

M  +23   -19   debian/patches/0001-test-kcrash.patch

https://invent.kde.org/neon/neon-packaging/gitklient/commit/4b4e74ae2f4edfd2793ac09f15b04714d11d3002

diff --git a/debian/patches/0001-test-kcrash.patch b/debian/patches/0001-test-kcrash.patch
index 58f85b2..079a4ca 100644
--- a/debian/patches/0001-test-kcrash.patch
+++ b/debian/patches/0001-test-kcrash.patch
@@ -1,27 +1,31 @@
-diff:
-=== modified file 'a/src/gui/appwindow.cpp'
---- a/src/gui/appwindow.cpp
-+++ b/src/gui/appwindow.cpp
-@@ -38,6 +38,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
- // KF headers
- #include <KActionCollection>
+diff -urN a/src/gui/core/appmainwindow.cpp b/src/gui/core/appmainwindow.cpp
+--- a/src/gui/core/appmainwindow.cpp	2023-02-08 08:14:24.703726157 +1000
++++ b/src/gui/core/appmainwindow.cpp	2023-02-08 08:16:20.619351649 +1000
+@@ -10,6 +10,8 @@
+ #include <QCloseEvent>
+ #include <QEventLoop>
+ 
 +#include <KCrash>
- #include <KLocalizedString>
- #include <KMessageBox>
- #include <KStandardShortcut>
- void AppWindow::init()
++
+ AppMainWindow::AppMainWindow(QWidget *parent, Qt::WindowFlags f)
+     : KXmlGuiWindow(parent, f)
  {
-     KCrash::initialize();
-     mGit = Git::Manager::instance();
-     connect(mGit, &Git::Manager::pathChanged, this, &AppWindow::git_pathChanged);
-=== modified file 'a/src/libgitklient/CMakeLists.txt'
---- a/src/libgitklient/CMakeLists.txt
-+++ b/src/libgitklient/CMakeLists.txt
-@@ -90,7 +90,6 @@ target_link_libraries(libgitklient
+@@ -17,6 +19,7 @@
+ 
+ int AppMainWindow::exec()
+ {
++    KCrash::initialize();
+     QEventLoop eventLoop;
+     mLoop = &eventLoop;
+     showModal();
+diff -urN a/src/libgitklient/CMakeLists.txt b/src/libgitklient/CMakeLists.txt
+--- a/src/libgitklient/CMakeLists.txt	2023-02-08 08:14:24.707725758 +1000
++++ b/src/libgitklient/CMakeLists.txt	2023-02-08 08:22:44.333138830 +1000
+@@ -90,7 +90,6 @@
      Qt::Core
      Qt::Widgets
      Qt::Concurrent
 -    KF5::Crash
      KF5::I18n
  )
+ 


More information about the Neon-commits mailing list