rm patch from kdenetwork - use kdepim 4.4.5 for this rls

This commit is contained in:
amnon 2010-07-25 09:40:51 +00:00
parent ffe3c6e269
commit b752e7e503
2 changed files with 2 additions and 31 deletions

View File

@ -43,12 +43,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart-svn' 'libktorrent')
source=($_mirror/${_origname}-$_kdever.tar.bz2 \
'lisa.daemon'
"kget-libktorrent.patch")
'lisa.daemon')
md5sums=('c4df72e6aa996f1f6ac6d391a7d4b2f4' # kdenetwork-4.4.95.tar.bz2
'66069c83fd5fa0df5d743d4486799033' # lisa.daemon
'2da8050eb20b8f3e45f3b1871df8fa74') # kget-libktorrent.patch
'66069c83fd5fa0df5d743d4486799033') # lisa.daemon
@ -60,9 +58,7 @@ build()
{
cd ${srcdir}/${_origname}-${pkgver}
# Fixme: seems this patch it's not needed anymore
# msg "applying patches ..."
# patch -Np4 -i $startdir/kget-libktorrent.patch || return 1
msg "starting build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \

View File

@ -1,25 +0,0 @@
--- branches/KDE/4.5/kdenetwork/kget/transfer-plugins/bittorrent/scandlg.h 2010/07/11 11:55:30 1148646
+++ branches/KDE/4.5/kdenetwork/kget/transfer-plugins/bittorrent/scandlg.h 2010/07/11 12:31:55 1148647
@@ -58,6 +58,8 @@
/// Handle the close event
virtual void closeEvent(QCloseEvent* e);
+
+ virtual void error(const QString&);
protected slots:
virtual void reject();
--- branches/KDE/4.5/kdenetwork/kget/transfer-plugins/bittorrent/scandlg.cpp 2010/07/11 11:55:30 1148646
+++ branches/KDE/4.5/kdenetwork/kget/transfer-plugins/bittorrent/scandlg.cpp 2010/07/11 12:31:55 1148647
@@ -157,6 +157,11 @@
KDialog::reject();
}
}
+
+ void ScanDlg::error(const QString &message)
+ {
+ KMessageBox::error(0,i18n("Error scanning data: %1",message));
+ }
void ScanDlg::closeEvent(QCloseEvent* )
{