Hello community, here is the log from the commit of package compiz checked in at Mon Aug 20 23:16:52 CEST 2007. -------- --- compiz/compiz.changes 2007-08-06 16:42:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-08-20 21:24:08.010103000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 20 20:51:41 CEST 2007 - dreveman@suse.de + +- Update to compiz 0.5.4, which include proper KDE + configuration support and fixes to a number of upstream + bugs, including #258390. +- Track changes to compiz in gnome-xgl-settings and fix issue + that caused it to crash. (#296701) +- Move gconf plugin into compiz-gnome package. + +------------------------------------------------------------------- Old: ---- compiz-0.5.2.tar.gz gnome-xgl-settings-0.9-compiz-0.5.2-update.diff New: ---- compiz-0.5.4.tar.gz compiz-default-kconfig-settings.diff gnome-xgl-settings-0.9-compiz-0.5.4-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.d27063/_old 2007-08-20 23:16:17.000000000 +0200 +++ /var/tmp/diff_new_pack.d27063/_new 2007-08-20 23:16:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package compiz (Version 0.5.2) +# spec file for package compiz (Version 0.5.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,8 +24,8 @@ PreReq: %fillup_prereq Enhances: xgl >= git_070104 Autoreqprov: on -Version: 0.5.2 -Release: 3 +Version: 0.5.4 +Release: 1 Requires: compiz-decorator = %{version} Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,15 +37,16 @@ Source4: gnome-xgl-settings-po.tar.bz2 Patch: compiz-java-config-notify.diff Patch1: compiz-default-gconf-settings.diff -Patch2: compiz-libqtpath.diff -Patch3: compiz-ldpreload-indirect.diff -Patch4: compiz-no-focus-prevention-for-windows-without-decorations.diff -Patch5: compiz-scale-mode-toggle-1.diff +Patch2: compiz-default-kconfig-settings.diff +Patch3: compiz-libqtpath.diff +Patch4: compiz-ldpreload-indirect.diff +Patch5: compiz-no-focus-prevention-for-windows-without-decorations.diff +Patch6: compiz-scale-mode-toggle-1.diff Patch30: gnome-xgl-switch-md5dir.diff Patch31: gnome-xgl-settings-246659-hwinfo.diff Patch32: gnome-xgl-settings-linguas.diff Patch33: gnome-xgl-settings-266157-driver-check.diff -Patch34: gnome-xgl-settings-0.9-compiz-0.5.2-update.diff +Patch34: gnome-xgl-settings-0.9-compiz-0.5.4-update.diff Patch60: Mesa-x86_64-fixes.diff %if "%(xft-config --prefix)" == "/usr" %define xorg_prefix %_prefix @@ -55,6 +56,7 @@ %define gnome_prefix %(pkg-config --variable=prefix gnome-desktop-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc +%define kde_prefix %(kde-config --prefix) %gconf_schemas_prereq %else @@ -134,12 +136,13 @@ cd compiz-* %patch %patch1 -%ifarch x86_64 %patch2 -%endif +%ifarch x86_64 %patch3 -%patch4 -p1 +%endif +%patch4 %patch5 -p1 +%patch6 -p1 cd - cd gnome-xgl-* %patch30 @@ -246,7 +249,32 @@ %_bindir/gnome-xgl-switch %_libdir/libdecoration.so.* %dir %_libdir/compiz -%_libdir/compiz/lib* +%_libdir/compiz/libannotate.so +%_libdir/compiz/libblur.so +%_libdir/compiz/libclone.so +%_libdir/compiz/libcube.so +%_libdir/compiz/libdbus.so +%_libdir/compiz/libdecoration.so +%_libdir/compiz/libfade.so +%_libdir/compiz/libfs.so +%_libdir/compiz/libini.so +%_libdir/compiz/libinotify.so +%_libdir/compiz/libminimize.so +%_libdir/compiz/libmove.so +%_libdir/compiz/libplace.so +%_libdir/compiz/libplane.so +%_libdir/compiz/libpng.so +%_libdir/compiz/libregex.so +%_libdir/compiz/libresize.so +%_libdir/compiz/librotate.so +%_libdir/compiz/libscale.so +%_libdir/compiz/libscreenshot.so +%_libdir/compiz/libsvg.so +%_libdir/compiz/libswitcher.so +%_libdir/compiz/libvideo.so +%_libdir/compiz/libwater.so +%_libdir/compiz/libwobbly.so +%_libdir/compiz/libzoom.so %dir %_datadir/compiz %_datadir/compiz/*.png %_datadir/compiz/*.xml @@ -258,10 +286,13 @@ %dir %_includedir/compiz %_includedir/compiz/*.h %_datadir/compiz/*.xslt +%kde_prefix/share/config.kcfg/compiz-* %files -f xgl-settings.lang gnome %defattr(-, root, root) %_bindir/gtk-window-decorator +%_libdir/compiz/libglib.so +%_libdir/compiz/libgconf.so %gnome_prefix/bin/gnome-xgl-settings %gnome_prefix/share/applications/gnome-xgl-settings.desktop %dir %gnome_prefix/share/gnome-xgl-settings @@ -283,8 +314,17 @@ %files kde %defattr(-, root, root) %_bindir/kde-window-decorator +%_libdir/compiz/libkconfig.so +%kde_prefix/share/config/compizrc %changelog +* Mon Aug 20 2007 - dreveman@suse.de +- Update to compiz 0.5.4, which include proper KDE + configuration support and fixes to a number of upstream + bugs, including #258390. +- Track changes to compiz in gnome-xgl-settings and fix issue + that caused it to crash. (#296701) +- Move gconf plugin into compiz-gnome package. * Mon Aug 06 2007 - dreveman@suse.de - Update gnome-xgl-settings so it works with compiz 0.5.2. - Fix schemas install. ++++++ compiz-0.5.2.tar.gz -> compiz-0.5.4.tar.gz ++++++ ++++ 34470 lines of diff (skipped) ++++++ compiz-default-kconfig-settings.diff ++++++ --- metadata/compizrc.old 2007-08-19 22:00:41.000000000 -0400 +++ metadata/compizrc 2007-08-19 22:11:17.000000000 -0400 @@ -1,5 +1,5 @@ [core_display] -active_plugins= +active_plugins=kconfig,png,inotify,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot texture_filter=1 click_to_focus=true autoraise=true @@ -49,7 +49,7 @@ window_menu_key=<Alt>space show_desktop_key=<Control><Alt>d raise_on_click=true -audible_bell=true +audible_bell=false toggle_window_maximized_key= toggle_window_maximized_horizontally_key= toggle_window_maximized_vertically_key= @@ -58,7 +58,7 @@ ignore_hints_when_maximized=true command_terminal= run_command_terminal_key= -ping_delay=5000 +ping_delay=7500 [core_screen0] detect_refresh_rate=true @@ -115,7 +115,7 @@ color=#feffc7ff in=false scale_image=false -images=freedesktop +images=opensuse skydome=false skydome_image= skydome_animated=false @@ -139,13 +139,13 @@ shadow_color=#000000ff shadow_x_offset=1 shadow_y_offset=1 -command= +command=kde-window-decorator mipmap=false decoration_match=any shadow_match=any [fade_screen0] -fade_speed=5.0 +fade_speed=10.0 window_match=any visual_bell=false fullscreen_visual_bell=false @@ -163,7 +163,7 @@ [move_display] initiate_button=<Alt>Button1 initiate_key=<Alt>F7 -opacity=100 +opacity=80 constrain_y=true snapoff_maximized=true lazy_positioning=true ++++++ gnome-xgl-settings-0.9-compiz-0.5.2-update.diff -> gnome-xgl-settings-0.9-compiz-0.5.4-update.diff ++++++ --- compiz/gnome-xgl-settings-0.9-compiz-0.5.2-update.diff 2007-08-05 20:47:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/gnome-xgl-settings-0.9-compiz-0.5.4-update.diff 2007-08-20 17:16:05.629793000 +0200 @@ -18,7 +18,7 @@ #define KEY_OPACITY_DECREASE "/apps/compiz/general/allscreens/options/opacity_decrease_button" #define KEY_CUBE_SIZE "/apps/compiz/general/screen0/options/hsize" --- ../gnome-xgl-settings-0.9/xgl-settings/plugins.c 2006-06-21 12:21:03.000000000 -0400 -+++ ./xgl-settings/plugins.c 2007-08-05 13:40:22.000000000 -0400 ++++ ./xgl-settings/plugins.c 2007-08-08 16:14:00.000000000 -0400 @@ -29,7 +29,7 @@ #include "gxgl-plugin-options.h" #endif @@ -28,8 +28,24 @@ static GSList *active_plugins; +@@ -173,6 +173,7 @@ + plugin_supports (const char *plugin, const char *other) + { + int i; ++ + for (i = 0; supports[i].plugin; i++) { + if (!strcmp (supports[i].plugin, plugin) && + !strcmp (supports[i].other, other)) +@@ -185,6 +186,7 @@ + plugin_requires (const char *plugin, const char *other) + { + int i; ++ + for (i = 0; requires[i].plugin; i++) { + if (!strcmp (requires[i].plugin, plugin) && + !strcmp (requires[i].other, other)) --- ../gnome-xgl-settings-0.9/xgl-settings/settings.c 2007-02-01 12:43:01.000000000 -0500 -+++ ./xgl-settings/settings.c 2007-08-05 14:33:16.000000000 -0400 ++++ ./xgl-settings/settings.c 2007-08-20 11:03:14.000000000 -0400 @@ -89,28 +89,9 @@ } @@ -80,7 +96,7 @@ { GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_windows"); gboolean active = gtk_toggle_button_get_active (toggle); -@@ -207,10 +188,10 @@ +@@ -207,27 +188,26 @@ plugins_activate ("wobbly", NULL); gconf_client_set_string (gconf, KEY_WOBBLY_MAP_EFFECT, "Shiver", NULL); set_window_types (KEY_WOBBLY_MAP_WINDOW_TYPES, @@ -94,7 +110,14 @@ } static void -@@ -223,11 +204,10 @@ +-key_wobbly_map_effect_changed (const char *effect) ++key_wobbly_map_effect_changed (int effect) + { + GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_map"); + gboolean active = gtk_toggle_button_get_active (toggle); + +- if (!strcmp (effect, "None")) { ++ if (!effect) { if (active) gtk_toggle_button_set_active (toggle, FALSE); } else if (!active) { @@ -118,18 +141,22 @@ { GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_map"); gboolean active = gtk_toggle_button_get_active (toggle); -@@ -244,8 +224,8 @@ +@@ -244,12 +224,11 @@ if (active) gtk_toggle_button_set_active (toggle, FALSE); } else if (!active) { - char *map_effect = gconf_client_get_string (gconf, KEY_WOBBLY_MAP_EFFECT, NULL); - if (map_effect && !strcmp (map_effect, "Shiver")) { -+ gchar *map_effect = gconf_client_get_string (gconf, KEY_WOBBLY_MAP_EFFECT, NULL); -+ if (!strcmp (map_effect, "Shiver")) { ++ int map_effect = gconf_client_get_int (gconf, KEY_WOBBLY_MAP_EFFECT, NULL); ++ if (map_effect) { gtk_toggle_button_set_active (toggle, active); plugins_activate ("wobbly", NULL); } -@@ -261,29 +241,28 @@ +- g_free (map_effect); + } + } + +@@ -261,29 +240,28 @@ if (active) { plugins_activate ("wobbly", NULL); @@ -168,7 +195,7 @@ gtk_toggle_button_set_active (toggle, TRUE); plugins_activate ("wobbly", NULL); } -@@ -291,7 +270,7 @@ +@@ -291,7 +269,7 @@ } static void @@ -177,7 +204,7 @@ { GtkToggleButton *toggle = GXGL_WIDGET ("wobbly_focus"); gboolean active = gtk_toggle_button_get_active (toggle); -@@ -300,12 +279,11 @@ +@@ -300,12 +278,11 @@ if (active) gtk_toggle_button_set_active (toggle, FALSE); } else if (!active) { @@ -192,7 +219,45 @@ } } #endif -@@ -1192,7 +1170,7 @@ +@@ -830,23 +807,21 @@ + void + scale_corner_changed (GtkComboBox *combo, gpointer user_data) + { +- GSList *types; ++ gchar *types; + + if (gtk_toggle_button_get_active (GXGL_WIDGET ("scale_enable_corner"))) { +- types = g_slist_prepend (NULL, corner_values[gtk_combo_box_get_active (combo)]); +- gconf_client_set_list (gconf, KEY_SCALE_CORNERS, GCONF_VALUE_STRING, types, NULL); +- g_slist_free (types); ++ types = corner_values[gtk_combo_box_get_active (combo)]; ++ gconf_client_set_string (gconf, KEY_SCALE_CORNERS, types, NULL); + } + } + + static void +-key_scale_corners_changed (GSList *corners) ++key_scale_corners_changed (const gchar *corner) + { + GtkToggleButton *toggle = GXGL_WIDGET ("scale_enable_corner"); + gboolean active = gtk_toggle_button_get_active (toggle); + +- if (corners != NULL) { +- const char *corner = gconf_value_get_string (corners->data); ++ if (corner != NULL) { + GtkComboBox *combo = GXGL_WIDGET ("scale_corner"); + int i; + +@@ -877,7 +852,7 @@ + plugins_activate ("scale", NULL); + scale_corner_changed (GXGL_WIDGET ("scale_corner"), user_data); + } else +- gconf_client_set_list (gconf, KEY_SCALE_CORNERS, GCONF_VALUE_STRING, NULL, NULL); ++ gconf_client_set_string (gconf, KEY_SCALE_CORNERS, "", NULL); + } + + static void +@@ -1192,20 +1167,20 @@ if (!strcmp (entry->key, KEY_ACTIVE_PLUGINS)) key_active_plugins_changed (gconf_value_get_list (entry->value)); else if (!strcmp (entry->key, KEY_WOBBLY_MOVE_WINDOW_TYPES)) @@ -201,9 +266,10 @@ else if (!strcmp (entry->key, KEY_WOBBLY_SNAP)) key_wobbly_snap_changed (gconf_value_get_string (entry->value)); else if (!strcmp (entry->key, KEY_MOVE_OPACITY)) -@@ -1200,12 +1178,12 @@ + key_move_opacity_changed (gconf_value_get_int (entry->value)); else if (!strcmp (entry->key, KEY_WOBBLY_MAP_EFFECT)) - key_wobbly_map_effect_changed (gconf_value_get_string (entry->value)); +- key_wobbly_map_effect_changed (gconf_value_get_string (entry->value)); ++ key_wobbly_map_effect_changed (gconf_value_get_int (entry->value)); else if (!strcmp (entry->key, KEY_WOBBLY_MAP_WINDOW_TYPES)) - key_wobbly_map_window_types_changed (gconf_value_get_list (entry->value)); + key_wobbly_map_window_types_changed (gconf_value_get_string (entry->value)); @@ -217,3 +283,12 @@ #endif else if (!strcmp (entry->key, KEY_OPACITY_INCREASE)) key_opacity_changed (gconf_value_get_string (entry->value)); +@@ -1226,7 +1201,7 @@ + else if (!strcmp (entry->key, KEY_SCALE_INITIATE)) + key_scale_initiate_changed (gconf_value_get_string (entry->value)); + else if (!strcmp (entry->key, KEY_SCALE_CORNERS)) +- key_scale_corners_changed (gconf_value_get_list (entry->value)); ++ key_scale_corners_changed (gconf_value_get_string (entry->value)); + else if (!strcmp (entry->key, KEY_ZOOM_INITIATE)) + key_zoom_initiate_changed (gconf_value_get_string (entry->value)); + else if (!strcmp (entry->key, KEY_ZOOM_IN)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org