Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at 2015-11-26 17:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz-manager (Old) and /work/SRC/openSUSE:Factory/.compiz-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "compiz-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz-manager/compiz-manager.changes 2015-11-12 19:40:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.compiz-manager.new/compiz-manager.changes 2015-11-26 17:03:55.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 20 08:32:20 UTC 2015 - sor.alexei@meowr.ru + +- Fix config.skel: was configured for Compiz 0.9.x. +- Remove Compiz 0.9.x plugins from compiz-manager-setup.patch. +- Enhance compiz-manager-detect-multiple-graphic-cards.patch: + original regular expressions are faulty. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.QCsUXc/_old 2015-11-26 17:03:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QCsUXc/_new 2015-11-26 17:03:56.000000000 +0100 @@ -26,7 +26,7 @@ Source: %{name}-%{version}.tar.bz2 Source2: Compiz.desktop Source3: config.skel -# PATCH-FEATURE-OPENSUSE compiz-manager-setup.patch dimstar@opensuse.org -- Configure compiz-manager to fit the openSUSE ecosystem. +# PATCH-FEATURE-OPENSUSE compiz-manager-setup.patch dimstar@opensuse.org -- Configure compiz-manager to fit the openSUSE. Patch0: compiz-manager-setup.patch # PATCH-FIX-UPSTREAM compiz-manager-detect-multiple-graphic-cards.patch boo#440273 rodrigo@novell.com -- Detect more than 1 graphic card. Patch1: compiz-manager-detect-multiple-graphic-cards.patch @@ -42,7 +42,7 @@ Patch6: compiz-manager-sbin-lspci.patch # PATCH-FIX-UPSTREAM compiz-manager-sm-client-id.patch dimstar@opensuse.org -- Properly register compiz with gnome-session, avoiding a 10 second timeout. Patch7: compiz-manager-sm-client-id.patch -# PATCH-FEATURE-OPENSUSE compiz-manager-nouveau.patch dimstar@opensuse.org -- Nouveau is sufficient to handle Compiz. +# PATCH-FEATURE-OPENSUSE compiz-manager-nouveau.patch dimstar@opensuse.org -- Nouveau can be sufficient to handle Compiz. Patch8: compiz-manager-nouveau.patch BuildRequires: update-desktop-files Requires: compiz < 0.9 @@ -56,7 +56,7 @@ %prep %setup -q %patch0 -p1 -%patch1 +%patch1 -p1 %patch2 -p1 %patch3 %patch4 -p1 ++++++ compiz-manager-detect-multiple-graphic-cards.patch ++++++ --- /var/tmp/diff_new_pack.QCsUXc/_old 2015-11-26 17:03:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QCsUXc/_new 2015-11-26 17:03:56.000000000 +0100 @@ -1,24 +1,28 @@ -Index: compiz-manager -=================================================================== ---- compiz-manager.orig -+++ compiz-manager -@@ -237,13 +237,15 @@ check_texture_size() +--- a/compiz-manager ++++ b/compiz-manager +@@ -240,15 +240,17 @@ check_nvidia() + # Check if the max texture size is large enough compared to the resolution + check_texture_size() { - TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') - RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') +- TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') +- RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') - VRES=$(echo $RESOLUTION | sed 's/.*x//') - HRES=$(echo $RESOLUTION | sed 's/x.*//') - verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): "; - if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then -+ for res in $RESOLUTION; do -+ VRES=$(echo $res | sed 's/.*x//') -+ HRES=$(echo $res | sed 's/x.*//') -+ verbose "Comparing resolution ($res) to maximum 3D texture size ($TEXTURE_LIMIT): "; -+ if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then - verbose "Failed.\n" - return 1; +- verbose "Failed.\n" +- return 1; - fi -+ fi ++ TEXTURE_LIMIT=$(glxinfo -l | sed -re '/GL_MAX_TEXTURE_SIZE/!d;s/^.*[ \t]([[:digit:]]+)$/\1/;q') ++ RESOLUTION=$(xdpyinfo | sed -re '/dimensions:/!d;s/^.*[ \t]([[:digit:]x]+) pixels.*$/\1/') ++ for res in $RESOLUTION; do ++ HRES=$(echo "$RESOLUTION" | sed -re 's/^(.*)x.*$/\1/') ++ VRES=$(echo "$RESOLUTION" | sed -re 's/^.*x(.*)$/\1/') ++ verbose "Comparing resolution ($res) to maximum 3D texture size ($TEXTURE_LIMIT): "; ++ if [ "$VRES" -gt "$TEXTURE_LIMIT" ] || [ "$HRES" -gt "$TEXTURE_LIMIT" ]; then ++ verbose "Failed.\n" ++ return 1; ++ fi + done verbose "Passed.\n" return 0 ++++++ compiz-manager-fallback_xterm.patch ++++++ --- /var/tmp/diff_new_pack.QCsUXc/_old 2015-11-26 17:03:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QCsUXc/_new 2015-11-26 17:03:56.000000000 +0100 @@ -10,7 +10,7 @@ --- compiz-manager-0.6.0.orig/compiz-manager +++ compiz-manager-0.6.0/compiz-manager @@ -40,6 +40,8 @@ PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" - GLXINFO=$(which glxinfo) + GLXINFO="$(which glxinfo)" KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" +MARCO="/usr/bin/marco" ++++++ compiz-manager-setup.patch ++++++ --- /var/tmp/diff_new_pack.QCsUXc/_old 2015-11-26 17:03:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QCsUXc/_new 2015-11-26 17:03:56.000000000 +0100 @@ -11,14 +11,14 @@ + LIB=lib +fi + -+PREFIX=$(dirname $(dirname $(which compiz))) ++PREFIX="$(dirname "$(dirname "$(which compiz)")")" -COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz -PLUGIN_PATH="/usr/local/lib/compiz/" -GLXINFO="/usr/bin/glxinfo" -+COMPIZ_BIN_PATH="${PREFIX}/bin/" # For window decorators and compiz ++COMPIZ_BIN_PATH="${PREFIX}/bin/" # For window decorators and compiz. +PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" -+GLXINFO=$(which glxinfo) ++GLXINFO="$(which glxinfo)" KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) @@ -37,7 +37,7 @@ COMPIZ_OPTIONS="--ignore-desktop-hints --replace" -COMPIZ_PLUGINS="" +# Those are bare minimum plugins. anything else might want to be enabled / disabled by users. -+COMPIZ_PLUGINS="core composite opengl decoration move resize" ++COMPIZ_PLUGINS="core ccp decoration move resize" ENV="" +#If the user does not yet have a populated Default.ini, we'll drop a default in his config folder ++++++ config.skel ++++++ --- /var/tmp/diff_new_pack.QCsUXc/_old 2015-11-26 17:03:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QCsUXc/_new 2015-11-26 17:03:56.000000000 +0100 @@ -1,26 +1,23 @@ [core] -s0_active_plugins = core;composite;opengl;imgjpeg;compiztoolbox;decor;place;glib;regex;gnomecompat;wobbly;resize;imgpng;shift;mousepoll;move;screenshot;thumbnail;animation;cube;workarounds;rotate; -s0_audible_bell = false +s0_active_plugins = core;matecompat;minimize;place;png;regex;resize;session;shift;workarounds;decoration;wall;snap;fade;move; [workarounds] -s0_firefox_menu_fix = true -s0_notification_daemon_fix = true -s0_qt_fix = true +as_firefox_menu_fix = true +as_notification_daemon_fix = true +as_qt_fix = true +as_java_taskbar_fix = true +as_legacy_fullscreen = true [zoom] s0_filter_linear = true -[cube] -s0_images = cube-image;; - [place] s0_mode = 2 [shift] -s0_next_key = <Alt>Tab -s0_prev_key = <Shift><Alt>Tab +as_next_key = <Alt>Tab +as_prev_key = <Shift><Alt>Tab [animation] s0_open_effects = animation:Fade;animation:Fade;animation:Fade; s0_close_effects = animation:Fade;animation:Fade;animation:Fade; -