[arch-commits] Commit in kdebase/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Tue Sep 1 14:16:23 UTC 2009
Date: Tuesday, September 1, 2009 @ 10:16:22
Author: pierre
Revision: 50703
Merged revisions 50547,50693 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdebase/trunk
........
r50547 | pierre | 2009-08-29 22:11:03 +0200 (Sa, 29 Aug 2009) | 1 line
prepare KDE 4.3.1; package cleanup
........
r50693 | pierre | 2009-09-01 16:08:28 +0200 (Di, 01 Sep 2009) | 1 line
fix konsole bug
........
Added:
kdebase/repos/extra-x86_64/1017603.patch
(from rev 50693, kdebase/trunk/1017603.patch)
Modified:
kdebase/repos/extra-x86_64/ (properties)
kdebase/repos/extra-x86_64/PKGBUILD
---------------+
1017603.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 42 +++++++++++++++++-------------------------
2 files changed, 69 insertions(+), 25 deletions(-)
Property changes on: kdebase/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /kdebase/trunk:1-48829
+ /kdebase/trunk:1-50702
Copied: kdebase/repos/extra-x86_64/1017603.patch (from rev 50693, kdebase/trunk/1017603.patch)
===================================================================
--- extra-x86_64/1017603.patch (rev 0)
+++ extra-x86_64/1017603.patch 2009-09-01 14:16:22 UTC (rev 50703)
@@ -0,0 +1,52 @@
+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-09-01 14:15:44 UTC (rev 50702)
+++ extra-x86_64/PKGBUILD 2009-09-01 14:16:22 UTC (rev 50703)
@@ -6,27 +6,31 @@
'kdebase-kappfinder'
'kdebase-kdepasswd'
'kdebase-kdialog'
- 'kdebase-keditbookmarks'
'kdebase-kfind'
'kdebase-kinfocenter'
'kdebase-konqueror'
'kdebase-konsole'
'kdebase-kwrite'
'kdebase-lib'
- 'kdebase-nsplugins'
'kdebase-plasma')
-pkgver=4.3.0
+pkgver=4.3.1
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")
-md5sums=('6de0b96b78504d8f5fcdee819d080fb1')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+ '1017603.patch')
+md5sums=('10dae53739f1e8bd6f5f615443649e4f'
+ '206a6913a2aa839ccefb9e57a42f72a4')
build() {
- cd $srcdir
+ 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 ..
mkdir build
cd build
cmake ../${pkgbase}-${pkgver} \
@@ -72,13 +76,6 @@
make DESTDIR=$pkgdir install
}
-package_kdebase-keditbookmarks() {
- pkgdesc='a utility for editing the KDE bookmark store'
- depends=('kdebase-runtime' 'kdelibs')
- cd $srcdir/build/apps/keditbookmarks
- make DESTDIR=$pkgdir install
-}
-
package_kdebase-kfind() {
pkgdesc='Find Files/Folders'
depends=('kdebase-runtime' 'kdebase-lib')
@@ -100,12 +97,14 @@
package_kdebase-konqueror() {
pkgdesc='KDE File Manager & Web Browser'
- depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-nsplugins' 'kdebase-keditbookmarks')
+ depends=('kdebase-runtime' 'kdebase-lib')
install='kdebase.install'
- cd $srcdir/build/apps/konqueror
- make DESTDIR=$pkgdir install
- cd $srcdir/build/apps/doc/konqueror
- make DESTDIR=$pkgdir install
+ conflicts=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+ replaces=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+ for i in konqueror doc/konqueror keditbookmarks nsplugins; do
+ cd $srcdir/build/apps/${i}
+ make DESTDIR=$pkgdir install
+ done
}
package_kdebase-konsole() {
@@ -134,13 +133,6 @@
make DESTDIR=$pkgdir install
}
-package_kdebase-nsplugins() {
- pkgdesc='Configure the browser plugins'
- depends=('kdebase-runtime' 'kdelibs')
- cd $srcdir/build/apps/nsplugins
- make DESTDIR=$pkgdir install
-}
-
package_kdebase-plasma() {
pkgdesc='Display the contents of folders (User´s home folder as default)'
depends=('kdebase-workspace' 'kdebase-lib')
More information about the arch-commits
mailing list