.gear/rules | 2 + .../tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 | 13 + .gear/tags/list | 1 + compiz.spec | 259 +++++++++++++++++ configure.ac | 2 +- gtk/gnome/compiz-wm.desktop.in | 2 +- gtk/gnome/compiz.desktop.in | 2 +- images/Makefile.am | 6 +- images/altlinux.svg | 302 ++++++++++++++++++++ kde/window-decorator/options.cpp | 5 + kde/window-decorator/options.h | 2 +- metadata/cube.xml.in | 2 +- plugins/resize.c | 4 +- src/Makefile.am | 3 +- src/main.c | 20 ++- src/screen.c | 20 ++- 16 files changed, 633 insertions(+), 12 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..f78a96e --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-@version@:. +diff: @name@-@version@:. . diff --git a/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 b/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 new file mode 100644 index 0000000..4d0a4c1 --- /dev/null +++ b/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 @@ -0,0 +1,13 @@ +object 4514310abe0697d2d73b0fefac5bbed17c7e7c63 +type commit +tag compiz-0.8.2 +tagger Danny Baumann 1235909990 +0100 + +compiz 0.8.2 release +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkmqfWYACgkQ6+ZunlVwJYNvygCePuDGpbNT8QRTE/fsFSBhbmOr +b/gAn3wEvanLGkBrLb8RZNFehgb/hvMM +=GpYc +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..fe29f5f --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 compiz-0.8.2 diff --git a/compiz.spec b/compiz.spec new file mode 100644 index 0000000..a476b87 --- /dev/null +++ b/compiz.spec @@ -0,0 +1,259 @@ +%define gnome_plugins compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-gconf compiz-glib compiz-gnomecompat compiz-ini compiz-inotify compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-water compiz-wobbly compiz-zoom gwd + +Name: compiz +Version: 0.8.2 +Release: alt6 + +Summary: OpenGL window and compositing manager +License: MIT/X11 GPL +Group: System/X11 +Url: http://www.compiz-fusion.org/ +Packager: XOrg Maintainer Team + +Obsoletes: compiz-manager +Provides: compiz-manager = %version-%release + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: GConf gcc-c++ intltool gnome-control-center-devel kdebase-devel libGL-devel libXcomposite-devel +BuildRequires: libdbus-glib-devel libdbus-qt-devel libgnome-desktop-devel libmetacity-devel librsvg-devel +BuildRequires: libwnck-devel libxslt-devel xorg-xextproto-devel + +%description +Compiz is an OpenGL compositing manager that use GLX_EXT_texture_from_pixmap +for binding redirected top-level windows to texture objects. It has a flexible +plug-in system and it is designed to run well on most graphics hardware. + +%package gnome +Summary: Gnome Window Manager +Group: Graphical desktop/GNOME +Requires: %name = %version-%release %name-gtk = %version-%release ccsm + +%description gnome +Compiz Window Manager for Gnome + +%package gtk +Summary: Gtk Compiz window decorator +Group: Graphical desktop/GNOME +Requires: %name = %version-%release +Requires: compizconfig-backend-gconf >= 0.7.7 + +%description gtk +Compiz window decorator for Gtk + +%package kde +Summary: KDE Compiz window decorator +Group: Graphical desktop/KDE +Requires: %name = %version-%release +Requires: compizconfig-backend-kconfig >= 0.7.7 ccsm + +%description kde +Compiz window decorator for KDE + +%package devel +Summary: Development file for Compiz +Group: Development/C +Requires: %name = %version-%release + +%description devel +Development file for Compiz + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --enable-librsvg \ + --enable-gtk \ + --enable-gnome \ + --enable-metacity \ + --enable-gconf \ + --enable-gnome-keybindings \ + --enable-kde \ + --disable-kde4 \ + --disable-static + +%make_build + +%install +%make DESTDIR=%buildroot install + +mkdir -p %buildroot%_sysconfdir/X11/wmsession.d +cat > %buildroot%_sysconfdir/X11/wmsession.d/30Compiz < %buildroot%_bindir/startcompiz < 0.8.2-alt6 +- compiz-kde: autorun kde-window-decorator + +* Tue Apr 14 2009 Valery Inozemtsev 0.8.2-alt5 +- compiz-gnome: fixed double start if session preservation is included + +* Mon Apr 13 2009 Valery Inozemtsev 0.8.2-alt4 +- oops... renamed compiz.desktop to compiz-wm.desktop + +* Mon Apr 13 2009 Valery Inozemtsev 0.8.2-alt3 +- don't renamed %_desktopdir/compiz.desktop + +* Sat Apr 11 2009 Valery Inozemtsev 0.8.2-alt2 +- enabled gnome + +* Sun Mar 01 2009 Valery Inozemtsev 0.8.2-alt1 +- 0.8.2 + +* Sat Feb 21 2009 Valery Inozemtsev 0.8.0-alt1 +- 0.8.0 + +* Sat Nov 22 2008 Valery Inozemtsev 0.7.8-alt3 +- removed obsolete %%post_ldconfig/%%postun_ldconfig calls + +* Wed Oct 29 2008 Valery Inozemtsev 0.7.8-alt2 +- added altlinux logo for cube plugin + +* Wed Sep 17 2008 Valery Inozemtsev 0.7.8-alt1 +- 0.7.8 + +* Wed Sep 03 2008 Valery Inozemtsev 0.7.6-alt2 +- rebuild for Mesa-7.1 + +* Sun Jun 01 2008 Valery Inozemtsev 0.7.6-alt1 +- 0.7.6 + +* Fri Apr 04 2008 Valery Inozemtsev 0.7.4-alt1 +- 0.7.4 + +* Fri Mar 07 2008 Valery Inozemtsev 0.7.2-alt1 +- 0.7.2 + +* Fri Feb 08 2008 Valery Inozemtsev 0.7.0-alt1 +- 0.7.0 + +* Wed Jan 16 2008 Valery Inozemtsev 0.6.2-alt5.20080116 +- git snapshot 2008-01-16 (256728b9de329bcdbed6d665589082ad8f3bc7e2) + +* Tue Nov 27 2007 Valery Inozemtsev 0.6.2-alt5 +- fix for buffer overflow in strncat + +* Tue Nov 27 2007 Valery Inozemtsev 0.6.2-alt4 +- added %_sysconfdir/X11/wmsession.d/30Compiz to %name-kde + +* Wed Nov 14 2007 Valery Inozemtsev 0.6.2-alt3 +- CVE-2007-3920 + +* Sat Oct 27 2007 Valery Inozemtsev 0.6.2-alt2 +- drop compiz-0.5.2-aiglx-defaults.patch: use option "--indirect-rendering" +- rewrite tfp-server-extension patch + +* Sun Oct 21 2007 Valery Inozemtsev 0.6.2-alt1 +- 0.6.2 + +* Mon Oct 15 2007 Valery Inozemtsev 0.6.0-alt1 +- 0.6.0 + +* Tue Sep 11 2007 Valery Inozemtsev 0.5.4-alt1 +- 0.5.4 + +* Fri Aug 31 2007 Valery Inozemtsev 0.5.2-alt2 +- disable GConf +- updated build dependencies + +* Fri Aug 10 2007 Valery Inozemtsev 0.5.2-alt1 +- 0.5.2 + +* Mon Apr 09 2007 Valery Inozemtsev 0.5.0-alt1 +- 0.5.0 + +* Wed Jan 03 2007 Valery Inozemtsev 0.3.6-alt1 +- 0.3.6 + +* Wed Dec 27 2006 Valery Inozemtsev 0.3.5-alt1.git20061227 +- 0.3.5 2006-12-27 GIT snapshot + +* Tue Nov 07 2006 Valery Inozemtsev 0.3.3-alt3.git20061101 +- added compiz-0.3.3-aiglx-defaults.patch, + compiz-0.3.3-tfp-server-extension.patch + +* Tue Nov 07 2006 Valery Inozemtsev 0.3.3-alt2.git20061101 +- rename subpackage %name-gnome to %name-gtk +- new subpackage %name-kde, %name-devel + +* Mon Nov 06 2006 Valery Inozemtsev 0.3.3-alt1.git20061101 +- 0.3.3 2006-11-01 GIT snapshot + +* Sat Sep 09 2006 Valery Inozemtsev 0.0.13-alt1.git20060901 +- merged RH patches +- added ALT Linux logo for cube plugin + +* Fri Sep 08 2006 Valery Inozemtsev 0.0.13-alt0.git20060901 +- 0.0.13 git snapshot 2006-09-01 + +* Thu May 04 2006 Valery Inozemtsev 0.0.10-alt0.cvs20060503 +- 0.0.10 + +* Sun Apr 23 2006 Valery Inozemtsev 0.0.9-alt0.cvs20060420 +- CVS snapshot 2006-04-20 + +* Wed Mar 29 2006 Valery Inozemtsev 0.0.7-alt1 +- initial release + diff --git a/configure.ac b/configure.ac index 0d3cb7c..e78290a 100644 --- a/configure.ac +++ b/configure.ac @@ -517,7 +517,7 @@ if test "x$use_kde4" = "xyes"; then [use_kde4=yes], [use_kde4=no]) KDE4_CFLAGS="-I$kde4incs" - KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma" + KDE4_LIBS="-L$kde4libs/kde4link -lkdecore -lkdecorations -lplasma" QT4_MOC=`pkg-config QtGui --variable=moc_location` QDBUSXML2CPP=`pkg-config QtGui --variable=exec_prefix`"/bin/qdbusxml2cpp" diff --git a/gtk/gnome/compiz-wm.desktop.in b/gtk/gnome/compiz-wm.desktop.in index bb3967a..438e5e4 100644 --- a/gtk/gnome/compiz-wm.desktop.in +++ b/gtk/gnome/compiz-wm.desktop.in @@ -2,7 +2,7 @@ Type=Application Encoding=UTF-8 _Name=Compiz -Exec=compiz +Exec=compiz --gwd ccp # name of loadable control center module X-GNOME-WMSettingsModule=compiz # autostart phase diff --git a/gtk/gnome/compiz.desktop.in b/gtk/gnome/compiz.desktop.in index fce1407..da34d3b 100644 --- a/gtk/gnome/compiz.desktop.in +++ b/gtk/gnome/compiz.desktop.in @@ -2,7 +2,7 @@ Type=Application Encoding=UTF-8 _Name=Compiz -Exec=compiz +Exec=compiz --gwd ccp NoDisplay=true # name of loadable control center module X-GNOME-WMSettingsModule=compiz diff --git a/images/Makefile.am b/images/Makefile.am index 9f03184..3f2c36d 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -1,8 +1,10 @@ imagesdir = $(imagedir) images_DATA = \ icon.png \ - freedesktop.png + freedesktop.png \ + altlinux.svg EXTRA_DIST = \ icon.png \ - freedesktop.png + freedesktop.png \ + altlinux.svg diff --git a/images/altlinux.svg b/images/altlinux.svg new file mode 100644 index 0000000..6c4cb0b --- /dev/null +++ b/images/altlinux.svg @@ -0,0 +1,302 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kde/window-decorator/options.cpp b/kde/window-decorator/options.cpp index 46b5059..8606597 100644 --- a/kde/window-decorator/options.cpp +++ b/kde/window-decorator/options.cpp @@ -32,6 +32,11 @@ KWD::Options::Options (KConfig *config): KDecorationOptions (), mConfig (config) updateSettings (); } +KWD::Options::~Options() +{ + delete d; +} + unsigned long KWD::Options::updateSettings (void) { diff --git a/kde/window-decorator/options.h b/kde/window-decorator/options.h index 785e855..9014408 100644 --- a/kde/window-decorator/options.h +++ b/kde/window-decorator/options.h @@ -77,7 +77,7 @@ class Options : public KDecorationOptions }; Options (KConfig *config); - + ~Options(); virtual unsigned long updateSettings (void); WindowOperation operationTitlebarDblClick (void) diff --git a/metadata/cube.xml.in b/metadata/cube.xml.in index 7e9a42b..b01bb74 100644 --- a/metadata/cube.xml.in +++ b/metadata/cube.xml.in @@ -110,7 +110,7 @@ string file;image; - freedesktop + altlinux