Hello community,
here is the log from the commit of package compiz
checked in at Fri Oct 13 20:08:23 CEST 2006.
--------
--- compiz/compiz.changes 2006-10-12 20:57:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2006-10-13 17:09:07.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 13 17:04:45 CEST 2006 - dreveman@suse.de
+
+- Update to version 0.2 of compiz. New plugins: dbus, screenshot
+and plane. Metacity theme support.
+
+-------------------------------------------------------------------
Old:
----
184483-2.diff
compiz-0.0.13.tar.bz2
compiz-audible-bell-off.patch
compiz-mwm-func.diff
compiz-update-attrib-fix.diff
compiz-wobbly-off.patch
new-scale-algo.diff
New:
----
compiz-0.2.0.tar.bz2
compiz-decorator-command.diff
compiz-default-gconf-settings.patch
gnome-xgl-settings-compiz-0.2-update.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.0mOOLR/_old 2006-10-13 20:03:17.000000000 +0200
+++ /var/tmp/diff_new_pack.0mOOLR/_new 2006-10-13 20:03:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version cvs_060621)
+# spec file for package compiz (Version 0.2.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,34 +10,31 @@
Name: compiz
-BuildRequires: control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool libdrm-devel libsvg-cairo-devel libwnck-devel pango-devel update-desktop-files xorg-x11-compat70-devel xorg-x11-devel
+BuildRequires: control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool libdrm-devel librsvg-devel libwnck-devel metacity pango-devel update-desktop-files xorg-x11-compat70-devel xorg-x11-devel
Url: http://www.freedesktop.org/Software/compiz
License: X11/MIT, GPL
Group: System/GUI/Other
PreReq: %fillup_prereq
-Requires: libpng libdrm gconf2 gtk2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526 3ddiag
+Requires: libpng libdrm gconf2 gtk2 librsvg libwnck metacity >= 2.15.1 xgl-hardware-list >= 060526 3ddiag
Autoreqprov: on
-Version: cvs_060621
-Release: 15
+Version: 0.2.0
+Release: 1
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
### /bin/ls *.tar.{gz,bz2} 2>/dev/null|perl -ne 'print "Source$n: ".$_; $n++;'
Source: Mesa-CVS-20060502.tar.bz2
-Source1: compiz-0.0.13.tar.bz2
+Source1: compiz-0.2.0.tar.bz2
Source2: gnome-xgl-settings-0.7.tar.gz
### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;'
Patch: Mesa-6.4.1-x86_64-fixes-1.patch
Patch1: Mesa-configs.diff
-Patch2: compiz-audible-bell-off.patch
-Patch3: compiz-wobbly-off.patch
-Patch4: java-config-notify.diff
-Patch5: 184483-2.diff
-Patch6: compiz-broken-Mesa-decl.patch
-Patch7: compiz-mwm-func.diff
-Patch8: new-scale-algo.diff
-Patch9: compiz-update-attrib-fix.diff
-Patch10: gnome-xgl-settings-glade.patch
+Patch2: java-config-notify.diff
+Patch3: compiz-default-gconf-settings.patch
+Patch4: compiz-broken-Mesa-decl.patch
+Patch5: compiz-decorator-command.diff
+Patch6: gnome-xgl-settings-glade.patch
+Patch7: gnome-xgl-settings-compiz-0.2-update.diff
%description
Compiz is an OpenGL compositing manager that use
@@ -74,15 +71,12 @@
%setup -q -n . -D -T -b 0 -b 1 -b 2
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff
-patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch
-patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch
-patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff
-patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/184483-2.diff
-patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-broken-Mesa-decl.patch
-patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-mwm-func.diff
-patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/new-scale-algo.diff
-patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-update-attrib-fix.diff
+patch -d compiz-0.2.0 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff
+patch -d compiz-0.2.0 -p1 < $RPM_SOURCE_DIR/compiz-broken-Mesa-decl.patch
+patch -d compiz-0.2.0 -p0 < $RPM_SOURCE_DIR/compiz-default-gconf-settings.patch
+patch -d compiz-0.2.0 -p1 < $RPM_SOURCE_DIR/compiz-decorator-command.diff
patch -d gnome-xgl-* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-glade.patch
+patch -d gnome-xgl-* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-compiz-0.2-update.diff
%build
PREFIX=/usr
@@ -146,7 +140,7 @@
%files
%defattr(-, root, root)
/usr/bin/compiz
-/usr/bin/gnome-window-decorator
+/usr/bin/gtk-window-decorator
/opt/gnome/bin/gnome-xgl-info
/opt/gnome/bin/gnome-xgl-switch
%dir /usr/%_lib/compiz
@@ -172,6 +166,9 @@
/opt/gnome/share/gnome/wm-properties/compiz.desktop
%changelog -n compiz
+* Fri Oct 13 2006 - dreveman@suse.de
+- Update to version 0.2 of compiz. New plugins: dbus, screenshot
+ and plane. Metacity theme support.
* Thu Oct 12 2006 - danw@suse.de
- Quick fix to make gnome-xgl-settings work again with the latest
libglade.
++++++ compiz-0.0.13.tar.bz2 -> compiz-0.2.0.tar.bz2 ++++++
++++ 121999 lines of diff (skipped)
++++++ compiz-decorator-command.diff ++++++
diff --git a/plugins/decoration.c b/plugins/decoration.c
index 0fa4571..1b7ca29 100644
--- a/plugins/decoration.c
+++ b/plugins/decoration.c
@@ -27,6 +27,7 @@ #include
#include
#include
#include
+#include
#include
#include
@@ -127,7 +128,8 @@ #define DECOR_DISPLAY_OPTION_SHADOW_RADI
#define DECOR_DISPLAY_OPTION_SHADOW_OPACITY 1
#define DECOR_DISPLAY_OPTION_SHADOW_OFFSET_X 2
#define DECOR_DISPLAY_OPTION_SHADOW_OFFSET_Y 3
-#define DECOR_DISPLAY_OPTION_NUM 4
+#define DECOR_DISPLAY_OPTION_COMMAND 4
+#define DECOR_DISPLAY_OPTION_NUM 5
static int displayPrivateIndex;
@@ -217,6 +219,29 @@ decorSetDisplayOption (CompDisplay *
case DECOR_DISPLAY_OPTION_SHADOW_OFFSET_Y:
if (compSetIntOption (o, value))
return TRUE;
+ break;
+ case DECOR_DISPLAY_OPTION_COMMAND:
+ if (compSetStringOption (o, value))
+ {
+ if (display->screens && *o->value.s != '\0')
+ {
+ DECOR_SCREEN (display->screens);
+
+ /* run decorator command if no decorator is present on
+ first screen */
+ if (!ds->dmWin)
+ {
+ if (fork () == 0)
+ {
+ putenv (display->displayString);
+ execl ("/bin/sh", "/bin/sh", "-c", o->value.s, NULL);
+ exit (0);
+ }
+ }
+ }
+
+ return TRUE;
+ }
default:
break;
}
@@ -266,6 +291,16 @@ decorDisplayInitOptions (DecorDisplay *d
o->value.i = DECOR_SHADOW_OFFSET_DEFAULT;
o->rest.i.min = DECOR_SHADOW_OFFSET_MIN;
o->rest.i.max = DECOR_SHADOW_OFFSET_MAX;
+
+ o = &dd->opt[DECOR_DISPLAY_OPTION_COMMAND];
+ o->name = "command";
+ o->shortDesc = N_("Command");
+ o->longDesc = N_("Decorator command line that is executed if no "
+ "decorator is already running");
+ o->type = CompOptionTypeString;
+ o->value.s = strdup ("/usr/bin/gtk-window-decorator");
+ o->rest.s.string = NULL;
+ o->rest.s.nString = 0;
}
static Bool
++++++ compiz-default-gconf-settings.patch ++++++
diff -ur ../compiz-0.2.0.old/plugins/compiz.schemas.in ./plugins/compiz.schemas.in
--- ../compiz-0.2.0.old/plugins/compiz.schemas.in 2006-10-13 16:22:53.000000000 +0200
+++ ./plugins/compiz.schemas.in 2006-10-13 16:24:01.000000000 +0200
@@ -13,7 +13,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[gconf,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot]</default>
+ <default>[gconf,decoration,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot]</default>
<locale name="C">
<short>Active Plugins</short>
<long>List of currently active plugins</long>
@@ -8209,7 +8209,7 @@
<applyto>/apps/compiz/general/allscreens/options/audible_bell</applyto>
<owner>compiz</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Audible Bell</short>
<long>Audible system beep</long>
++++++ gnome-xgl-settings-compiz-0.2-update.diff ++++++
diff -ur ./xgl-settings/gnome-xgl-settings.h ../gnome-xgl-settings-0.7-update/xgl-settings/gnome-xgl-settings.h
--- ./xgl-settings/gnome-xgl-settings.h 2006-09-15 13:57:51.000000000 -0400
+++ ../gnome-xgl-settings-0.7-update/xgl-settings/gnome-xgl-settings.h 2006-10-12 18:12:11.000000000 -0400
@@ -85,7 +85,7 @@
/* GConf keys */
#define KEY_ACTIVE_PLUGINS "/apps/compiz/general/allscreens/options/active_plugins"
#define KEY_WOBBLY_MOVE_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/move_window_types"
-#define KEY_WOBBLY_SNAP "/apps/compiz/plugins/wobbly/screen0/options/snap"
+#define KEY_WOBBLY_SNAP "/apps/compiz/plugins/wobbly/allscreens/options/snap_key"
#define KEY_MOVE_OPACITY "/apps/compiz/plugins/move/screen0/options/opacity"
#define KEY_WOBBLY_MAP_EFFECT "/apps/compiz/plugins/wobbly/screen0/options/map_effect"
#define KEY_WOBBLY_MAP_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/map_window_types"
@@ -93,20 +93,19 @@
#define KEY_WOBBLY_FOCUS_WINDOW_TYPES "/apps/compiz/plugins/wobbly/screen0/options/focus_window_types"
#define KEY_OPACITY_INCREASE "/apps/compiz/general/allscreens/options/opacity_increase"
#define KEY_OPACITY_DECREASE "/apps/compiz/general/allscreens/options/opacity_decrease"
-#define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/size"
-#define KEY_CUBE_DRAG "/apps/compiz/plugins/rotate/screen0/options/initiate"
+#define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/hsize"
+#define KEY_CUBE_DRAG "/apps/compiz/plugins/rotate/allscreens/options/initiate_button"
#define KEY_ROTATE_EDGE_FLIP_POINTER "/apps/compiz/plugins/rotate/screen0/options/edge_flip_pointer"
#define KEY_ROTATE_EDGE_FLIP_MOVE "/apps/compiz/plugins/rotate/screen0/options/edge_flip_move"
#define KEY_ROTATE_EDGE_FLIP_DND "/apps/compiz/plugins/rotate/screen0/options/edge_flip_dnd"
#define KEY_ROTATE_FLIP_TIME "/apps/compiz/plugins/rotate/screen0/options/flip_time"
-#define KEY_SCALE_INITIATE "/apps/compiz/plugins/scale/screen0/options/initiate"
-#define KEY_SCALE_TERMINATE "/apps/compiz/plugins/scale/screen0/options/terminate"
-#define KEY_SCALE_CORNERS "/apps/compiz/plugins/scale/screen0/options/corners"
-#define KEY_ZOOM_INITIATE "/apps/compiz/plugins/zoom/screen0/options/initiate"
-#define KEY_ZOOM_IN "/apps/compiz/plugins/zoom/screen0/options/zoom_in"
-#define KEY_ZOOM_OUT "/apps/compiz/plugins/zoom/screen0/options/zoom_out"
-#define KEY_WATER_INITIATE "/apps/compiz/plugins/water/screen0/options/initiate"
-#define KEY_RAIN_TOGGLE "/apps/compiz/plugins/water/screen0/options/toggle_rain"
-#define KEY_RAIN_DELAY "/apps/compiz/plugins/water/screen0/options/rain_delay"
+#define KEY_SCALE_INITIATE "/apps/compiz/plugins/scale/allscreens/options/initiate_key"
+#define KEY_SCALE_CORNERS "/apps/compiz/plugins/scale/allscreens/options/initiate_edge"
+#define KEY_ZOOM_INITIATE "/apps/compiz/plugins/zoom/allscreens/options/initiate_button"
+#define KEY_ZOOM_IN "/apps/compiz/plugins/zoom/allscreens/options/zoom_in_button"
+#define KEY_ZOOM_OUT "/apps/compiz/plugins/zoom/allscreens/options/zoom_out_button"
+#define KEY_WATER_INITIATE "/apps/compiz/plugins/water/allscreens/options/initiate_button"
+#define KEY_RAIN_TOGGLE "/apps/compiz/plugins/water/allscreens/options/toggle_rain_key"
+#define KEY_RAIN_DELAY "/apps/compiz/plugins/water/allscreens/options/rain_delay"
#endif /* __GNOME_XGL_SETTINGS_H__ */
diff -ur ./xgl-settings/settings.c ../gnome-xgl-settings-0.7-update/xgl-settings/settings.c
--- ./xgl-settings/settings.c 2006-06-21 12:21:03.000000000 -0400
+++ ../gnome-xgl-settings-0.7-update/xgl-settings/settings.c 2006-10-12 18:09:28.000000000 -0400
@@ -812,7 +812,6 @@
{
plugins_activate ("scale", NULL);
gconf_client_set_string (gconf, KEY_SCALE_INITIATE, binding, NULL);
- gconf_client_set_string (gconf, KEY_SCALE_TERMINATE, binding, NULL);
}
static void
++++++ java-config-notify.diff ++++++
--- /var/tmp/diff_new_pack.0mOOLR/_old 2006-10-13 20:03:20.000000000 +0200
+++ /var/tmp/diff_new_pack.0mOOLR/_new 2006-10-13 20:03:20.000000000 +0200
@@ -1,22 +1,22 @@
--- src/window.c 9 Jun 2006 00:04:26 -0000 1.59
+++ src/window.c 9 Jun 2006 00:05:42 -0000
-@@ -2221,6 +2221,9 @@
- XMoveWindow (w->screen->display->display, w->frame,
- w->attrib.x - w->input.left,
- w->attrib.y - w->input.top);
+@@ -2301,6 +2301,9 @@
+ XMoveWindow (w->screen->display->display, w->frame,
+ w->attrib.x - w->input.left,
+ w->attrib.y - w->input.top);
+
-+ if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0)
-+ sendConfigureNotify (w);
- }
++ if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0)
++ sendConfigureNotify (w);
}
-@@ -3100,6 +3103,9 @@
+ void
+@@ -3189,6 +3192,9 @@
sendSyncRequest (w);
XConfigureWindow (w->screen->display->display, w->id, xwcm, xwc);
+
+ if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0)
+ sendConfigureNotify (w);
- }
- void
+ if (placed)
+ w->placed = TRUE;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org