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

[Andrea Scarpino]

    Date: Tuesday, December 22, 2009 @ 19:42:14
  Author: andrea
Revision: 61753

prepare kde-unstable repo

Added:
  kdenetwork/kde-unstable/
Modified:
  kdenetwork/kde-unstable/PKGBUILD
Deleted:
  kdenetwork/kde-unstable/add-overwrite-option-in-kget.patch

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

Modified: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-12-22 17:51:40 UTC (rev 61738)
+++ kde-unstable/PKGBUILD	2009-12-23 00:42:14 UTC (rev 61753)
@@ -9,26 +9,20 @@
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.3.4
+pkgver=4.3.85
 pkgrel=1
 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' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss'
-	'libxdamage' 'libgadu')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'add-overwrite-option-in-kget.patch')
-md5sums=('71de592596681fc59c5bc0a679703fd2'
-         'c22e07a8b211c687d06dfcb61e109e7d')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
+	'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage'
+	'libgadu')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('e67b465a242a15d2fbb375890afd978e')
 
 build() {
-        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
@@ -70,7 +64,7 @@
 
 package_kdenetwork-kopete() {
 	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn>=4.0beta8'
+	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
 		'libidn' 'qimageblitz' 'libxss' 'libv4l' 'libgadu')
 	install='kdenetwork.install'
 	cd $srcdir/build/kopete

Deleted: kde-unstable/add-overwrite-option-in-kget.patch
===================================================================
--- trunk/add-overwrite-option-in-kget.patch	2009-12-22 17:51:40 UTC (rev 61738)
+++ kde-unstable/add-overwrite-option-in-kget.patch	2009-12-23 00:42:14 UTC (rev 61753)
@@ -1,16 +0,0 @@
---- 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;