← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-workspace/quantal

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_revert_1554ba408633397066d31c3d565c217b5a385fb8.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-26 17:32:34 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120726173234-bsn4gwllpbcwu2r4
Tags: 4:4.9.0-0ubuntu1
* Use direct build-depends versions rather than kde-sc-dev-latest
* Remove patches/kubuntu_revert_1554ba408633397066d31c3d565c217b5a385fb8.diff fixed upstream
* Remove debian/patches/kubuntu_fix_batterymonitor_panel_minsize.diff fix upstream
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_revert_1554ba408633397066d31c3d565c217b5a385fb8.diff
1
 
Description: revert commit 1554ba408633397066d31c3d565c217b5a385fb8
2
 
 Remove the broken openGL buildsystem changes done in upstream commit
3
 
 1554ba408633397066d31c3d565c217b5a385fb8 which causes at least bug 997625
4
 
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kde-workspace/+bug/997625
5
 
Forwarded: no
6
 
Author: Philip Muškovac <yofel@kubuntu.org>
7
 
Last-Update: 2012-05-24
8
 
Index: kde-workspace-4.8.80/kwin/effects/CMakeLists.txt
9
 
===================================================================
10
 
--- kde-workspace-4.8.80.orig/kwin/effects/CMakeLists.txt       2012-05-23 01:53:35.000000000 +0200
11
 
+++ kde-workspace-4.8.80/kwin/effects/CMakeLists.txt    2012-05-26 11:27:49.851863133 +0200
12
 
@@ -119,9 +119,9 @@
13
 
     include( windowgeometry/CMakeLists.txt )
14
 
     include( zoom/CMakeLists.txt )
15
 
 
16
 
-    if( NOT OPENGLES_FOUND )
17
 
+    if( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
18
 
     include( logout/CMakeLists.txt )
19
 
-    endif( NOT OPENGLES_FOUND )
20
 
+    endif( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
21
 
 endif( NOT KWIN_MOBILE_EFFECTS )
22
 
 
23
 
 # OpenGL-specific effects