rpms/compiz/F-9 compiz-0.7.6-decoration-size.patch, NONE, 1.1 compiz-0.7.6-kde4-plasma-revert.patch, NONE, 1.1 desktop-effects-0.7.17-wall-plugin.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 compiz.spec, 1.119, 1.120 sources, 1.37, 1.38 gconf-core-plugin-loopfix.patch, 1.1, NONE

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8148

Modified Files:
	.cvsignore compiz.spec sources 
Added Files:
	compiz-0.7.6-decoration-size.patch 
	compiz-0.7.6-kde4-plasma-revert.patch 
	desktop-effects-0.7.17-wall-plugin.patch 
Removed Files:
	gconf-core-plugin-loopfix.patch 
Log Message:
Update to 0.7.6

compiz-0.7.6-decoration-size.patch:

--- NEW FILE compiz-0.7.6-decoration-size.patch ---
diff -upNr compiz-0.7.6.orign/plugins/decoration.c compiz-0.7.6/plugins/decoration.c
--- compiz-0.7.6.orign/plugins/decoration.c	2008-05-29 13:58:17.000000000 +0200
+++ compiz-0.7.6/plugins/decoration.c	2008-06-06 12:48:33.000000000 +0200
@@ -831,7 +831,7 @@ decorWindowUpdate (CompWindow *w,
 	moveDy = -oldShiftY;
     }
 
-    if (!w->attrib.override_redirect && (moveDx || moveDy))
+    if (w->placed && !w->attrib.override_redirect && (moveDx || moveDy))
     {
 	XWindowChanges xwc;
 	unsigned int   mask = CWX | CWY;

compiz-0.7.6-kde4-plasma-revert.patch:

--- NEW FILE compiz-0.7.6-kde4-plasma-revert.patch ---
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/decorator.cpp compiz-0.7.6/kde/window-decorator-kde4/decorator.cpp
--- compiz-0.7.6.orign/kde/window-decorator-kde4/decorator.cpp	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/decorator.cpp	2008-06-11 16:59:47.000000000 +0200
@@ -23,7 +23,6 @@
 
 #include <KDE/KCmdLineArgs>
 #include <KDE/KConfig>
-#include <KDE/KConfigGroup>
 #include <KDE/KGlobal>
 #include <kwindowsystem.h>
 #include <KDE/KLocale>
@@ -107,9 +106,6 @@ KWD::Decorator::Decorator (Display* disp
 
     mActiveId = 0;
 
-    KConfigGroup cfg (KSharedConfig::openConfig("plasmarc"), QString("Theme"));
-    Plasma::Theme::defaultTheme ()->setThemeName (cfg.readEntry ("name"));
-
     Atoms::init ();
 
     (void *) new KWinAdaptor (this);
@@ -241,7 +237,7 @@ KWD::Decorator::enableDecorations (Time 
 
     connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ()));
 
-    connect (Plasma::Theme::defaultTheme (), SIGNAL (themeChanged ()),
+    connect (Plasma::Theme::self (), SIGNAL (changed ()),
 	     SLOT (plasmaThemeChanged ()));
 
     // select for client messages
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/decorator.moc.cpp compiz-0.7.6/kde/window-decorator-kde4/decorator.moc.cpp
--- compiz-0.7.6.orign/kde/window-decorator-kde4/decorator.moc.cpp	2008-05-29 14:07:48.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/decorator.moc.cpp	2008-06-11 17:02:33.000000000 +0200
@@ -16,7 +16,6 @@
 #error "(The moc has changed too much.)"
 #endif
 
-QT_BEGIN_MOC_NAMESPACE
 static const uint qt_meta_data_KWD__Decorator[] = {
 
  // content:
@@ -99,4 +98,3 @@ int KWD::Decorator::qt_metacall(QMetaObj
     }
     return _id;
 }
-QT_END_MOC_NAMESPACE
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/main.cpp compiz-0.7.6/kde/window-decorator-kde4/main.cpp
--- compiz-0.7.6.orign/kde/window-decorator-kde4/main.cpp	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/main.cpp	2008-06-11 17:05:26.000000000 +0200
@@ -126,9 +126,6 @@ main (int argc, char **argv)
 	}
     }
 
