Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at 2015-11-12 19:40:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-22 16:23:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compiz-manager.new/compiz-manager.changes 2015-11-12 19:40:54.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Nov 9 11:48:58 UTC 2015 - [email protected] + +- Update and fix compiz-manager-setup.patch (Compiz 0.9.x stuff, + lack of MATE compatibility, $XDG_CONFIG_HOME ignoring). +- Add Marco to compiz-manager-fallback_xterm.patch. +- Rebase and rename compiz-manager-bnc564536.patch to + compiz-manager-sbin-lspci.patch. + +------------------------------------------------------------------- Old: ---- compiz-manager-bnc564536.patch New: ---- compiz-manager-sbin-lspci.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.j2Y9D8/_old 2015-11-12 19:40:56.000000000 +0100 +++ /var/tmp/diff_new_pack.j2Y9D8/_new 2015-11-12 19:40:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package compiz-manager # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,71 +18,68 @@ Name: compiz-manager Version: 0.6.0 -Release: 16 -Summary: A wrapper script to launch Compiz with proper options +Release: 0 +Summary: Wrapper script to launch Compiz with proper options License: GPL-2.0+ Group: System/X11/Utilities -Url: http://opencompositing.org -Source: %name-%version.tar.bz2 +Url: https://launchpad.net/compiz +Source: %{name}-%{version}.tar.bz2 Source2: Compiz.desktop Source3: config.skel # PATCH-FEATURE-OPENSUSE compiz-manager-setup.patch [email protected] -- Configure compiz-manager to fit the openSUSE ecosystem. Patch0: compiz-manager-setup.patch -# PATCH-FIX-UPSTREAM compiz-manager-detect-multiple-graphic-cards.patch bnc#440273 [email protected] -- Detect more than 1 graphic card -Patch6: compiz-manager-detect-multiple-graphic-cards.patch -# PATCH-FIX-UPSTREAM [email protected] bnc#469785 -- Compiz not redrawing properly with nVidia hardware, taken from upstream commit 06ca70. -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 -# PATCH-FIX-UPSTREAM compiz-manager-bnc564536.patch bnc#564536 [email protected] -- Account for lib64 and double slashes in paths. -Patch11: compiz-manager-bnc564536.patch -# PATCH-FIX-UPSTREAM compiz-manager-sm-client-id.patch [email protected] -- 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 -# PATCH-FEATURE-OPENSUSE compiz-manager-nouveau.patch [email protected] -- Nouveau is sufficient to handle compiz. -Patch13: compiz-manager-nouveau.patch -PreReq: %fillup_prereq +# PATCH-FIX-UPSTREAM compiz-manager-detect-multiple-graphic-cards.patch boo#440273 [email protected] -- Detect more than 1 graphic card. +Patch1: compiz-manager-detect-multiple-graphic-cards.patch +# PATCH-FIX-UPSTREAM bug-469785-disable-loose-binding.diff [email protected] boo#469785 -- Compiz not redrawing properly with NVIDIA hardware. +Patch2: bug-469785-disable-loose-binding.diff +# PATCH-FIX-UPSTREAM compiz-manager-avoid-sw-rast-bug-479060.diff +Patch3: compiz-manager-avoid-sw-rast-bug-479060.diff +# PATCH-FIX-UPSTREAM compiz-manager-dry_run.patch -- Add dry_run capabilities. +Patch4: compiz-manager-dry_run.patch +# PATCH-FIX-UPSTREAM compiz-manager-fallback_xterm.patch -- Have one last fallback to xterm if nothing else works. +Patch5: compiz-manager-fallback_xterm.patch +# PATCH-FIX-UPSTREAM compiz-manager-sbin-lspci.patch boo#564536 [email protected] -- Account for lib64 and double slashes in paths. +Patch6: compiz-manager-sbin-lspci.patch +# PATCH-FIX-UPSTREAM compiz-manager-sm-client-id.patch [email protected] -- 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 [email protected] -- Nouveau is sufficient to handle Compiz. +Patch8: compiz-manager-nouveau.patch +BuildRequires: update-desktop-files Requires: compiz < 0.9 Requires: util-linux -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: update-desktop-files BuildArch: noarch %description -Compiz Manager wrapper script - -This script will detect what options we need to pass to compiz to get -it started, and start a default plugin and possibly window decorator. +This script detects what options to pass to Compiz to get it +started, and start a default plugin and possibly window decorator. %prep %setup -q %patch0 -p1 -%patch6 -p0 +%patch1 +%patch2 -p1 +%patch3 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch7 -p1 -%patch8 -p0 -%patch9 -p1 -%patch10 -p1 -%patch11 -p0 -%patch12 -p1 -%patch13 -p1 +%patch8 -p1 +cp -f %{SOURCE2} Compiz.desktop +cp -f %{SOURCE3} config.skel %build +# Nothing to build. %install -%__install -d -m 755 %{buildroot}%{_bindir} -%__install -d -m 755 %{buildroot}%{_datadir}/compiz-manager -%__install -m 755 compiz-manager %{buildroot}%{_bindir} -%__install -m 644 %{S:2} %{buildroot}%{_datadir}/compiz-manager/ -%__install -m 644 %{S:3} %{buildroot}%{_datadir}/compiz-manager/ +install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name} +install -Dm 0644 Compiz.desktop %{buildroot}%{_datadir}/compiz-manager/Compiz.desktop +install -Dm 0644 config.skel %{buildroot}%{_datadir}/compiz-manager/config.skel + %suse_update_desktop_file %{buildroot}%{_datadir}/compiz-manager/Compiz.desktop %files -%defattr(-, root, root) -%dir %{_datadir}/compiz-manager -%{_bindir}/* -%{_datadir}/compiz-manager/* +%defattr(-,root,root) +%{_bindir}/%{name} +%{_datadir}/%{name}/ %changelog ++++++ compiz-manager-fallback_xterm.patch ++++++ --- /var/tmp/diff_new_pack.j2Y9D8/_old 2015-11-12 19:40:56.000000000 +0100 +++ /var/tmp/diff_new_pack.j2Y9D8/_new 2015-11-12 19:40:56.000000000 +0100 @@ -9,28 +9,40 @@ =================================================================== --- compiz-manager-0.6.0.orig/compiz-manager +++ compiz-manager-0.6.0/compiz-manager -@@ -39,6 +39,7 @@ PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" +@@ -40,6 +40,8 @@ PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" GLXINFO=$(which glxinfo) KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" ++MARCO="/usr/bin/marco" +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 +@@ -54,8 +56,17 @@ 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/+" + 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}" ++ FALLBACKWM="${KWIN}"; ++elif [ x"$XDG_CURRENT_DESKTOP" = x"MATE" ]; then ++ FALLBACKWM="${MARCO}" ++elif [ x"$XDG_CURRENT_DESKTOP" = x"GNOME" ] || [ x"$DESKTOP_SESSION" = x"gnome" ]; 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 +@@ -415,6 +426,8 @@ fi + if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then + verbose "Starting emerald\n" + ${COMPIZ_BIN_PATH}emerald --replace & ++elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ "$XDG_CURRENT_DESKTOP" = "MATE" ]; then ++ verbose "Starting gtk-window-decorator\n" + elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then + verbose "Starting gtk-window-decorator\n" + ${COMPIZ_BIN_PATH}gtk-window-decorator --replace & ++++++ compiz-manager-sbin-lspci.patch ++++++ --- a/compiz-manager +++ b/compiz-manager @@ -311,14 +311,14 @@ running_under_whitelisted_driver() # check pciid blacklist have_blacklisted_pciid() { - OUTPUT=$(lspci -n) + OUTPUT=$(/sbin/lspci -n) for ID in ${BLACKLIST_PCIIDS}; do if echo "$OUTPUT" | egrep -q "$ID"; then verbose "Blacklisted PCIID '$ID' found \n" return 0 fi done - OUTPUT=$(lspci -vn | grep -i VGA) + OUTPUT=$(/sbin/lspci -vn | grep -i VGA) verbose "Detected PCI ID for VGA: $OUTPUT\n" return 1 } ++++++ compiz-manager-setup.patch ++++++ --- /var/tmp/diff_new_pack.j2Y9D8/_old 2015-11-12 19:40:56.000000000 +0100 +++ /var/tmp/diff_new_pack.j2Y9D8/_new 2015-11-12 19:40:56.000000000 +0100 @@ -1,17 +1,16 @@ -diff -Ndurp compiz-manager-0.6.0/compiz-manager compiz-manager-0.6.0-setup/compiz-manager ---- compiz-manager-0.6.0/compiz-manager 2007-10-15 22:10:06.000000000 +0300 -+++ compiz-manager-0.6.0-setup/compiz-manager 2014-10-19 03:55:17.666596337 +0300 -@@ -25,11 +25,18 @@ - # This script will detect what options we need to pass to compiz to get it +--- a/compiz-manager ++++ b/compiz-manager +@@ -26,10 +26,18 @@ # started, and start a default plugin and possibly window decorator. # -+ARCH=`arch` + ++ARCH=$(arch) +if [ "$ARCH" = "x86_64" ]; then -+ LIB=lib64 ++ LIB=lib64 +else -+ LIB=lib ++ LIB=lib +fi - ++ +PREFIX=$(dirname $(dirname $(which compiz))) -COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz @@ -23,30 +22,43 @@ KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) -@@ -62,9 +69,15 @@ BLACKLIST_PCIIDS="$T" +@@ -45,7 +53,7 @@ NVIDIA_MEMORY="65536" # 64MB + NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default + + # For detecting what driver is in use, the + is for one or more /'s +-XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+" ++XORG_DRIVER_PATH="/usr/$LIB/xorg/modules/drivers/+" + + FALLBACKWM="${METACITY}" + FALLBACKWM_OPTIONS="--replace $@" +@@ -62,9 +70,19 @@ BLACKLIST_PCIIDS="$T" unset T 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 decor move resize" ++COMPIZ_PLUGINS="core composite opengl decoration move resize" ENV="" +#If the user does not yet have a populated Default.ini, we'll drop a default in his config folder -+if [ ! -s "$HOME/.config/compiz-1/compizconfig/Default.ini" ]; then -+ install -D "/usr/share/compiz-manager/config.skel" "$HOME/.config/compiz-1/compizconfig/Default.ini" ++if [ -z "$XDG_CONFIG_HOME" ]; then ++ XDG_CONFIG_HOME="$HOME/.config" ++fi ++ ++if [ ! -s "$XDG_CONFIG_HOME/compiz/compizconfig-1/Default.ini" ]; then ++ install -Dm 0644 "/usr/share/compiz-manager/config.skel" "$XDG_CONFIG_HOME/compiz/compizconfig-1/Default.ini" +fi + # Use emerald by default if it exist USE_EMERALD="yes" -@@ -380,5 +393,10 @@ elif [ -x ${COMPIZ_BIN_PATH}kde-window-d +@@ -380,5 +398,10 @@ elif [ -x ${COMPIZ_BIN_PATH}kde-window-d FALLBACKWM="${KWIN}" fi -+# In case we are in a gnome session, we always want gnomecompat plugin loaded (session registering, key bindings) -+if [ -f ${PLUGIN_PATH}libgnomecompat.so ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ] ; then -+ COMPIZ_PLUGINS="$COMPIZ_PLUGINS gnomecompat" ++# In case we are in a mate session, we always want matecompat plugin loaded (session registering, key bindings) ++if [ -f ${PLUGIN_PATH}libmatecompat.so ] && [ "$XDG_CURRENT_DESKTOP" = "MATE" ]; then ++ COMPIZ_PLUGINS="$COMPIZ_PLUGINS matecompat" +fi + ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
