Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Thu Jun 3 14:40:47 CEST 2010. -------- --- compiz-manager/compiz-manager.changes 2010-05-26 12:06:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2010-06-02 21:49:58.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 2 18:43:07 UTC 2010 - dimstar@opensuse.org + +- Add compiz-manager-sm-client-id patch to avoid a 10 second + timeout of gnome-session waiting for the window manager to + register with the session. +- Default config: enable as_fglrx_xgl_fix workaround. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- compiz-manager-sm-client-id.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.T3C4zq/_old 2010-06-03 14:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.T3C4zq/_new 2010-06-03 14:40:39.000000000 +0200 @@ -19,7 +19,7 @@ Name: compiz-manager Version: 0.6.0 -Release: 6 +Release: 7 License: GPLv2+ Summary: A wrapper script to launch Compiz with proper options Url: http://opencompositing.org @@ -41,6 +41,8 @@ Patch10: compiz-manager-fallback_xterm.patch # PATCH-FIX-UPSTREAM compiz-manager-bnc564536.patch bnc#564536 dimstar@opensuse.org -- Account for lib64 and double slashes in paths. Patch11: compiz-manager-bnc564536.patch +# PATCH-FIX-UPSTREAM compiz-manager-sm-client-id.patch dimstar@opensuse.org -- Properly register compiz with gnome-session, avoiding a 10 second timeout. Patch taken from upstream git, commit 223180bf +Patch12: compiz-manager-sm-client-id.patch PreReq: %fillup_prereq Requires: compiz Requires: util-linux @@ -63,6 +65,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p0 +%patch12 -p1 %build ++++++ compiz-manager-sm-client-id.patch ++++++
From 223180bf74e057e353d83f82219ab201e34627f3 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol <kristian@linpro.no> Date: Thu, 20 Nov 2008 08:40:42 +0000 Subject: Set sm-client-id to DESKTOP_AUTOSTART_ID when present.
--- diff --git a/compiz-manager b/compiz-manager index 22c6787..91605c0 100755 --- a/compiz-manager +++ b/compiz-manager @@ -318,6 +318,9 @@ build_args() if [ "x$INDIRECT" = "xyes" ]; then COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering " fi + if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then + COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID" + fi if check_nvidia; then if [ "x$INDIRECT" != "xyes" ]; then COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding" @@ -384,6 +387,7 @@ build_args if [ "x$CM_DRY" = "xyes" ]; then verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n" + verbose "Execute: ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n" exit 0; fi # start the gtk-window-decorator if present -- cgit v0.8.3.1-30-gff3a ++++++ config.skel ++++++ --- /var/tmp/diff_new_pack.T3C4zq/_old 2010-06-03 14:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.T3C4zq/_new 2010-06-03 14:40:39.000000000 +0200 @@ -7,6 +7,7 @@ as_firefox_menu_fix = true as_legacy_fullscreen = true as_convert_urgency = true +as_fglrx_xgl_fix = true [shift] as_terminate_button = Disabled ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org