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

[Andrea Scarpino]

    Date: Thursday, February 10, 2011 @ 02:32:46
  Author: andrea
Revision: 109491

upgpkg: kdebase-workspace 4.6.0-3
modified patch to apply

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

------------------------------------+
 PKGBUILD                           |    2 +-
 fix-window-geometry-settings.patch |   30 ++++++++++--------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-10 07:32:39 UTC (rev 109490)
+++ PKGBUILD	2011-02-10 07:32:46 UTC (rev 109491)
@@ -42,7 +42,7 @@
           'd1f74ba2c7e2580d32b16ab88b0e6e804951e663'
           'd8d6ac7f1b25a30fdd0d6a182e2ac6c6f2a28cd7'
           '7b7789c3276b67d1c4c462c2d2347db59650aefb'
-          '944f3c9af33c59289950908c78be66cab495f0a6')
+          '2d3b67038d92687b51d0dbb0b9875705ddba8953')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}

Modified: fix-window-geometry-settings.patch
===================================================================
--- fix-window-geometry-settings.patch	2011-02-10 07:32:39 UTC (rev 109490)
+++ fix-window-geometry-settings.patch	2011-02-10 07:32:46 UTC (rev 109491)
@@ -1,28 +1,18 @@
-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"
+--- kdebase-workspace-4.6.0/kwin/effects/configs_builtins.cpp~	2011-02-09 23:11:21.970007079 -0800
++++ kdebase-workspace-4.6.0/kwin/effects/configs_builtins.cpp	2011-02-09 23:10:54.123340156 -0800
+@@ -33,6 +33,7 @@
+ #include "shadow/shadow_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)
+@@ -71,6 +72,7 @@
+     KWIN_EFFECT_CONFIG_SINGLE( shadow, ShadowEffectConfig )
+     KWIN_EFFECT_CONFIG_SINGLE( showfps, ShowFpsEffectConfig )
+     KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig )
++    KWIN_EFFECT_CONFIG_SINGLE( windowgeometry, WindowGeometryConfig )
+     KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig )
  
  #ifdef KWIN_HAVE_OPENGL_COMPOSITING