- up to 4.4.10 (upstream disabled some plugins; we reenable them but using these...

Changed files:
    kde4-kdepim.spec -> 1.159
    kmail-copySelectedText.patch -> 1.2

diff --git a/kde4-kdepim.spec b/kde4-kdepim.spec
index 173e7b25b7b2b59ae79649c2e1b5ed9b3df42dff..111c44c65b47a83aa2f4d81aa57789af9ccb83fe 100644 (file)
--- a/kde4-kdepim.spec
+++ b/kde4-kdepim.spec
@@ -1,4 +1,3 @@
-
 %define                _state  stable
 %define                qtver   4.7.1
 %define                orgname kdepim
@@ -8,16 +7,15 @@ Summary(pl.UTF-8):    Zarządca informacji osobistej (PIM) dla KDE
 Summary(ru.UTF-8):     Персональный планировщик (PIM) для KDE
 Summary(uk.UTF-8):     Персональный планувальник (PIM) для KDE
 Name:          kde4-kdepim
-Version:       4.4.9
-Release:       3
+Version:       4.4.10
+Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/kdepim-%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 42ba81f7b09676e613b96fd3cd22601f
+# Source0-md5: c32690ed08a3eeb7010a2a0eefbf6f4c
 Patch100:      %{name}-branch.diff
 # http://mirrors.ludost.net/gentoo/distfiles/kleopatra-4.4.3-assuan2.patch.bz2
 Patch0:                kleopatra-4.4.3-assuan2.patch
-Patch1:                kmail-copySelectedText.patch
 URL:           http://www.kde.org/
 BuildRequires: Qt3Support-devel >= %{qtver}
 BuildRequires: QtDesigner-devel >= %{qtver}
@@ -675,12 +673,12 @@ libksieve, libmimelib.
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
 %patch0 -p0
-%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake \
+       -DKONTACT_ENABLE_MIXEDMODE_SUMMARY_PLUGINS=on" \
        ../
 
 %{__make}

diff --git a/kmail-copySelectedText.patch b/kmail-copySelectedText.patch
deleted file mode 100644 (file)
index 65e3d64..0000000
--- a/kmail-copySelectedText.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- kdepim-4.4.9/kmail/kmreaderwin.cpp.orig    2010-12-22 18:52:28.000000000 +0100
-+++ kdepim-4.4.9/kmail/kmreaderwin.cpp 2011-01-18 22:58:03.202991913 +0100
-@@ -2187,22 +2187,9 @@
- //-----------------------------------------------------------------------------
- void KMReaderWin::slotCopySelectedText()
- {
--  QString selection;
--  if ( htmlMail() ) {
--    QMimeData *mimeData = new QMimeData();
--    selection = mViewer->selectedTextAsHTML();
--    mimeData->setText(selection);
--    if(!selection.isEmpty()) {
--      selection.replace( QChar::Nbsp, ' ' );
--      mimeData->setHtml(selection);
--    }
--    QApplication::clipboard()->setMimeData( mimeData, QClipboard::Clipboard );
--  } else {
--    selection = mViewer->selectedText();
--    selection.replace( QChar::Nbsp, ' ' );
--    QApplication::clipboard()->setText( selection );
--  }
--
-+  QString selection = mViewer->selectedText();
-+  selection.replace( QChar::Nbsp, ' ' );
-+  QApplication::clipboard()->setText( selection );
- }
- 
-