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

[Pierre Schmitz]

    Date: Friday, August 29, 2008 @ 02:42:34
  Author: pierre
Revision: 10422

Merged revisions 7994-10421 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdebase-workspace/trunk

........
  r10421 | pierre | 2008-08-29 06:42:06 +0000 (Fr, 29 Aug 2008) | 2 lines
  
  upgpkg: kdebase-workspace 4.1.1-1
      Update to KDE 4.1.1
........

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

------------------------+
 PKGBUILD               |   18 ++++++++----------
 systemtraywidget.patch |   20 --------------------
 2 files changed, 8 insertions(+), 30 deletions(-)


Property changes on: kdebase-workspace/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kdebase-workspace/trunk:1-7993
   + /kdebase-workspace/trunk:1-10421

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-29 06:42:06 UTC (rev 10421)
+++ extra-x86_64/PKGBUILD	2008-08-29 06:42:34 UTC (rev 10422)
@@ -1,39 +1,37 @@
-# $ Id: $
+# $Id: $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.1.0
-pkgrel=5
+pkgver=4.1.1
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
 depends=('kdelibs' 'kdebase-runtime' 'libcaptury' 'libxxf86misc' 'libxcomposite' 'libxres'
-	 'libusb' 'libxss' 'lm_sensors' 'libxinerama' 'libxklavier' 'qimageblitz')
+	 'libxss' 'lm_sensors' 'libxinerama' 'libxklavier' 'qimageblitz')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'kdemultimedia')
 optdepends=('kdemultimedia')
 replaces=('kdmtheme' 'kde-common')
 conflicts=('kde-common')
 options=('docs')
 backup=('usr/share/config/kdm/kdmrc')
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'agent-startup.sh' 'agent-shutdown.sh' 'systemtraywidget.patch')
-md5sums=('d8dbe16f5807536a429bbf9fd33e82a5'
+        'agent-startup.sh' 'agent-shutdown.sh')
+md5sums=('53805b96727db2fe30773a3fa9f78b73'
          '721e97031b62aee8914e8617e86f9235'
          '5d80164932e0d44d8b802d3929a004ab'
          '10a490653b002e6f9e7476ff9d37c011'
          '552337fd9a3982d809ea16c7f0033d42'
          '367a3538f54db71f108b34cfa31088ac'
          'c963ef6e37c9051119972a58c67f05fb'
-         '18e8d01124b19f7df2937c06e177bf7f'
-         '808a6efad838d15ba1cd81d8bf05820c')
+         '18e8d01124b19f7df2937c06e177bf7f')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
-	patch -p0 -i ${srcdir}/systemtraywidget.patch || return 1
 	cd ../
 	mkdir build
 	cd build

Deleted: extra-x86_64/systemtraywidget.patch
===================================================================
--- extra-x86_64/systemtraywidget.patch	2008-08-29 06:42:06 UTC (rev 10421)
+++ extra-x86_64/systemtraywidget.patch	2008-08-29 06:42:34 UTC (rev 10422)
@@ -1,20 +0,0 @@
---- plasma/applets/systemtray/systemtraywidget.cpp	2008/08/05 13:54:31	842540
-+++ plasma/applets/systemtray/systemtraywidget.cpp	2008/08/05 13:57:28	842541
-@@ -52,6 +52,17 @@
-     // Override spacing set by the current style
-     m_mainLayout->setContentsMargins(0, 0, 0, 0);
-     m_mainLayout->setSpacing(4);
-+
-+    // Widgets added to the parent before this one may end up
-+    // on top of this one if their native windows are created
-+    // after this one, so raise() to make sure this widget is
-+    // on top.
-+    // raise() -- doesn't work for some reason
-+    foreach (QObject *sibling, parent->children()) {
-+        if (sibling != this && sibling->isWidgetType()) {
-+            static_cast<QWidget*>(sibling)->lower();
-+        }
-+    }
- }
- 
- void SystemTrayWidget::init()