diff --git a/50-marco-navigation.xml b/50-marco-navigation.xml deleted file mode 100644 index 88ef92c..0000000 --- a/50-marco-navigation.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/50-marco-system.xml b/50-marco-system.xml deleted file mode 100644 index eaf5085..0000000 --- a/50-marco-system.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/50-marco-windows.xml b/50-marco-windows.xml deleted file mode 100644 index 5b62b66..0000000 --- a/50-marco-windows.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compiz-fix-gtk-window-decorator-no-argb-crash.patch b/compiz-fix-gtk-window-decorator-no-argb-crash.patch deleted file mode 100644 index 71fa873..0000000 --- a/compiz-fix-gtk-window-decorator-no-argb-crash.patch +++ /dev/null @@ -1,49 +0,0 @@ -Author: Sebastien Bacher -Description: Fix decorator crash when ARGB isn't enabled - Fix gtk-window-decorator crash when ARGB isn't enabled and only - that, in this case window-decoration are invisible -Origin: vendor, ubuntu (1:0.3.6-1ubuntu9) -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/94140 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/82205 ---- a/gtk/window-decorator/gtk-window-decorator.c -+++ b/gtk/window-decorator/gtk-window-decorator.c -@@ -1912,10 +1912,8 @@ meta_draw_window_decoration (decor_t *d) - - size = MAX (fgeom.top_height, fgeom.bottom_height); - -- if (rect.width && size) -+ if (rect.width && size && (pixmap = create_pixmap (rect.width, size))) - { -- pixmap = create_pixmap (rect.width, size); -- - cr = gdk_cairo_create (GDK_DRAWABLE (pixmap)); - gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha); - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -@@ -2014,10 +2012,8 @@ meta_draw_window_decoration (decor_t *d) - - size = MAX (fgeom.left_width, fgeom.right_width); - -- if (size && rect.height) -+ if (size && rect.height && (pixmap = create_pixmap (size, rect.height))) - { -- pixmap = create_pixmap (size, rect.height); -- - cr = gdk_cairo_create (GDK_DRAWABLE (pixmap)); - gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha); - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -@@ -3289,9 +3285,12 @@ update_window_decoration_icon (WnckWindo - g_object_ref (G_OBJECT (d->icon_pixbuf)); - - d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf); -- cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap)); -- d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr)); -- cairo_destroy (cr); -+ if (d->icon_pixmap) -+ { -+ cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap)); -+ d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr)); -+ cairo_destroy (cr); -+ } - } - } - diff --git a/compiz-lxde-emerald b/compiz-lxde-emerald new file mode 100644 index 0000000..9dfcea4 --- /dev/null +++ b/compiz-lxde-emerald @@ -0,0 +1,32 @@ +#!/bin/bash + +function runCompiz() { + if ( [ -e /usr/lib/compizconfig/backends/libini.so ] || [ -e /usr/lib64/compizconfig/backends/libini.so ] ) + then + exec compiz --replace --sm-disable --ignore-desktop-hints ccp && + emerald --replace $@ + else + exec compiz --replace --sm-disable --ignore-desktop-hints ccp glib ini $@ + fi +} + +ISSW=`glxinfo | grep "Software Rasterizer" -c` + +# Try with direct rendering +HAVETFP=`glxinfo | grep texture_from_pixmap -c` + +if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then + runCompiz $@ +fi + +# Try again with indirect rendering +export LIBGL_ALWAYS_INDIRECT=1 + +HAVETFP=`glxinfo | grep texture_from_pixmap -c` + +if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then + runCompiz $@ +fi + +# Fall back to openbox-lxde +exec openbox-lxde $@ diff --git a/compiz-lxde-emerald.desktop b/compiz-lxde-emerald.desktop new file mode 100644 index 0000000..9998214 --- /dev/null +++ b/compiz-lxde-emerald.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Compiz +TryExec=compiz-lxde-emerald +Exec=compiz-lxde-emerald +NoDisplay=true +Name[de_DE]=compiz-lxde-emerald.desktop +X-Desktop-File-Install-Version=0.21 diff --git a/compiz-mate-gtk b/compiz-mate-emerald similarity index 61% rename from compiz-mate-gtk rename to compiz-mate-emerald index a0656fc..a6798a8 100644 --- a/compiz-mate-gtk +++ b/compiz-mate-emerald @@ -1,12 +1,12 @@ #!/bin/bash function runCompiz() { - gtk-window-decorator & - if ( [ -e /usr/lib/compizconfig/backends/libmateconf.so ] || [ -e /usr/lib64/compizconfig/backends/libmateconf.so ] ) + if ( [ -e /usr/lib/compizconfig/backends/libini.so ] || [ -e /usr/lib64/compizconfig/backends/libini.so ] ) then - exec compiz --ignore-desktop-hints ccp $@ + exec compiz --replace --sm-disable --ignore-desktop-hints ccp && + emerald --replace $@ else - exec compiz --ignore-desktop-hints glib mateconf matecompat $@ + exec compiz --replace --sm-disable --ignore-desktop-hints glib ini matecompat $@ fi } diff --git a/compiz-mate-emerald.desktop b/compiz-mate-emerald.desktop new file mode 100644 index 0000000..1f3082d --- /dev/null +++ b/compiz-mate-emerald.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Compiz +TryExec=compiz-mate-emerald +Exec=compiz-mate-emerald +NoDisplay=true +Name[de_DE]=compiz-mate-emerald.desktop diff --git a/compiz-mate-gtk.desktop b/compiz-mate-gtk.desktop deleted file mode 100644 index 280ebad..0000000 --- a/compiz-mate-gtk.desktop +++ /dev/null @@ -1,8 +0,0 @@ - -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Compiz -TryExec=compiz-mate-gtk -Exec=compiz-mate-gtk -NoDisplay=true diff --git a/compiz-plugins-main_plugin-matecompat.svg b/compiz-plugins-main_plugin-matecompat.svg new file mode 100644 index 0000000..c5d3bf1 --- /dev/null +++ b/compiz-plugins-main_plugin-matecompat.svg @@ -0,0 +1,134 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/compiz-xfce-emerald b/compiz-xfce-emerald new file mode 100644 index 0000000..cc5bc45 --- /dev/null +++ b/compiz-xfce-emerald @@ -0,0 +1,32 @@ +#!/bin/bash + +function runCompiz() { + if ( [ -e /usr/lib/compizconfig/backends/libini.so ] || [ -e /usr/lib64/compizconfig/backends/libini.so ] ) + then + exec compiz --replace --sm-disable --ignore-desktop-hints ccp && + emerald --replace $@ + else + exec compiz --replace --sm-disable --ignore-desktop-hints ccp glib ini $@ + fi +} + +ISSW=`glxinfo | grep "Software Rasterizer" -c` + +# Try with direct rendering +HAVETFP=`glxinfo | grep texture_from_pixmap -c` + +if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then + runCompiz $@ +fi + +# Try again with indirect rendering +export LIBGL_ALWAYS_INDIRECT=1 + +HAVETFP=`glxinfo | grep texture_from_pixmap -c` + +if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then + runCompiz $@ +fi + +# Fall back to xfwm4 +exec xfwm4 $@ diff --git a/compiz-xfce-emerald.desktop b/compiz-xfce-emerald.desktop new file mode 100644 index 0000000..d9091f3 --- /dev/null +++ b/compiz-xfce-emerald.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Compiz +TryExec=compiz-xfce-emerald +Exec=compiz-xfce-emerald +NoDisplay=true +Name[de_DE]=compiz-xfce-emerald.desktop +X-Desktop-File-Install-Version=0.21 diff --git a/compiz.spec b/compiz.spec index c4beb34..cb9ebb3 100644 --- a/compiz.spec +++ b/compiz.spec @@ -1,19 +1,18 @@ -%global core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall +%global core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall glib annotate svg -%global mate_plugins annotate mateconf glib svg matecompat - -%global plugins_schemas compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-glib compiz-ini compiz-inotify compiz-matecompat compiz-mateconf compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-wall compiz-water compiz-wobbly compiz-zoom gwd +%global mate_plugins matecompat # List of plugins passed to ./configure. The order is important -%global plugins core,glib,mateconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall,obs - +%global plugins core,glib,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall,obs + + Name: compiz URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -22,6 +21,8 @@ ExcludeArch: s390 s390x Requires: system-logos Requires: glx-utils +# this is an inverse require which is needed for build without gtk-windows-decorator +Requires: emerald BuildRequires: libX11-devel BuildRequires: libdrm-devel @@ -36,8 +37,6 @@ BuildRequires: libXt-devel BuildRequires: libSM-devel BuildRequires: libICE-devel BuildRequires: libXmu-devel -BuildRequires: mate-desktop-devel -BuildRequires: mate-control-center-devel BuildRequires: mate-conf-devel BuildRequires: desktop-file-utils BuildRequires: intltool @@ -45,25 +44,27 @@ BuildRequires: gettext BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: librsvg2-devel -BuildRequires: mate-window-manager-devel BuildRequires: mesa-libGLU-devel BuildRequires: fuse-devel BuildRequires: cairo-devel BuildRequires: libtool BuildRequires: libxslt-devel + Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2 -Source2: compiz-mate-gtk -Source3: compiz-mate-gtk.desktop -Source4: 50-marco-navigation.xml -Source5: 50-marco-system.xml -Source6: 50-marco-windows.xml +Source2: compiz-mate-emerald +Source3: compiz-mate-emerald.desktop +Source4: compiz-xfce-emerald +Source5: compiz-xfce-emerald.desktop +Source6: compiz-lxde-emerald +Source7: compiz-lxde-emerald.desktop +Source8: compiz-plugins-main_plugin-matecompat.svg # fork gnome to mate Patch0: comiz_mate_fork.patch # fix http://forums.mate-desktop.org/viewtopic.php?f=8&t=818 -Patch1: compiz_gtk_window_decoration_button_placement.patch -Patch2: compiz_windows-decorator.patch +#Patch1: compiz_gtk_window_decoration_button_placement.patch +#Patch2: compiz_windows-decorator.patch # Patches that are not upstream Patch3: composite-cube-logo.patch Patch4: fedora-logo.patch @@ -74,13 +75,13 @@ Patch8: no-more-mate-wm-settings.patch Patch9: compiz-0.88_incorrect-fsf-address.patch Patch10: compiz-disable-child-window-clipping.patch Patch11: compiz-add-cursor-theme-support.patch -Patch12: compiz-fix-gtk-window-decorator-no-argb-crash.patch +#Patch12: compiz-fix-gtk-window-decorator-no-argb-crash.patch Patch13: compiz_fix-no-border-window-shadow.patch Patch14: compiz_draw_dock_shadows_on_desktop.patch Patch15: compiz_optional-fbo.patch Patch16: compiz_call_glxwaitx_before_drawing.patch Patch17: compiz_always_unredirect_screensaver_on_nvidia.patch -Patch18: compiz_hide_tooltip_on_decorator.patch +#Patch18: compiz_hide_tooltip_on_decorator.patch Patch19: compiz_fullscreen_stacking_fixes.patch Patch20: compiz_damage-report-non-empty.patch Patch21: compiz_stacking.patch @@ -114,20 +115,35 @@ windows and compositing manager. Summary: Compiz mate integration bits Group: User Interface/Desktops Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires(pre): mate-conf -Requires(post): mate-conf -Requires(preun): mate-conf %description mate -The compiz-mate package contains gtk-window-decorator, -and other mate integration related stuff. +The compiz-mate package contains matecompat plugin +and a compiz start script for mate. + +%package xfce +Summary: Compiz mate integration bits +Group: User Interface/Desktops +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +%description xfce +The compiz-xfce package contains a compiz start script +for xfce. + +%package lxde +Summary: Compiz mate integration bits +Group: User Interface/Desktops +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description lxde +The compiz-lxde package contains a compiz start script +for lxde. + %prep %setup -q %patch0 -p1 -b .comiz_mate_fork -%patch1 -p1 -b .compiz_gtk_window_decoration_button -%patch2 -p1 -b .compiz_windows-decorator +#%patch1 -p1 -b .compiz_gtk_window_decoration_button +#%patch2 -p1 -b .compiz_windows-decorator %patch3 -p1 -b .composite-cube-logo %if 0%{?fedora} %patch4 -p1 -b .fedora-logo @@ -139,13 +155,13 @@ and other mate integration related stuff. %patch8 -p1 -b .mate-wm-settings %patch9 -p1 -b .incorrect-fsf-address %patch11 -p1 -b .cursor-theme-support -%patch12 -p1 -b .gtk-window-decorator-no-argb-crash +#%patch12 -p1 -b .gtk-window-decorator-no-argb-crash %patch13 -p1 -b .no-border-window-shadow %patch14 -p1 -b .draw_dock_shadows %patch15 -p1 -b .fbo %patch16 -p1 -b .glxwaitx_before_drawing %patch17 -p1 -b .always_unredirect_screensaver -%patch18 -p1 -b .tooltip_on_decorator +#%patch18 -p1 -b .tooltip_on_decorator %patch19 -p1 -b .fullscreen_stacking %patch20 -p1 -b .damage-report %patch21 -p1 -b .stacking @@ -158,53 +174,50 @@ aclocal autoconf automake %configure \ - --enable-mateconf \ + --disable-mateconf \ --enable-dbus \ --enable-librsvg \ - --enable-gtk \ - --enable-marco \ + --disable-gtk \ + --disable-marco \ --enable-mate \ --with-default-plugins=%{plugins} \ - --enable-mate-keybindings \ + --disable-mate-keybindings \ --disable-kde \ --disable-kde4 \ - --disable-kconfig \ - --disable-mate-keybindings + --disable-kconfig + make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps %install -export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install || exit 1 -unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - + install %SOURCE2 $RPM_BUILD_ROOT%{_bindir} - +install %SOURCE4 $RPM_BUILD_ROOT%{_bindir} +install %SOURCE6 $RPM_BUILD_ROOT%{_bindir} + desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE3 - +desktop-file-install --vendor="" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %SOURCE5 +desktop-file-install --vendor="" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + %SOURCE7 + +# matecompat icon +mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps +cp -f %SOURCE8 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg + rm $RPM_BUILD_ROOT%{_datadir}/compiz/kconfig.xml -rm $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-kconfig.schemas +rm $RPM_BUILD_ROOT%{_datadir}/compiz/mateconf.xml +rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' - -# create compiz keybindings file based on the marco ones -# lifted straight from Ubuntu, as long as installation of the upstream -# ones is broken at least (I've reported this upstream) -#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings -#sed 's/wm_name=\"Marco\" package=\"marco\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/mate-control-center/keybindings/50-marco-desktop-key.xml > $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml -#sed 's/wm_name=\"Marco\" package=\"marco\"/wm_name=\"Compiz\" package=\"compiz\"/' /usr/share/mate-control-center/keybindings/50-marco-key.xml > $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml - -#cp %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-navigation.xml -#cp %SOURCE5 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-system.xml -#cp %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/mate-control-center/keybindings/50-compiz-windows.xml - -#sed -i 's#key=\"/apps/marco/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml -#sed -i 's#key=\"/apps/marco/general/num_workspaces\" comparison=\"gt\"##g' $RPM_BUILD_ROOT/%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml - + %find_lang %{name} cat %{name}.lang > core-files.txt @@ -221,22 +234,31 @@ done >> mate-files.txt %check -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-gtk.desktop +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-emerald.desktop +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-xfce-emerald.desktop +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/bin/touch --no-create %{_datadir}/compiz &>/dev/null || : +/bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : -%postun -p /sbin/ldconfig - -%post mate -%mateconf_schema_upgrade %{plugins_schemas} - -%pre mate -%mateconf_schema_prepare %{plugins_schemas} -%mateconf_schema_obsolete compiz-kconfig - -%preun mate -%mateconf_schema_remove %{plugins_schemas} +%postun +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/compiz &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || : +fi +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : + %files -f core-files.txt @@ -249,29 +271,47 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-gtk.d %{_datadir}/compiz/core.xml %files mate -f mate-files.txt -%{_bindir}/compiz-mate-gtk -%{_bindir}/gtk-window-decorator -#%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml -#%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml -#%{_datadir}/mate-control-center/keybindings/50-compiz-navigation.xml -#%{_datadir}/mate-control-center/keybindings/50-compiz-system.xml -#%{_datadir}/mate-control-center/keybindings/50-compiz-windows.xml -%{_datadir}/applications/compiz-mate-gtk.desktop -%exclude %{_datadir}/applications/compiz.desktop -%config(noreplace) %{_sysconfdir}/mateconf/schemas/*.schemas - +%{_bindir}/compiz-mate-emerald +%{_datadir}/applications/compiz-mate-emerald.desktop +%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg + +%files xfce +%{_bindir}/compiz-xfce-emerald +%{_datadir}/applications/compiz-xfce-emerald.desktop + +%files lxde +%{_bindir}/compiz-lxde-emerald +%{_datadir}/applications/compiz-lxde-emerald.desktop %files devel %{_libdir}/pkgconfig/compiz.pc %{_libdir}/pkgconfig/libdecoration.pc %{_libdir}/pkgconfig/compiz-cube.pc -%{_libdir}/pkgconfig/compiz-mateconf.pc %{_libdir}/pkgconfig/compiz-scale.pc -%{_datadir}/compiz/schemas.xslt %{_includedir}/compiz/ %{_libdir}/libdecoration.so + %changelog +* Sat Dec 22 2012 Wolfgang Ulbrich - 1:0.8.8-11 +- do some major changes +- disable mateconf and use libini text file configuration backend +- remove mateconf from scriptlet section +- move glib annotate svg plugins to core package +- disable gtk-windows-decorator +- drop compiz-mate-gtk compiz session script +- disable gtk-windows-decorator patches +- disable marco/metacity +- disable mate/gnome +- disable mate/gnome keybindings +- insert compiz-mate-emerald compiz session script +- insert compiz-xfce-emerald compiz session script +- insert compiz-lxde-emerald compiz session script +- add emerald as require +- add matecompat icon +- add icon cache scriptlets + + * Sun Dec 02 2012 Wolfgang Ulbrich - 1:0.8.8-10 - add %%global plugins_schemas again diff --git a/compiz_gtk_window_decoration_button_placement.patch b/compiz_gtk_window_decoration_button_placement.patch deleted file mode 100644 index b204bec..0000000 --- a/compiz_gtk_window_decoration_button_placement.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -upr compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac ---- compiz-0.8.8-orig/configure.ac 2012-09-16 10:04:18.000000000 +0200 -+++ compiz-0.8.8/configure.ac 2012-09-16 10:10:26.095872922 +0200 -@@ -323,12 +323,12 @@ if test "x$use_gtk" = "xyes"; then - if test "x$use_marco" = "xyes"; then - PKG_CHECK_MODULES(MARCO, libmarco-private, - [use_marco=yes], [use_marco=no]) -- PKG_CHECK_EXISTS(libmarco-private >= 2.15.21, -+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, - [have_marco_2_15_21=yes], [have_marco_2_15_21=no]) -- PKG_CHECK_EXISTS(libmarco-private >= 2.17.0, -+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, - [have_marco_2_17_0=yes], [have_marco_2_17_0=no]) - PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, -- [have_marco_2_23_2=yes], [have_marco_1_2_0=no]) -+ [have_marco_2_23_2=yes], [have_marco_2_23_2=no]) - fi - - if test "x$use_mate" = "xyes"; then -@@ -382,8 +382,8 @@ if test "$use_marco" = yes; then - AC_DEFINE(HAVE_MARCO_2_17_0, 1, - [Define to 1 if marco version >= 2.17.0]) - fi -- if test "$have_marco_1_2_0" = yes; then -- AC_DEFINE(HAVE_MARCO_1_2_0, 1, -+ if test "$have_marco_2_23_2" = yes; then -+ AC_DEFINE(HAVE_MARCO_2_23_2, 1, - [Define to 1 if marco version >= 1.2.0]) - fi - fi -diff -upr compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c ---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2012-09-16 10:04:18.000000000 +0200 -+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2012-09-16 10:12:15.613373978 +0200 -@@ -370,7 +370,7 @@ add_themes_from_dir (GList *current_list - { - theme_file_path = - g_build_filename (path, entry->d_name, -- "marco-1/marco-theme-1.xml", NULL); -+ "metacity-1/metacity-theme-1.xml", NULL); - - if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) - { diff --git a/compiz_hide_tooltip_on_decorator.patch b/compiz_hide_tooltip_on_decorator.patch deleted file mode 100644 index 7a2f7d0..0000000 --- a/compiz_hide_tooltip_on_decorator.patch +++ /dev/null @@ -1,80 +0,0 @@ -Description: add a gconf key (/desktop/gnome/interface/hide_decorator_tooltip) - to disable tooltip in decorator bar. If key not present, show the tooltip. -Origin: Ubuntu -Bug: http://bugs.opencompositing.org/show_bug.cgi?id=1264 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/519856 - -Description: add a mateconf key (/desktop/mate/interface/hide_decorator_tooltip) - to disable tooltip in decorator bar. If key not present, show the tooltip. -Origin: , build for LMDE/Debian Testing -Author: Jasmine Hassan -Last-Updated: 2012-10-08 - ---- a/gtk/window-decorator/gtk-window-decorator.c -+++ b/gtk/window-decorator/gtk-window-decorator.c -@@ -154,6 +154,9 @@ - #define COMPIZ_CURSOR_SIZE_KEY \ - COMPIZ_MATECONF_DIR2 "/cursor_size" - -+#define INTERFACE_MATECONF_DIR "/desktop/mate/interface" -+#define HIDE_DECORATOR_TOOLTIP_KEY INTERFACE_MATECONF_DIR "/hide_decorator_tooltip" -+ - #define DBUS_DEST "org.freedesktop.compiz" - #define DBUS_PATH "/org/freedesktop/compiz/decoration/allscreens" - #define DBUS_INTERFACE "org.freedesktop.compiz" -@@ -464,6 +467,8 @@ static PangoFontDescription *titlebar_fo - static gboolean use_system_font = FALSE; - static gint text_height; - -+static gboolean hide_decorator_tooltip = FALSE; -+ - #define BLUR_TYPE_NONE 0 - #define BLUR_TYPE_TITLEBAR 1 - #define BLUR_TYPE_ALL 2 -@@ -4323,6 +4328,9 @@ handle_tooltip_event (WnckWindow *win, - guint state, - const char *tip) - { -+ if (hide_decorator_tooltip) -+ return; -+ - switch (xevent->type) { - case ButtonPress: - hide_tooltip (); -@@ -6597,6 +6605,12 @@ value_changed (MateConfClient *client, - { - cursor_theme_changed (client); - } -+ else if (strcmp (key, HIDE_DECORATOR_TOOLTIP_KEY) == 0) -+ { -+ hide_decorator_tooltip = mateconf_client_get_bool (client, -+ HIDE_DECORATOR_TOOLTIP_KEY, -+ NULL); -+ } - - if (changed) - decorations_changed (data); -@@ -6769,6 +6783,11 @@ init_settings (WnckScreen *screen) - MATECONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - -+ mateconf_client_add_dir (mateconf, -+ INTERFACE_MATECONF_DIR, -+ MATECONF_CLIENT_PRELOAD_NONE, -+ NULL); -+ - g_signal_connect (G_OBJECT (mateconf), - "value_changed", - G_CALLBACK (value_changed), -@@ -6929,6 +6948,11 @@ init_settings (WnckScreen *screen) - wheel_action_changed (mateconf); - shadow_settings_changed (mateconf); - blur_settings_changed (mateconf); -+ -+ hide_decorator_tooltip = mateconf_client_get_bool (mateconf, -+ HIDE_DECORATOR_TOOLTIP_KEY, -+ NULL); -+ - #endif - - (*theme_update_border_extents) (text_height); diff --git a/compiz_windows-decorator.patch b/compiz_windows-decorator.patch deleted file mode 100644 index dd1d434..0000000 --- a/compiz_windows-decorator.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 12:40:35.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 13:55:44.000000000 +0200 -@@ -1318,7 +1318,7 @@ draw_window_decoration (decor_t *d) - } - } - --#ifdef USE_MARCO -+ - static void - decor_update_meta_window_property (decor_t *d, - MetaTheme *theme, -@@ -1405,17 +1405,16 @@ meta_get_corner_radius (const MetaFrameG - int *bottom_right_radius) - { - --#ifdef HAVE_MARCO_2_17_0 -+#ifdef HAVE_MARCO_1_2_0 - *top_left_radius = fgeom->top_left_corner_rounded_radius; - *top_right_radius = fgeom->top_right_corner_rounded_radius; - *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius; - *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius; - #else -- *top_left_radius = fgeom->top_left_corner_rounded ? 5 : 0; -- *top_right_radius = fgeom->top_right_corner_rounded ? 5 : 0; -- *bottom_left_radius = fgeom->bottom_left_corner_rounded ? 5 : 0; -- *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0; --#endif -+ *top_left_radius = fgeom->top_left_corner_rounded_radius; -+ *top_right_radius = fgeom->top_right_corner_rounded_radius; -+ *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius; -+ *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius; - - } -