From 84d526b9d9f1a7e6b1c6f83870268f0f51fcfb86 Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 09:26:47 +0200 Subject: [PATCH 01/11] bump version in spec file --- compiz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiz.spec b/compiz.spec index 4d0afb6..9127acb 100644 --- a/compiz.spec +++ b/compiz.spec @@ -12,7 +12,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 16%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -325,6 +325,9 @@ fi %changelog +* Mon Apr 29 2013 Wolfgang Ulbrich - 1:0.8.8-18 +- bump version in spec file + * Wed Apr 24 2013 Wolfgang Ulbrich - 1:0.8.8-16 - enable gtk-windows-decorator based on marco (mate-window-manager) - add compiz_disable_gdk_gtk_disable_deprecated patch From ac14677ef8cb3d4a163493d1dffe42f68c915f85 Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 10:04:16 +0200 Subject: [PATCH 02/11] rename compiz_disable_gdk_disable_deprecated.patch --- ...iz_disable_gdk_gtk_disable_deprecated.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 compiz_disable_gdk_gtk_disable_deprecated.patch diff --git a/compiz_disable_gdk_gtk_disable_deprecated.patch b/compiz_disable_gdk_gtk_disable_deprecated.patch deleted file mode 100644 index 6b35d6e..0000000 --- a/compiz_disable_gdk_gtk_disable_deprecated.patch +++ /dev/null @@ -1,18 +0,0 @@ -Stop breaking on deprecated GTK_WIDGET_VISIBLE. ---- a/gtk/window-decorator/gtk-window-decorator.c -+++ b/gtk/window-decorator/gtk-window-decorator.c -@@ -31,14 +31,6 @@ - #include - #include - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- --#ifndef GTK_DISABLE_DEPRECATED --#define GTK_DISABLE_DEPRECATED --#endif -- - #include - #include - #include From acf4aec50d5099209ee731b5abd26460fd26f72a Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 10:06:15 +0200 Subject: [PATCH 03/11] remove compiz-xfce-gtk start script --- compiz-xfce-gtk | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100755 compiz-xfce-gtk diff --git a/compiz-xfce-gtk b/compiz-xfce-gtk deleted file mode 100755 index 8f5e208..0000000 --- a/compiz-xfce-gtk +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -theme=`xfconf-query -c xfwm4 -p /general/theme` - -echo "$theme" - -function runCompiz() { - gtk-window-decorator --replace --marco-theme "$theme" & - exec compiz --replace --sm-disable --ignore-desktop-hints ccp $@ -} - -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 $@ - From c5713bddc3b9146bdd6bae2bb1b560b2d6a730c5 Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 10:09:40 +0200 Subject: [PATCH 04/11] remove compiz-xfce-gtk.desktop --- compiz-xfce-gtk.desktop | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 compiz-xfce-gtk.desktop diff --git a/compiz-xfce-gtk.desktop b/compiz-xfce-gtk.desktop deleted file mode 100644 index c2a9518..0000000 --- a/compiz-xfce-gtk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz XFCE GTK -Comment=start or restart Compiz Fusion with GTK windows-decoator -TryExec=compiz-xfce-gtk -Exec=compiz-xfce-gtk -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=XFCE; -Name[de_DE]=Compiz XFCE GTK From 8d0224bdead79f41b065c84b54687b944c90cadd Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 10:11:30 +0200 Subject: [PATCH 05/11] update spec file and bump version --- compiz.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/compiz.spec b/compiz.spec index 9127acb..e7b3255 100644 --- a/compiz.spec +++ b/compiz.spec @@ -12,7 +12,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -53,8 +53,6 @@ Source1: compiz-mate-gtk Source2: compiz-mate-gtk.desktop Source3: compiz-mate-emerald Source4: compiz-mate-emerald.desktop -Source5: compiz-xfce-gtk -Source6: compiz-xfce-gtk.desktop Source7: compiz-xfce-emerald Source8: compiz-xfce-emerald.desktop Source9: compiz-lxde-gtk @@ -66,7 +64,7 @@ Source13: compiz-plugins-main_plugin-matecompat.svg # fork gnome to mate Patch0: compiz_new_mate.patch # Patches that are not upstream -Patch1: compiz_disable_gdk_gtk_disable_deprecated.patch +Patch1: compiz_disable_gdk_disable_deprecated.patch Patch3: compiz_composite-cube-logo.patch Patch4: compiz_fedora-logo.patch Patch5: compiz_redhat-logo.patch @@ -203,7 +201,6 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1 install %SOURCE1 $RPM_BUILD_ROOT%{_bindir} install %SOURCE3 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE5 $RPM_BUILD_ROOT%{_bindir} install %SOURCE7 $RPM_BUILD_ROOT%{_bindir} install %SOURCE9 $RPM_BUILD_ROOT%{_bindir} install %SOURCE11 $RPM_BUILD_ROOT%{_bindir} @@ -214,9 +211,6 @@ desktop-file-install --vendor="" \ desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE4 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE6 desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE8 @@ -254,7 +248,6 @@ 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-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-xfce-emerald.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop @@ -305,9 +298,7 @@ fi %files xfce %{_bindir}/compiz-xfce-emerald -%{_bindir}/compiz-xfce-gtk %{_datadir}/applications/compiz-xfce-emerald.desktop -%{_datadir}/applications/compiz-xfce-gtk.desktop %files lxde %{_bindir}/compiz-lxde-emerald @@ -325,8 +316,14 @@ fi %changelog +* Mon Apr 29 2013 Wolfgang Ulbrich - 1:0.8.8-19 +- remove compiz-xfce-gtk start script + * Mon Apr 29 2013 Wolfgang Ulbrich - 1:0.8.8-18 -- bump version in spec file +- rename compiz_disable_gtk_disable_deprecated.patch + +* Mon Apr 29 2013 Wolfgang Ulbrich - 1:0.8.8-17 +- remove compiz-xfce-gtk.desktop * Wed Apr 24 2013 Wolfgang Ulbrich - 1:0.8.8-16 - enable gtk-windows-decorator based on marco (mate-window-manager) From 03a301b0be3ca30bc37825ebe4cad52d2c6c5b7b Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 29 Apr 2013 10:26:21 +0200 Subject: [PATCH 06/11] add compiz_disable_gdk_disable_deprecated.patch --- compiz_disable_gdk_disable_deprecated.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 compiz_disable_gdk_disable_deprecated.patch diff --git a/compiz_disable_gdk_disable_deprecated.patch b/compiz_disable_gdk_disable_deprecated.patch new file mode 100644 index 0000000..6b35d6e --- /dev/null +++ b/compiz_disable_gdk_disable_deprecated.patch @@ -0,0 +1,18 @@ +Stop breaking on deprecated GTK_WIDGET_VISIBLE. +--- a/gtk/window-decorator/gtk-window-decorator.c ++++ b/gtk/window-decorator/gtk-window-decorator.c +@@ -31,14 +31,6 @@ + #include + #include + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- +-#ifndef GTK_DISABLE_DEPRECATED +-#define GTK_DISABLE_DEPRECATED +-#endif +- + #include + #include + #include From f54b8b12c220b7563326dca69838ebffd240e939 Mon Sep 17 00:00:00 2001 From: raveit Date: Tue, 7 May 2013 22:22:11 +0200 Subject: [PATCH 07/11] update spec file and pump version --- compiz.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/compiz.spec b/compiz.spec index e7b3255..a01a17f 100644 --- a/compiz.spec +++ b/compiz.spec @@ -12,7 +12,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -23,6 +23,11 @@ Requires: system-logos Requires: glx-utils # this is an inverse require which is needed for build without gtk-windows-decorator Requires: emerald + +Provides: %{name}-xfce%{?_isa} = %{epoch}:%{version}-%{release} +Provides: %{name}-xfce = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-xfce%{?_isa} < %{epoch}:%{version}-%{release} +Obsoletes: %{name}-xfce < %{epoch}:%{version}-%{release} BuildRequires: libX11-devel BuildRequires: libdrm-devel @@ -53,8 +58,6 @@ Source1: compiz-mate-gtk Source2: compiz-mate-gtk.desktop Source3: compiz-mate-emerald Source4: compiz-mate-emerald.desktop -Source7: compiz-xfce-emerald -Source8: compiz-xfce-emerald.desktop Source9: compiz-lxde-gtk Source10: compiz-lxde-gtk.desktop Source11: compiz-lxde-emerald @@ -128,15 +131,14 @@ The compiz-mate package contains the matecompat plugin and start scripts to start Compiz with emerald and gtk-windows-decorator. -%package xfce +%package gtk-windows-decorator Summary: Compiz xfce integration bits Group: User Interface/Desktops Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -%description xfce -The compiz-xfce package contains start scripts to start -Compiz with emerald and gtk-windows-decorator. - +%description gtk-windows-decorator +The compiz-gtk-windows-decorator package contains the GTK +decorator for compiz. %package lxde Summary: Compiz lxde integration bits Group: User Interface/Desktops @@ -201,7 +203,6 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1 install %SOURCE1 $RPM_BUILD_ROOT%{_bindir} install %SOURCE3 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE7 $RPM_BUILD_ROOT%{_bindir} install %SOURCE9 $RPM_BUILD_ROOT%{_bindir} install %SOURCE11 $RPM_BUILD_ROOT%{_bindir} @@ -211,9 +212,6 @@ desktop-file-install --vendor="" \ desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE4 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE8 desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %SOURCE10 @@ -248,7 +246,6 @@ 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-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop @@ -282,7 +279,6 @@ fi %files -f core-files.txt %doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README TODO NEWS %{_bindir}/compiz -%{_bindir}/gtk-window-decorator %{_libdir}/libdecoration.so.* %dir %{_libdir}/compiz %dir %{_datadir}/compiz @@ -296,9 +292,8 @@ fi %{_datadir}/applications/compiz-mate-gtk.desktop %{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg -%files xfce -%{_bindir}/compiz-xfce-emerald -%{_datadir}/applications/compiz-xfce-emerald.desktop +%files gtk-windows-decorator +%{_bindir}/gtk-window-decorator %files lxde %{_bindir}/compiz-lxde-emerald @@ -316,6 +311,11 @@ fi %changelog +* Tue May 07 2013 Wolfgang Ulbrich - 1:0.8.8-20 +- DISABLE XFCE SUPPORT +- remove xfce subpackage +- move gwd decorator to a subpackage + * Mon Apr 29 2013 Wolfgang Ulbrich - 1:0.8.8-19 - remove compiz-xfce-gtk start script From 51c2ff48623c786223781983862aa0a2e894c168 Mon Sep 17 00:00:00 2001 From: raveit Date: Tue, 7 May 2013 22:25:23 +0200 Subject: [PATCH 08/11] remove xfce start script and desktop file --- compiz-xfce-emerald | 28 ---------------------------- compiz-xfce-emerald.desktop | 12 ------------ 2 files changed, 40 deletions(-) delete mode 100755 compiz-xfce-emerald delete mode 100644 compiz-xfce-emerald.desktop diff --git a/compiz-xfce-emerald b/compiz-xfce-emerald deleted file mode 100755 index b277f38..0000000 --- a/compiz-xfce-emerald +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -function runCompiz() { - emerald --replace & - exec compiz --replace --sm-disable --ignore-desktop-hints ccp $@ -} - -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 deleted file mode 100644 index 0be8772..0000000 --- a/compiz-xfce-emerald.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz XFCE Emerald -Comment=start or restart Compiz Fusion with Emerald windows-decoator -TryExec=compiz-xfce-emerald -Exec=compiz-xfce-emerald -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=XFCE; -Name[de_DE]=Compiz XFCE Emerald From 8e5adc586538b465abc28b8e6981e7e78a9a31b9 Mon Sep 17 00:00:00 2001 From: raveit Date: Thu, 9 May 2013 00:16:32 +0200 Subject: [PATCH 09/11] update spec file and bump version --- compiz.spec | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/compiz.spec b/compiz.spec index a01a17f..e4e690b 100644 --- a/compiz.spec +++ b/compiz.spec @@ -12,7 +12,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.8 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -58,11 +58,9 @@ Source1: compiz-mate-gtk Source2: compiz-mate-gtk.desktop Source3: compiz-mate-emerald Source4: compiz-mate-emerald.desktop -Source9: compiz-lxde-gtk -Source10: compiz-lxde-gtk.desktop -Source11: compiz-lxde-emerald -Source12: compiz-lxde-emerald.desktop -Source13: compiz-plugins-main_plugin-matecompat.svg +Source5: compiz-lxde-emerald +Source6: compiz-lxde-emerald.desktop +Source7: compiz-plugins-main_plugin-matecompat.svg # fork gnome to mate Patch0: compiz_new_mate.patch @@ -131,14 +129,6 @@ The compiz-mate package contains the matecompat plugin and start scripts to start Compiz with emerald and gtk-windows-decorator. -%package gtk-windows-decorator -Summary: Compiz xfce integration bits -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description gtk-windows-decorator -The compiz-gtk-windows-decorator package contains the GTK -decorator for compiz. %package lxde Summary: Compiz lxde integration bits Group: User Interface/Desktops @@ -203,8 +193,7 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1 install %SOURCE1 $RPM_BUILD_ROOT%{_bindir} install %SOURCE3 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE9 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE11 $RPM_BUILD_ROOT%{_bindir} +install %SOURCE5 $RPM_BUILD_ROOT%{_bindir} desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -214,14 +203,11 @@ desktop-file-install --vendor="" \ %SOURCE4 desktop-file-install --vendor="" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE10 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE12 + %SOURCE6 # matecompat icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps -cp -f %SOURCE13 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg +cp -f %SOURCE7 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop @@ -246,7 +232,6 @@ 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-lxde-gtk.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop @@ -286,20 +271,16 @@ fi %{_datadir}/compiz/core.xml %files mate -f mate-files.txt +%{_bindir}/gtk-window-decorator %{_bindir}/compiz-mate-emerald %{_bindir}/compiz-mate-gtk %{_datadir}/applications/compiz-mate-emerald.desktop %{_datadir}/applications/compiz-mate-gtk.desktop %{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg -%files gtk-windows-decorator -%{_bindir}/gtk-window-decorator - %files lxde %{_bindir}/compiz-lxde-emerald -%{_bindir}/compiz-lxde-gtk %{_datadir}/applications/compiz-lxde-emerald.desktop -%{_datadir}/applications/compiz-lxde-gtk.desktop %files devel %{_libdir}/pkgconfig/compiz.pc @@ -311,6 +292,9 @@ fi %changelog +* Wed May 08 2013 Wolfgang Ulbrich - 1:0.8.8-21 +- remove compiz-lxde-gtk script and desktop file + * Tue May 07 2013 Wolfgang Ulbrich - 1:0.8.8-20 - DISABLE XFCE SUPPORT - remove xfce subpackage From a79bc23c6f2f2d7e82eb8b94406927d5388a1aed Mon Sep 17 00:00:00 2001 From: raveit Date: Thu, 9 May 2013 00:17:49 +0200 Subject: [PATCH 10/11] remove compiz-lxde-gtk --- compiz-lxde-gtk | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100755 compiz-lxde-gtk diff --git a/compiz-lxde-gtk b/compiz-lxde-gtk deleted file mode 100755 index 9b90d8a..0000000 --- a/compiz-lxde-gtk +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -cd $HOME - -theme=`cat .config/lxsession/LXDE/desktop.conf | grep sNet/ThemeName | cut -d\= -f2` - -echo "$theme" - -function runCompiz() { - gtk-window-decorator --replace --marco-theme "$theme" & - exec compiz --replace --sm-disable --ignore-desktop-hints ccp $@ -} - -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 openpox-lxde -exec openbox-lxde $@ - From 4701235ac766ad9de2418b56981aca80d11f61b2 Mon Sep 17 00:00:00 2001 From: raveit Date: Thu, 9 May 2013 00:18:54 +0200 Subject: [PATCH 11/11] remove compiz-lxde-gtk.desktop --- compiz-lxde-gtk.desktop | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 compiz-lxde-gtk.desktop diff --git a/compiz-lxde-gtk.desktop b/compiz-lxde-gtk.desktop deleted file mode 100644 index 3972d54..0000000 --- a/compiz-lxde-gtk.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Compiz LXDE GTK -Comment=start or restart Compiz Fusion with GTK windows-decoator -TryExec=compiz-lxde-gtk -Exec=compiz-lxde-gtk -Icon=fusion-icon -NoDisplay=false -StartupNotify=true -Categories=Utility; -OnlyShowIn=LXDE; -Name[de_DE]=Compiz LXDE GTK