-    // Disable window less child widgets
-    QApplication::setAttribute(Qt::AA_NativeWindows, true);
-
     app = new KWD::Decorator (dpy, visual ? Qt::HANDLE(visual) : 0,
 			      colormap ? Qt::HANDLE(colormap) : 0);
 
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/switcher.cpp compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp
--- compiz-0.7.6.orign/kde/window-decorator-kde4/switcher.cpp	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp	2008-06-11 16:59:47.000000000 +0200
@@ -30,7 +30,7 @@
 
 #include <fixx11h.h>
 
-#include <KDE/Plasma/PanelSvg>
+#include <KDE/Plasma/Svg>
 #include <KDE/Plasma/Theme>
 
 #include <kwindowsystem.h>
@@ -43,18 +43,15 @@ mId (id)
 {
     QPalette palette;
     long     prop[4];
-    QColor   color;
-    color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
+    QColor   color = Plasma::Theme::self ()->textColor ();
 
-    mBackground = new Plasma::PanelSvg();
-    mBackground->setImagePath ("dialogs/background");
-    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
-
-    mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
-    mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
-    mBorder.top    = mBackground->marginSize(Plasma::TopMargin);
-    mBorder.bottom = mBackground->marginSize(Plasma::BottomMargin) +
-		     Plasma::Theme::defaultTheme ()->fontMetrics ().height () + 10;
+    mBackground = new Plasma::Svg("widgets/background");
+
+    mBorder.left   = mBackground->elementSize ("left").width ();
+    mBorder.right  = mBackground->elementSize ("right").width ();
+    mBorder.top    = mBackground->elementSize ("top").height ();
+    mBorder.bottom = mBackground->elementSize ("bottom").height () +
+		     Plasma::Theme::self ()->fontMetrics ().height () + 10;
 
     mContext.extents.left   = mBorder.left;
     mContext.extents.right  = mBorder.right;
@@ -117,6 +114,13 @@ KWD::Switcher::updateGeometry ()
 
     updateWindowProperties ();
 }
+/*
+ * This code is taken from KDE/kdebase/workspace/libs/plasma/dialog.cpp
+ *
+ *   Copyright (C) 2007 by Alexis Ménard <darktears31 at gmail.com>
+ *   Copyright (C) 2007 Sebastian Kuegler <sebas at kde.org>
+ *   Copyright (C) 2006 Aaron Seigo <aseigo at kde.org>
+ */
 
 void
 KWD::Switcher::redrawPixmap ()
@@ -126,14 +130,95 @@ KWD::Switcher::redrawPixmap ()
     const int contentWidth  = mPixmap.width ();
     const int contentHeight = mPixmap.height ();
 
+    const int topHeight    = mBackground->elementSize ("top").height ();
+    const int topWidth     = mBackground->elementSize ("top").width ();
+    const int leftWidth    = mBackground->elementSize ("left").width ();
+    const int leftHeight   = mBackground->elementSize ("left").height ();
+    const int rightHeight  = mBackground->elementSize ("right").height ();
+    const int rightWidth   = mBackground->elementSize ("right").width ();
+    const int bottomHeight = mBackground->elementSize ("bottom").height ();
+    const int bottomWidth  = mBackground->elementSize ("bottom").width ();
+
+    const int topOffset    = 0;
+    const int leftOffset   = 0;
+    const int rightOffset  = contentWidth - rightWidth;
+    const int bottomOffset = contentHeight - bottomHeight;
+    const int contentTop   = topHeight;
+    const int contentLeft  = leftWidth;
+
+
     mPixmap.fill (Qt::transparent);
 
     p.setCompositionMode (QPainter::CompositionMode_Source);
     p.setRenderHint (QPainter::SmoothPixmapTransform);
 
