rpms/compiz/F-9 compiz-0.7.6-kde42.patch, NONE, 1.1 compiz-0.7.8-kde42-crash.patch, NONE, 1.1 compiz-0.7.8-kde42-krunner.patch, NONE, 1.1 compiz.spec, 1.123, 1.124 compiz-0.7.6-kde4-plasma-revert.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Thu Jan 29 23:14:46 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/compiz/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32055/F-9
Modified Files:
compiz.spec
Added Files:
compiz-0.7.6-kde42.patch compiz-0.7.8-kde42-crash.patch
compiz-0.7.8-kde42-krunner.patch
Removed Files:
compiz-0.7.6-kde4-plasma-revert.patch
Log Message:
* Thu Jan 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
- patch and rebuild for KDE 4.2
compiz-0.7.6-kde42.patch:
--- NEW FILE compiz-0.7.6-kde42.patch ---
diff -ur compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.cpp
--- compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp 2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.cpp 2008-12-10 03:24:48.000000000 +0100
@@ -30,7 +30,7 @@
#include <fixx11h.h>
-#include <KDE/Plasma/PanelSvg>
+#include <KDE/Plasma/FrameSvg>
#include <KDE/Plasma/Theme>
#include <kwindowsystem.h>
@@ -46,9 +46,9 @@
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,8 +131,8 @@
p.setCompositionMode (QPainter::CompositionMode_Source);
p.setRenderHint (QPainter::SmoothPixmapTransform);
- mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
- mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
+ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
+ mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
contentHeight));
mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
diff -ur compiz-0.7.6/kde/window-decorator-kde4/switcher.h compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.h
--- compiz-0.7.6/kde/window-decorator-kde4/switcher.h 2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.h 2008-12-10 03:24:48.000000000 +0100
@@ -30,7 +30,7 @@
namespace Plasma
{
-class PanelSvg;
+class FrameSvg;
}
class QSpacerItem;
@@ -70,7 +70,7 @@
QRect mGeometry;
- Plasma::PanelSvg *mBackground;
+ Plasma::FrameSvg *mBackground;
QPixmap mPixmap;
QPixmap mBackgroundPixmap;
compiz-0.7.8-kde42-crash.patch:
--- NEW FILE compiz-0.7.8-kde42-crash.patch ---
Implement KDecorationBridge unstable API, needed for KDE 4.2.
---
diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
index d2d362b..68c856b 100644
--- a/kde/window-decorator-kde4/window.cpp
+++ b/kde/window-decorator-kde4/window.cpp
@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool)
}
void
+KWD::Window::repaintShadow (void)
+{
+}
+
+bool
+KWD::Window::compositingActive (void) const
+{
+ return true;
+}
+
+bool
+KWD::Window::shadowsActive (void) const
+{
+ /* we are drawing the shadows ourselves, no need for the
+ decoration engine to do so */
+ return false;
+}
+
+double
+KWD::Window::opacity (void) const
+{
+ return 1.0;
+}
+
+void
KWD::Window::createDecoration (void)
{
KDecoration *decor;
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
index bdf2c47..034e6fe 100644
--- a/kde/window-decorator-kde4/window.h
+++ b/kde/window-decorator-kde4/window.h
@@ -45,7 +45,7 @@ class QMenu;
namespace KWD
{
-class Window:public QWidget, public KDecorationBridge {
+class Window:public QWidget, public KDecorationBridgeUnstable {
Q_OBJECT public:
enum Type
@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge {
virtual Qt::WFlags initialWFlags (void) const;
virtual void grabXServer (bool grab);
+ /* unstable API */
+ virtual void repaintShadow ();
+ virtual bool compositingActive () const;
+ virtual bool shadowsActive () const;
+ virtual double opacity () const;
+
void handleActiveChange (void);
void updateFrame (WId frame);
void updateWindowGeometry (void);
compiz-0.7.8-kde42-krunner.patch:
--- NEW FILE compiz-0.7.8-kde42-krunner.patch ---
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 96b818d..0bf4718 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
}
else if (action == Atoms::toolkitActionRunDialogAtom)
{
- QDBusInterface krunner ("org.kde.krunner", "/Interface",
- "org.kde.krunner.Interface");
- krunner.call ("display", "");
+ QDBusInterface krunner ("org.kde.krunner", "/App",
+ "org.kde.krunner.App");
+ if (krunner.isValid ())
+ krunner.call ("display");
}
else if (action == Atoms::toolkitActionForceQuitDialogAtom)
{
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/compiz.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- compiz.spec 24 Jul 2008 15:11:23 -0000 1.123
+++ compiz.spec 29 Jan 2009 23:14:16 -0000 1.124
@@ -14,7 +14,7 @@
License: X11/MIT/GPL
Group: User Interface/Desktops
Version: 0.7.6
-Release: 3%{?dist}.1
+Release: 4%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +39,7 @@
BuildRequires: librsvg2-devel
BuildRequires: metacity-devel >= 2.18
BuildRequires: mesa-libGLU-devel
-BuildRequires: kdebase-workspace-devel >= 4.0.80
+BuildRequires: kdebase-workspace-devel >= 4.2
BuildRequires: dbus-qt-devel
BuildRequires: fuse-devel
@@ -60,8 +60,13 @@
#Patch110: scale-key.patch
# upstream commit 45caca2220f75bfd20074c217ebee10825413547
Patch111: compiz-0.7.6-decoration-size.patch
-# revert kde4 plasma changes to build agains kde4 < 4.0.80
-Patch112: compiz-0.7.6-kde4-plasma-revert.patch
+# make kde4-window-decorator build against KDE 4.2's libplasma
+Patch120: compiz-0.7.6-kde42.patch
+# KDE-4.2 fixes from upstream:
+# 814809ffffe47f829b784f7bd246026bfcdecf0f
+Patch126: compiz-0.7.8-kde42-crash.patch
+# 4cc1d813a9748c3740662233a2add3fe65a4c533
+Patch127: compiz-0.7.8-kde42-krunner.patch
%description
Compiz is one of the first OpenGL-accelerated compositing window
@@ -136,7 +141,11 @@
%endif
#%patch110 -p1 -b .scale-key
%patch111 -p1 -b .decoration-size
-#patch112 -p1 -b .plasma
+%patch120 -p1 -b .kde42
+sleep 1
+touch configure
+%patch126 -p1 -b .kde-crash
+%patch127 -p1 -b .krunner
%build
rm -rf $RPM_BUILD_ROOT
@@ -338,6 +347,9 @@
%changelog
+* Thu Jan 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
+- patch and rebuild for KDE 4.2
+
* Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3.1
- (re)build for kde-4.1
--- compiz-0.7.6-kde4-plasma-revert.patch DELETED ---
More information about the fedora-extras-commits
mailing list