[arch-commits] Commit in kdebase-workspace/trunk (2 files)

[Andrea Scarpino]

    Date: Thursday, February 10, 2011 @ 02:04:58
  Author: andrea
Revision: 109480

Fix broken symlinks in /etc/X11/sessions (FS#22811) and fix minor bug in WindowGeometry effect settings (FS#22655)

Added:
  kdebase-workspace/trunk/fix-window-geometry-settings.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |    9 ++++++---
 fix-window-geometry-settings.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-10 06:41:17 UTC (rev 109479)
+++ PKGBUILD	2011-02-10 07:04:58 UTC (rev 109480)
@@ -4,7 +4,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -29,7 +29,8 @@
         'fixpath.patch' 'terminate-server.patch'
         'set-horos-theme.patch'
         'fix-MALLOC_CHECK.patch'
-        'fix-plasma-crash-on-exit.patch')
+        'fix-plasma-crash-on-exit.patch'
+        'fix-window-geometry-settings.patch')
 sha1sums=('c192f712d16617e625acc84fcd9e0546df887a70'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -40,7 +41,8 @@
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd1f74ba2c7e2580d32b16ab88b0e6e804951e663'
           'd8d6ac7f1b25a30fdd0d6a182e2ac6c6f2a28cd7'
-          '7b7789c3276b67d1c4c462c2d2347db59650aefb')
+          '7b7789c3276b67d1c4c462c2d2347db59650aefb'
+          '944f3c9af33c59289950908c78be66cab495f0a6')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -48,6 +50,7 @@
     patch -Np0 -i ${srcdir}/set-horos-theme.patch
     patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch
     patch -Np1 -i ${srcdir}/fix-plasma-crash-on-exit.patch
+    patch -Np1 -i ${srcdir}/fix-window-geometry-settings.patch
 
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch

Added: fix-window-geometry-settings.patch
===================================================================
--- fix-window-geometry-settings.patch	                        (rev 0)
+++ fix-window-geometry-settings.patch	2011-02-10 07:04:58 UTC (rev 109480)
@@ -0,0 +1,28 @@
+commit da3a0ad39be3cd5529b3d8b259065cd26e631a0b
+Author: Thomas Lübking <thomas.luebking at gmail.com>
+Date:   Sun Feb 6 16:36:16 2011 +0100
+
+    export WindowGeometry config symbols
+    
+    BUG: 265272
+
+diff --git a/kwin/effects/configs_builtins.cpp b/kwin/effects/configs_builtins.cpp
+index 6861d5c..6f0b8e3 100644
+--- a/kwin/effects/configs_builtins.cpp
++++ b/kwin/effects/configs_builtins.cpp
+@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "resize/resize_config.h"
+ #include "showfps/showfps_config.h"
+ #include "thumbnailaside/thumbnailaside_config.h"
++#include "windowgeometry/windowgeometry_config.h"
+ #include "zoom/zoom_config.h"
+ 
+ #ifdef KWIN_HAVE_OPENGL_COMPOSITING
+@@ -67,6 +68,7 @@ KWIN_EFFECT_CONFIG_MULTIPLE(builtins,
+                             KWIN_EFFECT_CONFIG_SINGLE(showfps, ShowFpsEffectConfig)
+                             KWIN_EFFECT_CONFIG_SINGLE(translucency, TranslucencyEffectConfig)
+                             KWIN_EFFECT_CONFIG_SINGLE(thumbnailaside, ThumbnailAsideEffectConfig)
++                            KWIN_EFFECT_CONFIG_SINGLE( windowgeometry, WindowGeometryConfig )
+                             KWIN_EFFECT_CONFIG_SINGLE(zoom, ZoomEffectConfig)
+ 
+ #ifdef KWIN_HAVE_OPENGL_COMPOSITING