Date: Friday, October 30, 2009 @ 19:53:01 Author: pierre Revision: 56919
KDE 4.3.3 (try #1) Modified: kdebase/trunk/PKGBUILD Deleted: kdebase/trunk/terminalpanel.patch ---------------------+ PKGBUILD | 20 ++++++-------------- terminalpanel.patch | 28 ---------------------------- 2 files changed, 6 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-10-30 23:52:57 UTC (rev 56918) +++ PKGBUILD 2009-10-30 23:53:01 UTC (rev 56919) @@ -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: terminalpanel.patch =================================================================== --- terminalpanel.patch 2009-10-30 23:52:57 UTC (rev 56918) +++ terminalpanel.patch 2009-10-30 23:53:01 UTC (rev 56919) @@ -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'); - } - - }