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

Pierre Schmitz pierre at archlinux.org
Mon Nov 2 16:48:13 EST 2009


    Date: Monday, November 2, 2009 @ 16:48:13
  Author: pierre
Revision: 57883

Merged revisions 56919 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdebase/trunk

........
  r56919 | pierre | 2009-10-31 00:53:01 +0100 (Sa, 31 Okt 2009) | 1 line
  
  KDE 4.3.3 (try #1)
........

Modified:
  kdebase/repos/extra-x86_64/	(properties)
  kdebase/repos/extra-x86_64/PKGBUILD
Deleted:
  kdebase/repos/extra-x86_64/terminalpanel.patch

---------------------+
 PKGBUILD            |   20 ++++++--------------
 terminalpanel.patch |   28 ----------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)


Property changes on: kdebase/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdebase/trunk:1-54293
   + /kdebase/trunk:1-57882

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-02 21:47:55 UTC (rev 57882)
+++ extra-x86_64/PKGBUILD	2009-11-02 21:48:13 UTC (rev 57883)
@@ -13,26 +13,18 @@
          'kdebase-kwrite'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.3.2
-pkgrel=2
+pkgver=4.3.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'libraw1394')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'terminalpanel.patch')
-md5sums=('7d6b968d8d8dd3730522389dabbb23e2'
-         '52a17f42c2ebac4f33a13f843e394175')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('8072ce9848af28c75c5af2d8c832f985')
 
 build() {
-	cd $srcdir/${pkgbase}-${pkgver}
-	# Fix a regression with terminalpanel
-	# fix upstream in 4.3.3
-	# see https://bugs.kde.org/show_bug.cgi?id=202176
-	# and https://bugs.kde.org/show_bug.cgi?id=167810
-	patch -p0 -i $srcdir/terminalpanel.patch || return 1
-	cd ..
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -99,7 +91,7 @@
 
 package_kdebase-konqueror() {
 	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-runtime' 'kdebase-lib')
+	depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-dolphin')
 	install='kdebase.install'
 	conflicts=('kdebase-keditbookmarks' 'kdebase-nsplugins')
 	replaces=('kdebase-keditbookmarks' 'kdebase-nsplugins')

Deleted: extra-x86_64/terminalpanel.patch
===================================================================
--- extra-x86_64/terminalpanel.patch	2009-11-02 21:47:55 UTC (rev 57882)
+++ extra-x86_64/terminalpanel.patch	2009-11-02 21:48:13 UTC (rev 57883)
@@ -1,28 +0,0 @@
-Index: apps/dolphin/src/panels/terminal/terminalpanel.cpp
-===================================================================
---- apps/dolphin/src/panels/terminal/terminalpanel.cpp	(Revision 1032179)
-+++ apps/dolphin/src/panels/terminal/terminalpanel.cpp	(Revision 1032180)
-@@ -23,7 +23,6 @@
- #include <kde_terminal_interface_v2.h>
- #include <kparts/part.h>
- #include <kshell.h>
--#include <kio/netaccess.h>
- 
- #include <QBoxLayout>
- #include <QShowEvent>
-@@ -58,13 +57,12 @@
-     }
- 
-     Panel::setUrl(url);
--    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
-     const bool sendInput = (m_terminal != 0)
-                            && (m_terminal->foregroundProcessId() == -1)
-                            && isVisible()
--                           && mostLocalUrl.isLocalFile();
-+                           && url.isLocalFile();
-     if (sendInput) {
--        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
-+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
-     }
- 
- }



More information about the arch-commits mailing list