-    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
-    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
-			contentHeight));
+    mBackground->resize (contentWidth, contentHeight);
+
+    mBackground->paint (&p, QRect (contentLeft, contentTop, contentWidth,
+			contentHeight), "center");
+    mBackground->resize ();
+
+    mBackground->paint (&p, QRect (leftOffset, topOffset,
+			leftWidth, topHeight), "topleft");
+    mBackground->paint (&p, QRect (rightOffset, topOffset,
+			rightWidth, topHeight), "topright");
+    mBackground->paint (&p, QRect (leftOffset, bottomOffset,
+			leftWidth, bottomHeight), "bottomleft");
+    mBackground->paint (&p, QRect (rightOffset, bottomOffset,
+			rightWidth, bottomHeight), "bottomright");
+
+    if (mBackground->elementExists ("hint-stretch-borders")) {
+	mBackground->paint (&p, QRect (leftOffset, contentTop,
+			    leftWidth, contentHeight), "left");
+	mBackground->paint (&p, QRect (rightOffset, contentTop,
+			    rightWidth, contentHeight), "right");
+	mBackground->paint (&p, QRect (contentLeft, topOffset,
+			    contentWidth, topHeight), "top");
+	mBackground->paint (&p, QRect (contentLeft, bottomOffset,
+			    contentWidth, bottomHeight), "bottom");
+    } else {
+	QPixmap left (leftWidth, leftHeight);
+	QPixmap right (rightWidth, rightHeight);
+	QPixmap top (topWidth, topHeight);
+	QPixmap bottom (bottomWidth, bottomHeight);
+	
+	left.fill (Qt::transparent);
+	{
+	    QPainter sidePainter (&left);
+	    sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
+	    mBackground->paint (&sidePainter, QPoint (0, 0), "left");
+	}
+	p.drawTiledPixmap (QRect (leftOffset, contentTop, leftWidth,
+			   contentHeight - topHeight - bottomHeight), left);
+
+	right.fill (Qt::transparent);
+	{
+	    QPainter sidePainter (&right);
+	    sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
+	    mBackground->paint (&sidePainter, QPoint (0, 0), "right");
+	}
+	p.drawTiledPixmap (QRect (rightOffset, contentTop, rightWidth,
+			   contentHeight - topHeight - bottomHeight), right);
+
+	top.fill (Qt::transparent);
+	{
+	    QPainter sidePainter (&top);
+	    sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
+	    mBackground->paint (&sidePainter, QPoint (0, 0), "top");
+	}
+	p.drawTiledPixmap (QRect (contentLeft, topOffset, contentWidth -
+			   rightWidth - leftWidth, topHeight), top);
+
+	bottom.fill (Qt::transparent);
+	{
+	    QPainter sidePainter (&bottom);
+	    sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
+	    mBackground->paint (&sidePainter, QPoint (0, 0), "bottom");
+	}
+	p.drawTiledPixmap (QRect (contentLeft, bottomOffset, contentWidth -
+			   rightWidth - leftWidth, bottomHeight), bottom);
+    }
+
 
     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
 				      mGeometry.width (),
@@ -147,9 +232,8 @@ KWD::Switcher::redrawPixmap ()
 void
 KWD::Switcher::update ()
 {
-    QFontMetrics fm = Plasma::Theme::defaultTheme ()->fontMetrics ();
-    QFont font (Plasma::Theme::defaultTheme ()->
-		font (Plasma::Theme::DefaultFont));
+    QFontMetrics fm = Plasma::Theme::self ()->fontMetrics ();
+    QFont font (Plasma::Theme::self ()->font ());
     QString name;
     QPainter p (&mPixmap);
 
@@ -166,13 +250,14 @@ KWD::Switcher::update ()
     }
 
     p.setCompositionMode (QPainter::CompositionMode_Source);
-
+    mBackground->resize (mPixmap.width (), mPixmap.height ());
     mBackground->paint (&p, QRect (mBorder.left, mBorder.top +
 			mGeometry.height () + 5, mGeometry.width (),
 			fm.height ()), "center");
+    mBackground->resize ();
 
     p.setFont (font);
