Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=3d608c384a9608de6daeb0ac603d1e48aa808c6f
commit 3d608c384a9608de6daeb0ac603d1e48aa808c6f Author: Melko <[email protected]> Date: Sun Nov 23 20:31:47 2014 +0100 kdepim-4.14.3-1-x86_64 * drop included patches diff --git a/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch b/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch deleted file mode 100644 index ab0ad93..0000000 --- a/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c5b703e7c1a3f5da43a3864536cfa606d112d60a Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Fri, 17 Oct 2014 21:19:36 +0200 -Subject: [PATCH] Fix crash on logout. - -Turns out the check for kapp->sessionSaving inside queryExit was confusing, -it's actually false when aboutToQuit() leads to queryExit, even during logout. -So always delete the part in slotOnShutdown, called by aboutToQuit(). - -BUG: 336417 -FIXED-IN: 4.14.3 ---- - akregator/src/mainwidget.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp -index 3211a50..14cd2a9 100644 ---- a/akregator/src/mainwidget.cpp -+++ b/akregator/src/mainwidget.cpp -@@ -317,6 +317,8 @@ void Akregator::MainWidget::slotOnShutdown() - { - m_shuttingDown = true; - -+ delete m_part; -+ - // close all pageviewers in a controlled way - // fixes bug 91660, at least when no part loading data - while ( m_tabWidget->count() > 1 ) { // remove frames until only the main frame remains -@@ -333,6 +335,7 @@ void Akregator::MainWidget::slotOnShutdown() - - delete m_mainTab; - delete m_mainFrame; -+ m_mainFrame = 0; - - Settings::self()->writeConfig(); - } --- -1.8.4.1 - diff --git a/source/kde-extra/kdepim/0002-Delete-the-part-from-the-mainwindow-not-from-the-mai.patch b/source/kde-extra/kdepim/0002-Delete-the-part-from-the-mainwindow-not-from-the-mai.patch deleted file mode 100644 index 4682ef9..0000000 --- a/source/kde-extra/kdepim/0002-Delete-the-part-from-the-mainwindow-not-from-the-mai.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b92a3688d91d76b7c0ffcb3775b232ed96062fc9 Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Tue, 21 Oct 2014 09:22:41 +0200 -Subject: [PATCH] Delete the part from the mainwindow, not from the mainwidget. - -This is a fix for "kontact crashes on quit" introduced by c5b703e7c -because I confused mainwindow and mainwidget. It restores a behavior -closer to before 8fc0d948f6e1, where the part was deleted by the mainwindow. - -CCBUG: 336417 ---- - akregator/src/mainwidget.cpp | 2 -- - akregator/src/mainwindow.cpp | 7 +++++++ - akregator/src/mainwindow.h | 1 + - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp -index 14cd2a9..99a1287 100644 ---- a/akregator/src/mainwidget.cpp -+++ b/akregator/src/mainwidget.cpp -@@ -317,8 +317,6 @@ void Akregator::MainWidget::slotOnShutdown() - { - m_shuttingDown = true; - -- delete m_part; -- - // close all pageviewers in a controlled way - // fixes bug 91660, at least when no part loading data - while ( m_tabWidget->count() > 1 ) { // remove frames until only the main frame remains -diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp -index 03399c7..cf36b23 100644 ---- a/akregator/src/mainwindow.cpp -+++ b/akregator/src/mainwindow.cpp -@@ -88,6 +88,8 @@ MainWindow::MainWindow( QWidget* parent, Qt::WindowFlags f ) - - connect( KPIM::BroadcastStatus::instance(), SIGNAL(statusMsg(QString)), - this, SLOT(slotSetStatusBarText(QString)) ); -+ -+ connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(slotOnShutdown())); - } - - bool MainWindow::loadPart() -@@ -186,6 +188,11 @@ void MainWindow::slotQuit() - kapp->quit(); - } - -+void MainWindow::slotOnShutdown() -+{ -+ delete m_part; -+} -+ - bool MainWindow::queryClose() - { - if ( kapp->sessionSaving() ) { -diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h -index a77eaee..64ce5bc 100644 ---- a/akregator/src/mainwindow.h -+++ b/akregator/src/mainwindow.h -@@ -115,6 +115,7 @@ private slots: - void optionsConfigureKeys(); - void optionsConfigureToolbars(); - void applyNewToolbarConfig(); -+ void slotOnShutdown(); - - private: - BrowserInterface *m_browserIface; --- -1.8.4.1 - diff --git a/source/kde-extra/kdepim/FrugalBuild b/source/kde-extra/kdepim/FrugalBuild index 351a5e9..844e496 100644 --- a/source/kde-extra/kdepim/FrugalBuild +++ b/source/kde-extra/kdepim/FrugalBuild @@ -17,8 +17,6 @@ Finclude kde depends=() makedepends=("${makedepends[@]}" 'boost>=1.50.0' "kdelibs>=$_F_kde_ver" "kdepimlibs-compiletime>=${_F_kde_ver}" "docbook-xsl" \ "libdbusmenu-qt>=0.7.0" "soprano-backend-redland>=2.7.0" "kdepimlibs>=$_F_kde_ver" "kdelibs-compiletime>=$_F_kde_ver" "kactivities") -source=("${source[@]}" 0001-Fix-crash-on-logout.patch 0002-Delete-the-part-from-the-mainwindow-not-from-the-mai.patch) -sha1sums=("${sha1sums[@]}" 'f8c7d5b86d2b243e4bb83744f54566e8d1748ec8' 'fa5423d224131620b4982acfddef81dde0656100') subpkgs=("${subpkgs[@]}" "akonadiconsole") subdescs=("${subdescs[@]}" "Akonadi Management and Debugging Console.") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
