kde-wworkspace removed kcm-thouchpad

kde-workspace/4.11.12a.patch

@@ -0,0 +1,36 @@
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 29 Jul 2014 21:01:16 +0000
+Subject: fix graphical glitch of xembed entries
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=3cdf85b5147382bf768d5b624ebf52a08748825b
+---
+fix graphical glitch of xembed entries
+
+Patch by Dmitry Ivanov
+The fix is a very simple one-liner setting FullViewportUpdate mode for FdoGraphicsWidget. I'm aware FullViewportUpdate has negative performance impact but I also know it efficiently leaves out any graphical glitches happening due to no repaint of widget when necessary (which is what the bug is about).
+BUG:317066
+REVIEW:114910
+---
+
+
+--- a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
++++ b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
+@@ -64,6 +64,19 @@
+     resize(22, 22);
+ 
+     setCacheMode(QGraphicsItem::NoCache);
++
++    QGraphicsView *parentView = 0;
++
++    foreach (QGraphicsView *view, scene()->views()) {
++        if (view->isVisible() && view->sceneRect().intersects(sceneBoundingRect())) {
++            parentView = view;
++            break;
++        }
++    }
++
++    if (parentView) {     
++        parentView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);      
++    }
+ 
+     connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
+             this, SLOT(updateWidgetBackground()));

kde-workspace/4.11.12b.patch

@@ -0,0 +1,28 @@
+From: Martin Gräßlin <mgraesslin@kde.org>
+Date: Fri, 22 Aug 2014 05:37:42 +0000
+Subject: [libkwineffects] Require strict binding for intel driver
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=04157f13de8d9b3028bca3a1832276ba96ae45fd
+---
+[libkwineffects] Require strict binding for intel driver
+
+According to driver devs it's a "buggy micro-optimisation", see
+https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
+
+CCBUG: 336589
+
+Backport from kwin.git e8241313fc979aefafc8c2a0207570d6394f1580
+---
+
+
+--- a/kwin/libkwineffects/kwinglplatform.cpp
++++ b/kwin/libkwineffects/kwinglplatform.cpp
+@@ -818,7 +818,8 @@
+             m_supportsGLSL = false;
+ 
+         m_limitedGLSL = m_supportsGLSL && m_chipClass < I965;
+-        m_looseBinding = true;
++        // see https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
++        m_looseBinding = false;
+ 
+         if (m_chipClass < I965) {
+             m_recommendedCompositor = OpenGL1Compositing;

kde-workspace/PKGBUILD

@@ -9,12 +9,10 @@ pkgname="kde-workspace"
 arch=('x86_64')
 pkgver=${_workspace_ver}
 #pkgver=4.11.11
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Workspace"
 url="http://www.kde.org"
-license=('GPL'
-         'LGPL'
-         'FDL')
+license=('GPL' 'LGPL' 'FDL')
 options=('docs'
          '!header'
          'debug'
@@ -74,20 +72,17 @@ optdepends=('appmenu-qt:           Global menu support'
             'xf86-input-wacom:     Wacom tablet support')
 provides=('kdebase-workspace'
           'powerdevil'
-          'kcm_tablet=1.1.3'
-          'kde-workspace-doc'
-          'ktouchpadenabler')
+          'kcm_tablet=2.0.2'
+          'kde-workspace-doc')
 replaces=('guidance-power-manager'
           'kdebase-workspace'
-          'kde-workspace-doc'
-          'ktouchpadenabler')
+          'kde-workspace-doc')
 conflicts=('kdebase-workspace'
            'powerdevil'
            'kcm_tablet'
            'guidance-power-manager'
            'kde-workspace-doc'
-           'kded-appmenu'
-           'ktouchpadenabler')
+           'kded-appmenu')
 groups=('kde'
         'kde-uninstall'
         'kde-minimal')
