Hello community,
here is the log from the commit of package compiz
checked in at Wed Mar 12 15:13:08 CET 2008.
--------
--- compiz/compiz.changes 2008-03-10 20:09:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2008-03-12 12:02:13.000000000 +0100
@@ -3,0 +4,6 @@
+- Many small fixes in compiz-decorator
+- add proper fallback decorator if no default available (patch from crdlb)
+
+-------------------------------------------------------------------
+Fri Mar 07 01:20:00 IST 2008 - cyberorg@cyberorg.info
+
Old:
----
gnome-xgl-settings-0.9.tar.gz
New:
----
compiz-default-kconfig-settings.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.I24733/_old 2008-03-12 15:11:12.000000000 +0100
+++ /var/tmp/diff_new_pack.I24733/_new 2008-03-12 15:11:12.000000000 +0100
@@ -35,19 +35,19 @@
Enhances: xgl >= git_070104
AutoReqProv: on
Version: 0.7.2
-Release: 1
+Release: 2
Requires: compiz-decorator = %{version}
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
Source: MesaLib-6.5.2.tar.bz2
Source1: compiz-%version.tar.bz2
-Source2: gnome-xgl-settings-0.9.tar.gz
Source3: opensuse.png
Source4: compiz-decorator
#Source4: gnome-xgl-settings-po.tar.bz2
Patch: compiz-java-config-notify.diff
Patch1: compiz-default-gconf-settings.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
@@ -124,17 +124,15 @@
David Reveman
%package kde4
-Summary: OpenGL window and compositing manager.
-Group: System/GUI/Other
+Summary: OpenGL window and compositing managerdecorator for kde4
+Group: System/GUI/KDE
Requires: kde4-kwin %name = %version
Provides: compiz-decorator = %version
AutoReqProv: on
%description kde4
-Compiz is an OpenGL compositing manager that use
-GLX_EXT_texture_from_drawable for binding redirected top-level windows
-to texture objects. It has a flexible plug-in system and it is designed
-to run well on most graphics hardware.
+This package contains the KDE4 window decorator for the Compiz
+compositing manager.
@@ -177,6 +175,7 @@
cd compiz-*
%patch
%patch1 -p1
+%patch2 -p1
#%patch2
%ifarch x86_64
%patch3
@@ -367,6 +366,8 @@
%changelog
* Fri Mar 07 2008 cyberorg@cyberorg.info
+- Many small fixes in compiz-decorator
+- add proper fallback decorator if no default available (patch from crdlb)
- 0.7.2 development release
- Several bugfixes
- Translation support in gtk-window-decorator.
++++++ compiz-decorator ++++++
--- compiz/compiz-decorator 2008-02-07 21:17:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz-decorator 2008-03-12 09:13:05.000000000 +0100
@@ -18,29 +18,84 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+# Contributions by: crdlb
#
-BIN_PATH=/usr/bin/
+COMPIZ_BIN_PATH=/usr/bin/
+KWIN=`which kwin`
+METACITY="/usr/bin/metacity"
+
+#
+# Default to gtk/kde(4)-window-decorator
+#
+USE_EMERALD="no"
+DECORATOR=""
+
+#Do not leave users without decoration if decorator fails
+if [ $DESKTOP_SESSION == "kde" ]; then
+ FALLBACKWM="${KWIN}"
+else
+ FALLBACKWM="${METACITY}"
+fi
+FALLBACKWM_OPTIONS=" --replace"
+
+#
+# Set to yes to enable verbose
+#
+VERBOSE="yes"
+
+#
+# Echos the arguments if verbose
+#
+verbose()
+{
+ if [ "x$VERBOSE" = "xyes" ]; then
+ printf "$*"
+ fi
+}
+
# Read configuration from XDG paths
if [ -z "$XDG_CONFIG_DIRS" ]; then
- test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
+ test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
else
- test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
+ test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
fi
if [ -z "$XDG_CONFIG_HOME" ]; then
- test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
+ test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
else
- test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager
+ test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager
fi
-if [ -x ${BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
- ${BIN_PATH}emerald --replace &
-elif [ x$DESKTOP_SESSION = x"kde" ] && [ -x ${BIN_PATH}kde-window-decorator ]; then
- ${BIN_PATH}kde-window-decorator --replace &
-elif [ x$KDE_SESSION_VERSION = x"4" ] && [ -x ${BIN_PATH}kde4-window-decorator ]; then
- ${BIN_PATH}kde4-window-decorator --replace &
-else
- ${BIN_PATH}gtk-window-decorator --replace &
+# start a decorator
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+ DECORATOR=emerald
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+ DECORATOR=gtk-window-decorator
+elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+ DECORATOR=kde-window-decorator
+elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION = x"4" ]; then
+ DECORATOR=kde4-window-decorator
fi
+# fall back to any decorator that is installed
+if [ -z "$DECORATOR" ]; then
+ verbose "Couldn't find a perfect decorator match; trying all decorators\n"
+ if [ -x ${COMPIZ_BIN_PATH}emerald ]; then
+ DECORATOR=emerald
+ elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ]; then
+ DECORATOR=gtk-window-decorator
+ elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ]; then
+ DECORATOR=kde-window-decorator
+ elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ]; then
+ DECORATOR=kde4-window-decorator
+ fi
+fi
+
+if [ -n "$DECORATOR" ]; then
+ verbose "Starting ${DECORATOR}\n"
+ ${COMPIZ_BIN_PATH}$DECORATOR --replace "$@"
+else
+ verbose "Found no decorator to start\n"
+ exec $FALLBACKWM $FALLBACKWM_OPTIONS
+fi
++++++ 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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org