Hello community,
here is the log from the commit of package compiz for openSUSE:Factory
checked in at Wed Jan 21 17:50:07 CET 2009.
--------
--- compiz/compiz.changes 2009-01-09 01:45:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2009-01-21 14:52:34.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 21 19:21:47 IST 2009 - cyberorg@opensuse.org
+
+- Fix build for newer kde4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
compiz-kde4-decorator-update.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.R32309/_old 2009-01-21 17:49:32.000000000 +0100
+++ /var/tmp/diff_new_pack.R32309/_new 2009-01-21 17:49:32.000000000 +0100
@@ -41,7 +41,7 @@
%endif
AutoReqProv: on
Version: 0.7.8
-Release: 11
+Release: 13
Requires: compiz-decorator = %{version} compiz-branding = %{version}
Provides: windowmanager
Summary: OpenGL window and compositing manager.
@@ -63,6 +63,7 @@
Patch9: compiz-kde4-decorator-rollback.diff
Patch10: compiz-kde4-paint-fix.diff
Patch11: compiz-missing-translations.patch
+Patch12: compiz-kde4-decorator-update.patch
Patch29: gnome-xgl-settings-remove-gconf.diff
Patch36: gnome-xgl-settings-hwinfo-primary-display-bno335445.patch
Patch60: Mesa-x86_64-fixes.diff
@@ -242,6 +243,9 @@
%patch10 -p1
%endif
%patch11 -p1
+if [ -f /usr/include/plasma/framesvg.h ] ; then
+%patch12 -p1
+fi
#%patch61 -p1
cd -
@@ -419,6 +423,8 @@
%_datadir/compiz/sle.png
%changelog
+* Tue Jan 20 2009 cyberorg@opensuse.org
+- Fix build for newer kde4
* Thu Jan 08 2009 davidr@novell.com
- Fix decorator double click handling when window movement
is intercepted at the compositing manager level. (bnc 458000)
++++++ compiz-kde4-decorator-update.patch ++++++
From: Danny Baumann
Date: Thu, 8 Jan 2009 13:20:01 +0000 (+0100)
Subject: Plasma::PanelSvg was renamed to Plasma::FrameSvg in KDE 4.2.
X-Git-Url: http://gitweb.compiz-fusion.org/?p=compiz;a=commitdiff_plain;h=ed79849955ca4...
Plasma::PanelSvg was renamed to Plasma::FrameSvg in KDE 4.2.
---
diff --git a/configure.ac b/configure.ac
index 4532099..7a11f4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,7 +487,7 @@ if test "x$use_kde4" = "xyes"; then
kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
dnl Check for KWin headers
AC_MSG_CHECKING([for KWin headers])
diff --git a/kde/window-decorator-kde4/switcher.cpp b/kde/window-decorator-kde4/switcher.cpp
index 2978e69..83e5c40 100644
--- a/kde/window-decorator-kde4/switcher.cpp
+++ b/kde/window-decorator-kde4/switcher.cpp
@@ -30,7 +30,7 @@
#include
-#include
+#include
#include
#include
@@ -46,9 +46,9 @@ mId (id)
QColor color;
color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
- mBackground = new Plasma::PanelSvg();
+ mBackground = new Plasma::FrameSvg();
mBackground->setImagePath ("dialogs/background");
- mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
+ mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
mBorder.left = mBackground->marginSize(Plasma::LeftMargin);
mBorder.right = mBackground->marginSize(Plasma::RightMargin);
@@ -131,9 +131,8 @@ KWD::Switcher::redrawPixmap ()
p.setCompositionMode (QPainter::CompositionMode_Source);
p.setRenderHint (QPainter::SmoothPixmapTransform);
- mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
- mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
- contentHeight));
+ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
+ mBackground->paintFrame (&p, QRect (0, 0, contentWidth, contentHeight));
mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
mGeometry.width (),
@@ -167,10 +166,11 @@ KWD::Switcher::update ()
p.setCompositionMode (QPainter::CompositionMode_Source);
-
- mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
- mGeometry.height () + 5, mGeometry.width (),
- fm.height ()));
+ mBackground->paintFrame (&p, QRect (mBorder.left,
+ mBorder.top +
+ mGeometry.height () + 5,
+ mGeometry.width (),
+ fm.height ()));
p.setFont (font);
p.setPen (Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor));
diff --git a/kde/window-decorator-kde4/switcher.h b/kde/window-decorator-kde4/switcher.h
index 2451c7a..bc969d7 100644
--- a/kde/window-decorator-kde4/switcher.h
+++ b/kde/window-decorator-kde4/switcher.h
@@ -30,7 +30,7 @@
namespace Plasma
{
-class PanelSvg;
+class FrameSvg;
}
class QSpacerItem;
@@ -70,7 +70,7 @@ class Switcher
QRect mGeometry;
- Plasma::PanelSvg *mBackground;
+ Plasma::FrameSvg *mBackground;
QPixmap mPixmap;
QPixmap mBackgroundPixmap;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org