Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7ac409758dd4deaba6a2185940d0441c2c7e8b0

commit d7ac409758dd4deaba6a2185940d0441c2c7e8b0
Author: Melko <[email protected]>
Date:   Thu Oct 23 09:56:59 2014 +0200

kdepim-4.14.1-3-x86_64

* add patch to fix a regression introduced by the previous patch

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
new file mode 100644
index 0000000..4682ef9
--- /dev/null
+++ 
b/source/kde-extra/kdepim/0002-Delete-the-part-from-the-mainwindow-not-from-the-mai.patch
@@ -0,0 +1,69 @@
+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 0495389..7b186fd 100644
--- a/source/kde-extra/kdepim/FrugalBuild
+++ b/source/kde-extra/kdepim/FrugalBuild
@@ -4,7 +4,7 @@
options+=('asneeded')

pkgname=kdepim
-pkgrel=2
+pkgrel=3
pkgdesc="KDE PIM Utilities."
groups=('kde-extra')
replaces=('klibido' 'taskjuggler' "$pkgname-wizards" "$pkgname-strigi-analyzer" 
"$pkgname-mobile")
@@ -17,8 +17,8 @@ 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)
-sha1sums=("${sha1sums[@]}" 'f8c7d5b86d2b243e4bb83744f54566e8d1748ec8')
+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

Reply via email to