-    p.setPen (Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor));
+    p.setBrush (QBrush (Plasma::Theme::self()->backgroundColor()));
 
     p.drawText ((mPixmap.width () - fm.width (name)) / 2,
                 mBorder.top + mGeometry.height () + 5 + fm.ascent (), name);
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/switcher.h compiz-0.7.6/kde/window-decorator-kde4/switcher.h
--- compiz-0.7.6.orign/kde/window-decorator-kde4/switcher.h	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/switcher.h	2008-06-11 16:59:47.000000000 +0200
@@ -30,7 +30,7 @@
 
 namespace Plasma
 {
-class PanelSvg;
+class Svg;
 }
 
 class QSpacerItem;
@@ -70,7 +70,7 @@ class Switcher
 
 	QRect mGeometry;
 
-	Plasma::PanelSvg *mBackground;
+	Plasma::Svg *mBackground;
 	QPixmap mPixmap;
 	QPixmap mBackgroundPixmap;
 
diff -upNr compiz-0.7.6.orign/kde/window-decorator-kde4/window.moc.cpp compiz-0.7.6/kde/window-decorator-kde4/window.moc.cpp
--- compiz-0.7.6.orign/kde/window-decorator-kde4/window.moc.cpp	2008-05-29 14:07:48.000000000 +0200
+++ compiz-0.7.6/kde/window-decorator-kde4/window.moc.cpp	2008-06-11 16:58:27.000000000 +0200
@@ -16,7 +16,6 @@
 #error "(The moc has changed too much.)"
 #endif
 
-QT_BEGIN_MOC_NAMESPACE
 static const uint qt_meta_data_KWD__Window[] = {
 
  // content:
@@ -82,4 +81,3 @@ int KWD::Window::qt_metacall(QMetaObject
     }
     return _id;
 }
-QT_END_MOC_NAMESPACE

desktop-effects-0.7.17-wall-plugin.patch:

--- NEW FILE desktop-effects-0.7.17-wall-plugin.patch ---
diff -upNr desktop-effects-0.7.17.orign/desktop-effects.c desktop-effects-0.7.17/desktop-effects.c
--- desktop-effects-0.7.17.orign/desktop-effects.c	2008-01-17 19:22:37.000000000 +0100
+++ desktop-effects-0.7.17/desktop-effects.c	2008-06-05 19:36:09.000000000 +0200
@@ -593,7 +593,7 @@ update_plugins (App     *app,
       if (strcmp (name, "cube") == 0 ||
 	  strcmp (name, "rotate") == 0 ||
 	  strcmp (name, "zoom") == 0 ||
-	  strcmp (name, "plane") == 0 ||
+	  strcmp (name, "wall") == 0 ||
 	  strcmp (name, "wobbly") == 0)
 	continue;
 
@@ -613,7 +613,7 @@ update_plugins (App     *app,
 	  new_setting = g_slist_prepend (new_setting, "zoom");
 	}
 	else
-	  new_setting = g_slist_prepend (new_setting, "plane");
+	  new_setting = g_slist_prepend (new_setting, "wall");
       }
 
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	26 Mar 2008 22:12:06 -0000	1.35
+++ .cvsignore	12 Jun 2008 06:19:24 -0000	1.36
@@ -1,3 +1,3 @@
-compiz-0.7.2.tar.bz2
 desktop-effects-0.7.17.tar.bz2
 kde-desktop-effects-0.0.5.tar.bz2
+compiz-0.7.6.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/compiz.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- compiz.spec	27 Mar 2008 19:03:27 -0000	1.119
+++ compiz.spec	12 Jun 2008 06:19:24 -0000	1.120
@@ -1,31 +1,30 @@
 %define		dialogversion	0.7.17
 %define 	kde_dialogversion 0.0.5
 
-%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom fs
+%define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs
 
 %define		gnome_plugins	annotate gconf glib svg
 
 # List of plugins passed to ./configure.  The order is important
 
-%define		plugins		core,glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,plane
+%define		plugins		core,glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall
 
 Name:           compiz
 URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
