diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-23 19:45:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-23 19:45:34 +0000 |
| commit | 30da75604a13395e526c1010e4156f1f228350e3 (patch) | |
| tree | 360829c5d61ce2408fff724803a7fe02dda62695 /kde-base/kwin | |
| parent | Marking subversion-1.6.6 ppc64 for bug 294077 (diff) | |
| download | gentoo-2-30da75604a13395e526c1010e4156f1f228350e3.tar.gz gentoo-2-30da75604a13395e526c1010e4156f1f228350e3.tar.bz2 gentoo-2-30da75604a13395e526c1010e4156f1f228350e3.zip | |
Revision bump to fix -opengl build. Thanks to Bartosz Brachaczek for the patch.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kwin')
| -rw-r--r-- | kde-base/kwin/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/kwin/files/4.3.3-fix_no_opengl.patch | 36 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-4.3.3-r1.ebuild (renamed from kde-base/kwin/kwin-4.3.3.ebuild) | 12 |
3 files changed, 50 insertions, 8 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog index 77d7cfadc63e..ddb94baeff1b 100644 --- a/kde-base/kwin/ChangeLog +++ b/kde-base/kwin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kwin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.171 2009/11/19 23:13:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.172 2009/11/23 19:45:34 scarabeus Exp $ + +*kwin-4.3.3-r1 (23 Nov 2009) + + 23 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +files/4.3.3-fix_no_opengl.patch, -kwin-4.3.3.ebuild, + +kwin-4.3.3-r1.ebuild: + Revision bump to fix -opengl build. Thanks to Bartosz Brachaczek for the + patch. 19 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> -kwin-3.5.10.ebuild: Remove KDE 3.5.10. diff --git a/kde-base/kwin/files/4.3.3-fix_no_opengl.patch b/kde-base/kwin/files/4.3.3-fix_no_opengl.patch new file mode 100644 index 000000000000..818ad92a391d --- /dev/null +++ b/kde-base/kwin/files/4.3.3-fix_no_opengl.patch @@ -0,0 +1,36 @@ +--- trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp 2009/10/05 09:47:13 1031490 ++++ trunk/KDE/kdebase/workspace/kwin/effects/logout/logout.cpp 2009/10/07 15:10:15 1032334 +@@ -110,11 +110,11 @@ + frameDelay = 2; + } + } +-#endif + + if( frameDelay ) + --frameDelay; + else ++#endif + { + if( logoutWindow != NULL && !logoutWindowClosed ) + progress = qMin( 1.0, progress + time / animationTime( 2000.0 )); +@@ -234,14 +234,16 @@ + + void LogoutEffect::postPaintScreen() + { ++#ifdef KWIN_HAVE_OPENGL_COMPOSITING + if(( progress != 0.0 && progress != 1.0 ) || frameDelay ) +- { + effects->addRepaintFull(); +- } ++#else ++ if( progress != 0.0 && progress != 1.0 ) ++ effects->addRepaintFull(); ++#endif ++ + if( progress > 0.0 ) +- { + logoutWindowPassed = false; +- } + effects->postPaintScreen(); + } + diff --git a/kde-base/kwin/kwin-4.3.3.ebuild b/kde-base/kwin/kwin-4.3.3-r1.ebuild index 75f89852efcc..2a69cc67d60b 100644 --- a/kde-base/kwin/kwin-4.3.3.ebuild +++ b/kde-base/kwin/kwin-4.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.3.ebuild,v 1.1 2009/11/02 21:54:42 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.3-r1.ebuild,v 1.1 2009/11/23 19:45:34 scarabeus Exp $ EAPI="2" @@ -32,6 +32,10 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-fix_no_opengl.patch" +) + src_prepare() { # NOTE uncomment when enabled again by upstream # if ! use captury; then @@ -39,12 +43,6 @@ src_prepare() { # -i kwin/effects/CMakeLists.txt || \ # die "Making captury optional failed." # fi - # Dirty hax to fix building without OpenGL - if ! use opengl; then - sed -e 's|^[[:space:]]*windowOpacity.*|// commented out &|' \ - -i kwin/effects/logout/logout.cpp || \ - die "Commenting out windowOpacity failed." - fi kde4-meta_src_prepare } |