@@ -96,8 +91,7 @@ backup=('usr/share/config/kdm/kdmrc'
 source=("http://download.kde.org/stable/${_kdever}/src/kde-workspace-${_workspace_ver}.tar.xz"
 #"http://download.kde.org/stable/${_kdever}/src/${pkgname}-$pkgver.tar.xz"
         "http://download.kde.org/stable/${_kdever}/src/kde-wallpapers-${_kdever}.tar.xz"
-        'mishaaq-kcm_touchpad-00370b5.tar.gz'
-        'http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2'
+        "git://anongit.kde.org/wacomtablet#tag=v2.0.2"
         'kde.pam'
         'kde-np.pam'
         'kscreensaver.pam'
@@ -112,11 +106,16 @@ source=("http://download.kde.org/stable/${_kdever}/src/kde-workspace-${_workspac
         '09_enable_start-shutdown-scripts.patch'
         'fix_terminate-server.patch'
         'fix_root-only-kcms.patch'
-        'plasma-panel-resize-hint.diff')
+        'plasma-panel-resize-hint.diff'
+        # port some 4.11.12 graphical fixes
+        # http://bugs.kde.org/show_bug.cgi?id=336589
+        # http://bugs.kde.org/show_bug.cgi?id=317066
+        '4.11.12a.patch'
+        '4.11.12b.patch')
+
 sha256sums=(`grep ${pkgname}-$pkgver.tar.xz  ../checksums.txt | cut -d " " -f1`
             `grep kde-wallpapers-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`
-            '85b45195048fc1219ebe0496588404abcca0d9c9e88e2da6653c6e0326c4be51'
-            '5d15a1cda1e418e633e7fdd83f5a398c4294c28771a16b68979a2b40ddac0def'
+            'SKIP'
             '812111f166fdf9ab7ef9400c4414cbe26fac5210f2292399d4446fe6e89eea54'
             '3ca72a5f34d29747d12b9b41888d0e369956ba383478850c578e3aa109444214'
             '0a985e3b699578de3e22b25ee72abe4e24ca8730e4afb37dfeed367823bdb0d5'
@@ -131,7 +130,9 @@ sha256sums=(`grep ${pkgname}-$pkgver.tar.xz  ../checksums.txt | cut -d " " -f1`
             'ad91b3661bcb72bbbd12ed100fc76b7ae0829e37e726adb9c3e4e4cb44d496fd'
             'e5329c87f14ce04f80291f1f7a2be47994f3d54425b572c308b38e2718390959'
             'b38959520a3ecafe6f5628849e29d7e8b0dc030622fa12e77eb8461ad7187a78'
-            '6bc640b8324d47e9d07a7cedef7e7c5a944ec4d900a15b88471dc77724f9b4a7')
+            '6bc640b8324d47e9d07a7cedef7e7c5a944ec4d900a15b88471dc77724f9b4a7'
+            '227d69e08ecf741206e1477b0af7ba687f071dbb38f8f0ce779422facc90bb12'
+            'c3363f93984a6b846dfc4e344dfb0b740905a7dfca0f81b006128953bf24bc3d')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -148,6 +149,8 @@ prepare() {
     patch -p0 -i ${srcdir}/fix_terminate-server.patch
     patch -p1 -i ${srcdir}/fix_root-only-kcms.patch
     patch -p0 -i ${srcdir}/plasma-panel-resize-hint.diff
+    patch -p1 -i ${srcdir}/4.11.12a.patch
+    patch -p1 -i ${srcdir}/4.11.12b.patch
 
     # Disable krandr
     sed -i "s/add_subdirectory(randr)//g" ./kcontrol/CMakeLists.txt
@@ -166,16 +169,6 @@ build() {
         -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
     make
 
-    msg "Building kcm_touchpad..."
-    cd "${srcdir}/mishaaq-kcm_touchpad-00370b5"
-    # Fix desktop to the new layout
-    sed -i -e "s~keyboard-and-mouse~input-devices~g" touchpad.desktop
-    CXXFLAGS="${CXXFLAGS} -I /usr/include/freetype2" cmake . \
-        -DCMAKE_BUILD_TYPE=${_build_type} \
-        -DCMAKE_INSTALL_PREFIX=${_installprefix} \
-        -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-    make
-
     msg "Building kcm_tablet..."
     cd "${srcdir}/wacomtablet-2.0"
     # Fix desktop to the new layout
@@ -191,9 +184,6 @@ package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR=${pkgdir} install
 
-    cd "${srcdir}/mishaaq-kcm_touchpad-00370b5"
-    make DESTDIR=${pkgdir} install
-
     cd "${srcdir}/wacomtablet-2.0"
     make DESTDIR=${pkgdir} install