update kget to have torrent support - only kget needs to be uploaded

This commit is contained in:
amnon 2010-07-11 14:00:52 +00:00
parent 03d690b9d3
commit 220b4ed280
2 changed files with 34 additions and 10 deletions

View File

@ -28,7 +28,7 @@ pkgname=('kdenetwork-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=1.1
pkgdesc="split package"
url="http://www.kde.org"
@ -40,15 +40,15 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
'qca-ossl' "kdebase-workspace>=${_kdever}"
"kdebase>=${_kdever}" 'libvncserver' 'libmsn'
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage'
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart-svn')
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart-svn' 'libktorrent')
source=($_mirror/${_origname}-$_kdever.tar.bz2 \
'lisa.daemon')
# "gcc45.patch")
'lisa.daemon'
"kget-libktorrent.patch")
md5sums=('b281a3957ca7ed799cca4f4dca666a5a' # kdenetwork-4.4.92.tar.bz2
'66069c83fd5fa0df5d743d4486799033') # lisa.daemon
# '8d509b4a541704606f9688bcd4e38a61') # gcc45.patch
'66069c83fd5fa0df5d743d4486799033' # lisa.daemon
'2da8050eb20b8f3e45f3b1871df8fa74') # kget-libktorrent.patch
@ -60,9 +60,8 @@ build()
{
cd ${srcdir}/${_origname}-${pkgver}
# msg "applying patches ..."
# # this patch is not needed by ArchLinux - we just use an older gcc version
# patch -Np1 -i $startdir/gcc45.patch || return 1
msg "applying patches ..."
patch -Np4 -i $startdir/kget-libktorrent.patch || return 1
msg "starting build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@ -128,7 +127,7 @@ package_kdenetwork-doc()
package_kdenetwork-kget()
{
pkgdesc="Download manager"
depends=("${_origname}-common>=${_kdever}" "kdebase-workspace>=${_kdever}" 'qca' 'kwebkitpart-svn')
depends=("${_origname}-common>=${_kdever}" "kdebase-workspace>=${_kdever}" 'qca' 'kwebkitpart-svn' 'libktorrent')
conflicts=("kdemod-${_origname}-kget")
groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
install=${_origname}.install

View File

@ -0,0 +1,25 @@
--- 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* )
{