Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2012-11-18 20:25:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz (Old) and /work/SRC/openSUSE:Factory/.compiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2012-06-06 16:05:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2012-11-18 20:25:22.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 17 11:36:47 CET 2012 - [email protected] + +- compiz-kde-4.9.patch: + taken from gentoo to fix compilation with kde-4.9 + +------------------------------------------------------------------- New: ---- compiz-kde-4.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.XUlZEQ/_old 2012-11-18 20:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.XUlZEQ/_new 2012-11-18 20:25:23.000000000 +0100 @@ -16,25 +16,24 @@ # - Name: compiz Version: 0.8.8 -Release: 1 -License: HPND and GPL-2.0+ +Release: 0 Url: http://www.compiz.org -Group: System/GUI/Other PreReq: %fillup_prereq %if 0%{suse_version} <= 01100 Enhances: xgl >= git_070104 %endif Summary: OpenGL window and compositing manager +License: HPND and GPL-2.0+ +Group: System/GUI/Other BuildRequires: Mesa-devel BuildRequires: freeglut-devel BuildRequires: fuse-devel BuildRequires: gcc-c++ BuildRequires: gconf2-devel -BuildRequires: libgnome-desktop-2-devel BuildRequires: gtk2-devel +BuildRequires: libgnome-desktop-2-devel #BuildRequires: gtk-devel BuildRequires: intltool %if 0%{suse_version} < 01120 @@ -45,14 +44,14 @@ BuildRequires: librsvg-devel BuildRequires: libwnck-devel %if 0%{suse_version} > 01140 -BuildRequires: libwnck2-devel BuildRequires: dbus-1-glib-devel +BuildRequires: libwnck2-devel %endif BuildRequires: libxslt-devel BuildRequires: metacity -BuildRequires: pkg-config BuildRequires: pango-devel BuildRequires: perl-XML-Parser +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel %if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" @@ -74,8 +73,8 @@ # %if 0%{suse_version} == 01030 || 0%{suse_version} > 1120 BuildRequires: kde4-kwin -BuildRequires: kwin BuildRequires: kdebase4-workspace-devel +BuildRequires: kwin BuildRequires: libkde4-devel %endif #BuildRequires: libgnome-window-settings-devel @@ -103,6 +102,8 @@ Patch6: compiz-unmanaged-window-position.patch # PATCH-FIX-UPSTREAM compiz-global_Region_define.patch [email protected] -- Fix compiler irritation about X11 ::Region versus KDecorationDefines::Region Patch7: compiz-global_Region_define.patch +# PATCH-FIX-OPENSUSE [email protected] -- kde-4.9 buildfix taken from gentoo +Patch8: compiz-kde-4.9.patch Requires: compiz-branding = %{version} Requires: compiz-decorator = %{version} Provides: windowmanager @@ -130,8 +131,8 @@ to run well on most graphics hardware. %package gnome -License: GPL-2.0+ and HPND Summary: OpenGL window and compositing manager configuration utilities +License: GPL-2.0+ and HPND Group: System/GUI/GNOME Requires: %name = %version Requires: 3ddiag @@ -161,8 +162,8 @@ %if 0%want_kde3 %package kde -License: GPL-2.0+ and HPND Summary: OpenGL window and compositing managerdecorator +License: GPL-2.0+ and HPND Group: System/GUI/KDE Requires: %name = %version Provides: compiz-decorator = %version @@ -173,8 +174,8 @@ %endif %package kde4 -License: HPND and GPL-2.0+ and LGPL-2.1+ Summary: OpenGL window and compositing managerdecorator for kde4 +License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Requires: %name = %version %if 0%{suse_version} > 1130 @@ -198,8 +199,8 @@ compositing manager. %package devel -License: HPND and GPL-2.0+ and LGPL-2.1+ Summary: OpenGL window and compositing manager +License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other Requires: %name = %version Requires: Mesa-devel @@ -207,6 +208,7 @@ Requires: fuse-devel Requires: gcc-c++ Requires: gconf2-devel +Requires: gnome-control-center-devel Requires: gtk2-devel Requires: intltool Requires: librsvg-devel @@ -219,7 +221,6 @@ Requires: startup-notification-devel Requires: update-desktop-files Requires: xorg-x11-devel -Requires: gnome-control-center-devel %description devel Compiz is an OpenGL compositing manager that use @@ -228,8 +229,8 @@ to run well on most graphics hardware. %package branding-openSUSE -License: HPND and GPL-2.0+ and LGPL-2.1+ Summary: OpenGL window and compositing manager +License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other PreReq: /bin/ln PreReq: /bin/rm @@ -244,8 +245,8 @@ to run well on most graphics hardware. %package branding-SLE -License: HPND and GPL-2.0+ and LGPL-2.1+ Summary: OpenGL window and compositing manager +License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other PreReq: /bin/ln PreReq: /bin/rm @@ -260,8 +261,8 @@ to run well on most graphics hardware. %package branding-upstream -License: HPND and GPL-2.0+ and LGPL-2.1+ Summary: OpenGL window and compositing manager +License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other PreReq: /bin/ln PreReq: /bin/rm @@ -288,6 +289,7 @@ %endif %patch6 -p1 -R %patch7 -p1 +%patch8 -p1 %build %configure \ ++++++ compiz-kde-4.9.patch ++++++ >From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 From: Dennis Kasprzyk <[email protected]> Date: Mon, 06 Aug 2012 18:23:17 +0000 Subject: KDE 4.9 support. Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov --- diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp index a65f99f..78d1a47 100644 --- a/kde/window-decorator-kde4/window.cpp +++ b/kde/window-decorator-kde4/window.cpp @@ -768,6 +768,22 @@ KWD::Window::transparentRect () const return QRect (); } +KDecorationDefines::WindowOperation +KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) +{ + Options::MouseCommand com = buttonToCommand (button); + + if (com == Options::MouseOperationsMenu) + return KDecorationDefines::OperationsOp; + + return KDecorationDefines::NoOp; +} + + +#endif + +#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) + bool KWD::Window::isClientGroupActive () { @@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) showWindowMenu (pos); } -KDecorationDefines::WindowOperation -KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) +#endif + +#if KDE_IS_VERSION(4,8,80) +QString +KWD::Window::caption(int idx) const { - Options::MouseCommand com = buttonToCommand (button); + return mName; +} - if (com == Options::MouseOperationsMenu) - return KDecorationDefines::OperationsOp; +void +KWD::Window::closeTab(long id) +{ + closeWindow (); +} - return KDecorationDefines::NoOp; +void +KWD::Window::closeTabGroup() +{ + closeWindow (); +} + +long +KWD::Window::currentTabId() const +{ + return (long) mClientId; +} + +QIcon +KWD::Window::icon(int idx) const +{ + QIcon icon (mIcon); + icon.addPixmap (mMiniIcon); + return icon; +} + +void +KWD::Window::setCurrentTab(long id) +{ +} + +void +KWD::Window::showWindowMenu(const QPoint& pos, long id) +{ + showWindowMenu (pos); +} + +void +KWD::Window::tab_A_before_B(long A, long B) +{ +} + +void +KWD::Window::tab_A_behind_B(long A, long B) +{ +} + +int +KWD::Window::tabCount() const +{ + return 1; +} + +long +KWD::Window::tabId(int idx) const +{ + return (long) mClientId; +} + +void +KWD::Window::untab(long id, const QRect& newGeom) +{ } #endif + void KWD::Window::createDecoration (void) { @@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, int leftOffset, int rightOffset) { - Atom atom = Atoms::compizWindowBlurDecor; - QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; - ::Region topRegion = NULL; - ::Region bottomRegion = NULL; - ::Region leftRegion = NULL; - ::Region rightRegion = NULL; - int size = 0; - int w, h; + Atom atom = Atoms::compizWindowBlurDecor; + QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; + _XRegion *topRegion = NULL; + _XRegion *bottomRegion = NULL; + _XRegion *leftRegion = NULL; + _XRegion *rightRegion = NULL; + int size = 0; + int w, h; w = mGeometry.width () + mBorder.left + mBorder.right; h = mGeometry.height () + mBorder.top + mBorder.bottom; diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h index c2b274b..1ddfbd1 100644 --- a/kde/window-decorator-kde4/window.h +++ b/kde/window-decorator-kde4/window.h @@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { virtual bool compositingActive () const; #if KDE_IS_VERSION(4,3,90) virtual QRect transparentRect () const; - + virtual WindowOperation + buttonToWindowOperation(Qt::MouseButtons button); +#endif +#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) virtual bool isClientGroupActive (); virtual QList<ClientGroupItem> clientGroupItems () const; virtual long itemId (int index); @@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { virtual void closeClientGroupItem (int index); virtual void closeAllInClientGroup (); virtual void displayClientMenu (int index, const QPoint& pos); - - virtual WindowOperation - buttonToWindowOperation(Qt::MouseButtons button); + +#endif +#if KDE_IS_VERSION(4,8,80) + using KDecorationBridge::caption; + virtual QString caption(int idx) const; + virtual void closeTab(long id); + virtual void closeTabGroup(); + virtual long currentTabId() const; + using KDecorationBridge::icon; + virtual QIcon icon(int idx) const; + virtual void setCurrentTab(long id); + using KDecorationBridge::showWindowMenu; + virtual void showWindowMenu(const QPoint& pos, long id); + virtual void tab_A_before_B(long A, long B); + virtual void tab_A_behind_B(long A, long B); + virtual int tabCount() const; + virtual long tabId(int idx) const; + virtual void untab(long id, const QRect& newGeom); #endif + + virtual bool eventFilter (QObject* o, QEvent* e); void handleActiveChange (void); -- cgit v0.8.3.1-30-gff3a -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
