diff -u kdebase-workspace-4.0.2/debian/patches/series kdebase-workspace-4.0.2/debian/patches/series --- kdebase-workspace-4.0.2/debian/patches/series +++ kdebase-workspace-4.0.2/debian/patches/series @@ -20,0 +21 @@ +kubuntu_501_fix_wallpaper_r783864.diff diff -u kdebase-workspace-4.0.2/debian/changelog kdebase-workspace-4.0.2/debian/changelog --- kdebase-workspace-4.0.2/debian/changelog +++ kdebase-workspace-4.0.2/debian/changelog @@ -1,3 +1,10 @@ +kdebase-workspace (4:4.0.2-0ubuntu3) hardy; urgency=low + + * Added debian/patches/kubuntu_501_fix_wallpaper_r783864.diff from svn + to fix wallpaper blanking issues: (LP: #198470) + + -- Terence Simpson Wed, 12 Mar 2008 15:10:49 +0000 + kdebase-workspace (4:4.0.2-0ubuntu2) hardy; urgency=low * debian/kdm-kde4.config: merged from kdm package, fixes reconfiguration for only in patch2: unchanged: --- kdebase-workspace-4.0.2.orig/debian/patches/kubuntu_501_fix_wallpaper_r783864.diff +++ kdebase-workspace-4.0.2/debian/patches/kubuntu_501_fix_wallpaper_r783864.diff @@ -0,0 +1,65 @@ +Index: kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp +=================================================================== +--- kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp 2008/03/09 20:12:38 783863 ++++ kdebase-workspace-4.0.2/plasma/containments/desktop/desktop.cpp 2008/03/09 20:15:09 783864 +@@ -64,9 +64,7 @@ + m_logoutAction(0), + m_configDialog(0), + m_wallpaperPath(0), +- m_renderer(resolution(), 1.0), +- m_fadeOutAnimId(0), +- m_fadeInAnimId(0) ++ m_renderer(resolution(), 1.0) + { + qRegisterMetaType("QImage"); + qRegisterMetaType("QPersistentModelIndex"); +@@ -276,19 +274,7 @@ + void DefaultDesktop::updateBackground(int token, const QImage &img) + { + if (m_current_renderer_token == token) { +- QPixmap oldBitmapBackground; +- if (!m_bitmapBackground.isNull()) { +- oldBitmapBackground = m_bitmapBackground; +- } + m_bitmapBackground = QPixmap::fromImage(img); +- +- if (!oldBitmapBackground.isNull()) { +- m_fadeOutAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementDisappear); +- Plasma::Phase::self()->setAnimationPixmap(m_fadeOutAnimId, oldBitmapBackground); +- m_fadeInAnimId = Plasma::Phase::self()->animateElement(this, Plasma::Phase::ElementAppear); +- Plasma::Phase::self()->setAnimationPixmap(m_fadeInAnimId, m_bitmapBackground); +- } +- + update(); + } + } +@@ -431,22 +417,13 @@ + painter->resetTransform(); + } + +- if (m_fadeOutAnimId || m_fadeInAnimId) { +- if (m_fadeOutAnimId) { +- painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeOutAnimId), option->exposedRect); +- } +- if (m_fadeInAnimId) { +- painter->drawPixmap(option->exposedRect, Plasma::Phase::self()->animationResult(m_fadeInAnimId), option->exposedRect); +- } +- } else if (!m_bitmapBackground.isNull()) { +- // blit the background (saves all the per-pixel-products that blending does) +- painter->setCompositionMode(QPainter::CompositionMode_Source); +- +- // for pixmaps we draw only the exposed part (untransformed since the +- // bitmapBackground already has the size of the viewport) +- painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect); +- //kDebug() << "draw pixmap of background to" << option->exposedRect; +- } ++ // blit the background (saves all the per-pixel-products that blending does) ++ painter->setCompositionMode(QPainter::CompositionMode_Source); ++ ++ // for pixmaps we draw only the exposed part (untransformed since the ++ // bitmapBackground already has the size of the viewport) ++ painter->drawPixmap(option->exposedRect, m_bitmapBackground, option->exposedRect); ++ //kDebug() << "draw pixmap of background to" << option->exposedRect; + + // restore transformation and composition mode + painter->restore();