Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Wed Nov 25 16:16:40 CET 2009. -------- --- compiz-manager/compiz-manager.changes 2009-11-22 19:01:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2009-11-23 18:11:27.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 23 18:09:37 CET 2009 - dimstar@opensuse.org + +- Add compiz-manager-fallback_xterm.patch - Have a last fallback to + xterm in case nothing else goes +- Add compiz-manager-dry_run.patch - Re-introduce CM_DRY variable; + both patches from upstream git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- compiz-manager-dry_run.patch compiz-manager-fallback_xterm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.fqQ0LH/_old 2009-11-25 16:15:58.000000000 +0100 +++ /var/tmp/diff_new_pack.fqQ0LH/_new 2009-11-25 16:15:58.000000000 +0100 @@ -19,7 +19,7 @@ Name: compiz-manager Version: 0.6.0 -Release: 1 +Release: 2 License: GPL v2 or later Summary: A wrapper script to launch Compiz with proper options Url: http://opencompositing.org @@ -34,6 +34,10 @@ Patch7: bug-469785-disable-loose-binding.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch8: compiz-manager-avoid-sw-rast-bug-479060.diff +# PATCH-FIX-UPSTREAM compiz-manager-dry_run.patch -- Add dry_run capabilities, taken from upstream git +Patch9: compiz-manager-dry_run.patch +# PATCH-FIX-UPSTREAM compiz-manager-fallback_xterm.patch -- Have one last fallback to xterm if nothing else works, taken from upstream git +Patch10: compiz-manager-fallback_xterm.patch PreReq: %fillup_prereq Requires: compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +56,8 @@ %patch6 -p0 %patch7 -p1 %patch8 -p0 +%patch9 -p1 +%patch10 -p1 %build ++++++ compiz-manager-dry_run.patch ++++++
From 4e04f52ff5616a331f726cd46bca0bac9205b46e Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol <kristian@bohemians.org> Date: Tue, 30 Oct 2007 16:14:24 +0000 Subject: Add DRY_RUN capability
Uses an environmental variable to avoid dealing with pushing and popping arguments to compiz. --- diff --git a/compiz-manager b/compiz-manager index f19c969..81bcdd3 100755 --- a/compiz-manager +++ b/compiz-manager @@ -92,6 +92,11 @@ abort_with_fallback_wm() verbose "SKIP_CHECKS is yes, so continuing despite problems.\n" return 0; fi + + if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run failed: Problems detected with 3D support.'n" + exit 1; + fi verbose "aborting and using fallback: $FALLBACKWM \n" @@ -369,6 +374,10 @@ fi build_env build_args +if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n" + exit 0; +fi # start the gtk-window-decorator if present if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then verbose "Starting emerald\n" -- cgit v0.8.2 ++++++ compiz-manager-fallback_xterm.patch ++++++
From 166b83e385e75eff50697c8d0fd24c27848f5ac0 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol <kristian@linpro.no> Date: Thu, 16 Oct 2008 17:40:58 +0000 Subject: Allow for detection of fallback wm. Use xterm if no DE is detected.
Original patch by cyberorg? --- Index: compiz-manager-0.6.0/compiz-manager =================================================================== --- compiz-manager-0.6.0.orig/compiz-manager +++ compiz-manager-0.6.0/compiz-manager @@ -39,6 +39,7 @@ PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" GLXINFO=$(which glxinfo) KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" +XFWM="/usr/bin/xfwm" COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) # For Xgl LD_PRELOAD @@ -53,8 +54,15 @@ NVIDIA_SETTINGS="nvidia-settings" # Assu # For detecting what driver is in use, the + is for one or more /'s XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+" +FALLBACKWM="xterm" +if [ x"$KDE_FULL_SESSION" = x"true" ]; then + FALLBACKWM="${KWIN}"; +elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then + FALLBACKWM="${METACITY}" +elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then + FALLBACKWM="${XFWM}" +fi -FALLBACKWM="${METACITY}" FALLBACKWM_OPTIONS="--replace $@" # Driver whitelist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org