-Version:        0.7.2
-Release:        3%{?dist}
+Version:        0.7.6
+Release:        1%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # libdrm is not available on these arches
-ExcludeArch:   	s390 s390x ppc64
+ExcludeArch:   s390 s390x ppc64
 
 Requires:	xorg-x11-server-Xorg >= 1.3.0.0-19.fc8
 Requires:	mesa-libGL >= 7.0.1-2.fc8
 Requires:      system-logos
-
 Requires(post): desktop-file-utils
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
@@ -51,12 +50,17 @@
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
 
+
 # Patches that are not upstream
+Patch102: desktop-effects-0.7.17-wall-plugin.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
 #Patch110: scale-key.patch
-Patch111: gconf-core-plugin-loopfix.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
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -89,6 +93,7 @@
 Requires: metacity >= 2.18
 Requires: libwnck >= 2.15.4
 Requires: %{name} = %{version}
+Requires: compiz-fusion-gnome = %{version}
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -104,6 +109,7 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
 Requires: compiz-manager
+Requires: compiz-fusion = %{version}
 Obsoletes: beryl-kde
 
 %description kde
@@ -116,6 +122,10 @@
 %setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
 %setup -q 
 
+pushd ../desktop-effects-%{dialogversion}
+%patch102 -p1 -b .wall-plugin
+popd
+
 %patch103 -p1 -b .composite-cube-logo
 %if 0%{?fedora}
 %patch105 -p1 -b .fedora-logo
@@ -123,9 +133,8 @@
 %patch106 -p1 -b .redhat-logo
 %endif
 #%patch110 -p1 -b .scale-key
-%patch111 -p1 -b .gconf-core-loop
-
-
+%patch111 -p1 -b .decoration-size
+%patch112 -p1 -b .plasma
 %build
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,15 +147,16 @@
 
 
 %configure 					\
-	--enable-gconf 				\
+	--enable-gconf 			\
 	--enable-dbus 				\
-	--enable-place 				\
+	--enable-place 			\
 	--enable-librsvg 			\
 	--enable-gtk 				\
 	--enable-metacity 			\
 	--enable-gnome				\
 	--with-default-plugins=%{plugins}	\
 	--enable-gnome-keybindings		\
+	--disable-kde				\
 	--enable-kde4
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
@@ -154,6 +164,7 @@
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
 %configure 
+make %{?_smp_mflags}
 
 
 %install
@@ -165,7 +176,7 @@
 echo INSTALLING DESKTOP EFFECTS
 pushd ../desktop-effects-%{dialogversion}
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
-desktop-file-install --vendor redhat --delete-original      \
+desktop-file-install --vendor redhat --delete-original    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
 popd
@@ -183,8 +194,8 @@
  cp -p ../desktop-effects-%{dialogversion}/desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
 done
 
-desktop-file-install --vendor=""           \
---dir=%{buildroot}%{_datadir}/applications/kde       \
+desktop-file-install --vendor=""              \
+--dir=%{buildroot}%{_datadir}/applications/kde \
 kde-desktop-effects.desktop
 popd
 
@@ -319,6 +330,14 @@
 
 
 %changelog
+* Wed Jun 11 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.6-1
+- Update to 0.7.6
+- Only move placed windows on decoration size changes
+- Use wall instead of plane
+- Drop unneeded patches
+- Revert plasma API changes
+- Disable kde3 to fix local builds (RH #449123)
+
 * Thu Mar 27 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.2-3
 - Fix gconf plugin loop RH #438794, patch based on 
   older one from Guillaume Seguin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	26 Mar 2008 22:12:06 -0000	1.37
+++ sources	12 Jun 2008 06:19:24 -0000	1.38
@@ -1,3 +1,3 @@
 de07dcb5bfc47a0634acc1701f3b5831  desktop-effects-0.7.17.tar.bz2
-e1fe126cee3423fc20f43a9436683ec0  compiz-0.7.2.tar.bz2
 7a7766f43797239ca0a4a0881d91f646  kde-desktop-effects-0.0.5.tar.bz2
+75fe52ce6374174df6dccd4b6c13ee55  compiz-0.7.6.tar.bz2


--- gconf-core-plugin-loopfix.patch DELETED ---