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

[Pierre Schmitz]

    Date: Tuesday, October 6, 2009 @ 06:56:55
  Author: pierre
Revision: 54083

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

........
  r53550 | pierre | 2009-10-02 17:07:12 +0200 (Fr, 02 Okt 2009) | 1 line
  
  remove old patches
........
  r53560 | pierre | 2009-10-02 17:14:49 +0200 (Fr, 02 Okt 2009) | 1 line
  
  KDE 4.3.2 (try #1)
........

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

---------------+
 1017603.patch |   52 ----------------------------------------------------
 PKGBUILD      |   14 ++++----------
 2 files changed, 4 insertions(+), 62 deletions(-)


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

Deleted: extra-x86_64/1017603.patch
===================================================================
--- extra-x86_64/1017603.patch	2009-10-06 10:56:17 UTC (rev 54082)
+++ extra-x86_64/1017603.patch	2009-10-06 10:56:55 UTC (rev 54083)
@@ -1,52 +0,0 @@
-Index: apps/konsole/src/SessionController.cpp
-===================================================================
---- apps/konsole/src/SessionController.cpp	(Revision 1017602)
-+++ apps/konsole/src/SessionController.cpp	(Revision 1017603)
-@@ -95,13 +95,11 @@
-     Q_ASSERT( view );
- 
-     // handle user interface related to session (menus etc.)
-+    if (isKonsolePart())
-+        setXMLFile("konsole/partui.rc");
-+    else
-+        setXMLFile("konsole/sessionui.rc");
- 
--#ifdef KONSOLE_PART
--    setXMLFile("konsole/partui.rc");
--#else
--    setXMLFile("konsole/sessionui.rc");
--#endif
--
-     setupActions();
-     actionCollection()->addAssociatedWidget(view);
-     foreach (QAction* action, actionCollection()->actions())
-@@ -1041,6 +1039,15 @@
-     }
- }
- 
-+bool SessionController::isKonsolePart() const
-+{
-+    // Check to see if we are being called from Konsole or a KPart
-+    if (QString(kapp->metaObject()->className()) == "Konsole::Application")
-+        return false;
-+    else
-+        return true;
-+}
-+
- SessionTask::SessionTask(QObject* parent)
-     :  QObject(parent)
-     ,  _autoDelete(false)
-Index: apps/konsole/src/SessionController.h
-===================================================================
---- apps/konsole/src/SessionController.h	(Revision 1017602)
-+++ apps/konsole/src/SessionController.h	(Revision 1017603)
-@@ -209,6 +209,9 @@
- 
-     void updateSearchFilter();
- 
-+    /* Returns true if called within a KPart; false if called within Konsole. */
-+    bool isKonsolePart() const;
-+
- private:
-     // begins the search
-     // text - pattern to search for

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-06 10:56:17 UTC (rev 54082)
+++ extra-x86_64/PKGBUILD	2009-10-06 10:56:55 UTC (rev 54083)
@@ -13,24 +13,18 @@
          'kdebase-kwrite'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.3.1
+pkgver=4.3.2
 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"
-        '1017603.patch')
-md5sums=('10dae53739f1e8bd6f5f615443649e4f'
-         '206a6913a2aa839ccefb9e57a42f72a4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('7d6b968d8d8dd3730522389dabbb23e2')
 
 build() {
-	cd $srcdir/${pkgbase}-${pkgver}
-	# fix konsole bug
-	# see https://bugs.kde.org/show_bug.cgi?id=186745
-	patch -p0 -i ${srcdir}/1017603.patch || return 1
-	cd ..
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \