[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fix-intel-driver.patch)

[Andrea Scarpino]

    Date: Sunday, September 21, 2014 @ 17:08:01
  Author: andrea
Revision: 222548

upgpkg: kdebase-workspace 4.11.12-1

Upstream release

Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/fix-intel-driver.patch

------------------------+
 PKGBUILD               |   17 ++++++-----------
 fix-intel-driver.patch |   29 -----------------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-21 14:34:19 UTC (rev 222547)
+++ PKGBUILD	2014-09-21 15:08:01 UTC (rev 222548)
@@ -4,9 +4,9 @@
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.11
-_pkgver=4.13.3
-pkgrel=2
+pkgver=4.11.12
+_pkgver=4.14.1
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,9 +29,8 @@
 source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'khotkeys-qt4.patch'
-        'fix-intel-driver.patch')
-sha1sums=('84d70bb81a5d3b42869b666a12963dea14a33722'
+        'khotkeys-qt4.patch')
+sha1sums=('64765044c0b0c487420594280eda379e7216eb8d'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           'c6afdf8964b2b2c4809b2e8e694729b2661e29df'
@@ -40,8 +39,7 @@
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'd509dac592bd8b310df27991b208c95b6d907514'
-          'aa9d2e5a69986c4c3d47829721ea99edb473be12'
-          '0b7d847a3df097d066620d5da58b23bbbdc68dc9')
+          'aa9d2e5a69986c4c3d47829721ea99edb473be12')
 
 prepare() {
         mkdir build
@@ -57,9 +55,6 @@
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
-
-        # KDEBUG#336589
-        patch -p1 -i "${srcdir}"/fix-intel-driver.patch
 }
 
 build() {

Deleted: fix-intel-driver.patch
===================================================================
--- fix-intel-driver.patch	2014-09-21 14:34:19 UTC (rev 222547)
+++ fix-intel-driver.patch	2014-09-21 15:08:01 UTC (rev 222548)
@@ -1,29 +0,0 @@
-From: Martin Gräßlin <mgraesslin at 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;
-