- add patch to fix kde decorator build error
This commit is contained in:
parent
1ec0f0e9c3
commit
4fcdea90a7
|
@ -13,7 +13,7 @@ URL: http://www.go-compiz.org
|
||||||
License: GPLv2+ and LGPLv2+ and MIT
|
License: GPLv2+ and LGPLv2+ and MIT
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
Version: 0.8.4
|
Version: 0.8.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Summary: OpenGL window and compositing manager
|
Summary: OpenGL window and compositing manager
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
@ -60,6 +60,7 @@ Patch107: compiz-0.8.4-wall.patch
|
||||||
|
|
||||||
|
|
||||||
Patch127: unknown-key.patch
|
Patch127: unknown-key.patch
|
||||||
|
Patch128: kde4_decorator_build.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Compiz is one of the first OpenGL-accelerated compositing window
|
Compiz is one of the first OpenGL-accelerated compositing window
|
||||||
|
@ -127,6 +128,7 @@ and other kde integration related stuff.
|
||||||
#%patch110 -p1 -b .scale-key
|
#%patch110 -p1 -b .scale-key
|
||||||
|
|
||||||
%patch127 -p1 -b .unknown-key
|
%patch127 -p1 -b .unknown-key
|
||||||
|
%patch128 -p1 -b .kde4_decorator_build
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
@ -305,6 +307,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 16 2010 Leigh Scott <leigh123linux@googlemail.com> - 0.8.4-2
|
||||||
|
- add patch to fix kde decorator build error
|
||||||
|
|
||||||
* Sat Jan 16 2010 Leigh Scott <leigh123linux@googlemail.com> - 0.8.4-1
|
* Sat Jan 16 2010 Leigh Scott <leigh123linux@googlemail.com> - 0.8.4-1
|
||||||
- update to 0.8.4
|
- update to 0.8.4
|
||||||
- update compiz-0.8.2-wall patch
|
- update compiz-0.8.2-wall patch
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
From: Danny Baumann <dannybaumann@web.de>
|
||||||
|
Date: Wed, 9 Dec 2009 15:33:14 +0000 (+0100)
|
||||||
|
Subject: Don't pull in unstable API, it's not needed any longer.
|
||||||
|
X-Git-Url: http://gitweb.compiz.org/?p=compiz%2Fcore;a=commitdiff_plain;h=9cb2dffa18f711a8515e65612721900ba5cd22e3
|
||||||
|
|
||||||
|
Don't pull in unstable API, it's not needed any longer.
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
|
||||||
|
index 40a5076..4422a15 100644
|
||||||
|
--- a/kde/window-decorator-kde4/window.h
|
||||||
|
+++ b/kde/window-decorator-kde4/window.h
|
||||||
|
@@ -50,7 +50,7 @@ namespace KWin
|
||||||
|
|
||||||
|
namespace KWD
|
||||||
|
{
|
||||||
|
-class Window: public QObject, public KDecorationBridgeUnstable {
|
||||||
|
+class Window: public QObject, public KDecorationBridge {
|
||||||
|
Q_OBJECT public:
|
||||||
|
|
||||||
|
enum Type
|
||||||
|
@@ -108,10 +108,8 @@ class Window: public QObject, public KDecorationBridgeUnstable {
|
||||||
|
virtual QWidget *initialParentWidget (void) const;
|
||||||
|
virtual Qt::WFlags initialWFlags (void) const;
|
||||||
|
virtual void grabXServer (bool grab);
|
||||||
|
+ virtual bool compositingActive() const;
|
||||||
|
|
||||||
|
- /* unstable API */
|
||||||
|
- virtual bool compositingActive () const;
|
||||||
|
-
|
||||||
|
virtual bool eventFilter (QObject* o, QEvent* e);
|
||||||
|
|
||||||
|
void handleActiveChange (void);
|
Loading…
Reference in New Issue