From 8e2fae11461228b1ea44eb96962a05177faa0738 Mon Sep 17 00:00:00 2001 From: Anke Date: Thu, 7 Mar 2013 20:39:48 +0000 Subject: [PATCH] kget patched for data-loss bug --- kdenetwork/PKGBUILD | 26 ++++++++++++++----------- kdenetwork/kget-fix-delete-homedir.diff | 14 +++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 kdenetwork/kget-fix-delete-homedir.diff diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD index d4aba1dcd..85ad1c35e 100644 --- a/kdenetwork/PKGBUILD +++ b/kdenetwork/PKGBUILD @@ -16,7 +16,7 @@ pkgname=('kdenetwork-filesharing' arch=('x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" license=('GPL' 'LGPL' 'FDL') @@ -27,11 +27,15 @@ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qc 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu' 'mediastreamer' 'msilbc' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl') -source=("$_mirror/${pkgbase}-$_kdever.tar.xz") -md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) +source=("$_mirror/${pkgbase}-$_kdever.tar.xz" + 'kget-fix-delete-homedir.diff') +md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` + '4a85d8fbe81a8a034b278daacba0b2c4') build() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -p3 -i "${srcdir}/kget-fix-delete-homedir.diff" + msg "starting build ..." cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ -DCMAKE_INSTALL_PREFIX=${_installprefix} \ @@ -41,7 +45,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make || return 1 + make } package_kdenetwork-filesharing() { @@ -54,7 +58,7 @@ package_kdenetwork-filesharing() { splitdirs="filesharing" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -68,7 +72,7 @@ package_kdenetwork-kdnssd() { splitdirs="kdnssd" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -84,7 +88,7 @@ package_kdenetwork-kget() { splitdirs="kget doc/kget" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -102,7 +106,7 @@ package_kdenetwork-kopete() { splitdirs="kopete doc/kopete" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -118,7 +122,7 @@ package_kdenetwork-kppp() { splitdirs="kppp doc/kppp" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -134,7 +138,7 @@ package_kdenetwork-krdc() { splitdirs="krdc doc/krdc" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -152,6 +156,6 @@ package_kdenetwork-krfb() { splitdirs="krfb doc/krfb" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } diff --git a/kdenetwork/kget-fix-delete-homedir.diff b/kdenetwork/kget-fix-delete-homedir.diff new file mode 100644 index 000000000..8a8b5269c --- /dev/null +++ b/kdenetwork/kget-fix-delete-homedir.diff @@ -0,0 +1,14 @@ +Index: transfer-plugins/multisegmentkio/transfermultisegkio.cpp +=================================================================== +--- a/src/kdenetwork-4.10.1/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp (Revision 1342971) ++++ b/src/kdenetwork-4.10.1/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp (Arbeitskopie) +@@ -166,6 +166,8 @@ + if (change & Tc_FileName) { + QList urls = m_dataSourceFactory->mirrors().keys(); + QString filename = urls.first().fileName(); ++ if (filename.isEmpty()) ++ return; + foreach (const KUrl url, urls) { + if (filename != url.fileName()) + return; +