[arch-commits] Commit in kdenetwork/repos (3 files)

[Andrea Scarpino]

    Date: Sunday, October 18, 2009 @ 08:29:23
  Author: andrea
Revision: 56025

add overwrite option in kget

Added:
  kdenetwork/repos/extra-i686/add-overwrite-option-in-kget.patch
    (from rev 56024, kdenetwork/trunk/add-overwrite-option-in-kget.patch)
Modified:
  kdenetwork/repos/extra-i686/	(properties)
  kdenetwork/repos/extra-i686/PKGBUILD

------------------------------------+
 PKGBUILD                           |   16 +++++++++++-----
 add-overwrite-option-in-kget.patch |   16 ++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)


Property changes on: kdenetwork/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdenetwork/trunk:1-51729
   + /kdenetwork/trunk:1-56024

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-18 12:17:53 UTC (rev 56024)
+++ extra-i686/PKGBUILD	2009-10-18 12:29:23 UTC (rev 56025)
@@ -10,20 +10,26 @@
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.3.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl'
 	'kdelibs-experimental' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-	'libmsn>=4.0beta8' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss'
+	'libmsn' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss'
 	'libxdamage' 'libgadu')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('57b44a9b59c35366a0c287c591bb9bdc')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+	'add-overwrite-option-in-kget.patch')
+md5sums=('57b44a9b59c35366a0c287c591bb9bdc'
+	'c22e07a8b211c687d06dfcb61e109e7d')
 
 build() {
-	cd $srcdir
+	cd $srcdir/${pkgbase}-${pkgver}
+	# https://bugs.kde.org/show_bug.cgi?id=207215
+	patch -p3 -i ${srcdir}/add-overwrite-option-in-kget.patch || return 1
+
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Copied: kdenetwork/repos/extra-i686/add-overwrite-option-in-kget.patch (from rev 56024, kdenetwork/trunk/add-overwrite-option-in-kget.patch)
===================================================================
--- extra-i686/add-overwrite-option-in-kget.patch	                        (rev 0)
+++ extra-i686/add-overwrite-option-in-kget.patch	2009-10-18 12:29:23 UTC (rev 56025)
@@ -0,0 +1,16 @@
+--- trunk/KDE/kdenetwork/kget/core/kget.cpp	2009/09/14 12:52:57	1023303
++++ trunk/KDE/kdenetwork/kget/core/kget.cpp	2009/09/14 13:01:00	1023304
+@@ -234,8 +234,11 @@
+ 
+     if(m_transferTreeModel->findTransferByDestination(destUrl) != 0 || (destUrl.isLocalFile() && QFile::exists(destUrl.path()))) {
+         KIO::RenameDialog dlg( m_mainWindow, i18n("Rename transfer"), srcUrl,
+-                               destUrl, KIO::M_MULTI);
+-        if (dlg.exec() == KIO::R_RENAME)
++                               destUrl, KIO::M_OVERWRITE);
++                               
++        int result = dlg.exec();
++        
++        if ( result == KIO::R_RENAME || result == KIO::R_OVERWRITE )
+             destUrl = dlg.newDestUrl();
+         else
+             return 0;