--- a/ChangeLog Thu Nov 01 19:06:59 2007 +0000
+++ b/ChangeLog Fri Nov 02 03:43:23 2007 +0000
@@ -1,3 +1,14 @@
+2007-11-01 Albert Lee <[email protected]>
+
+ * SFEemerald-themes.spec: Fix permissions
+ * SFEemerald.spec: Fix file contents, remove -root
+ * SFEtransmission.spec: Bump to 0.91, replace patch1
+ * patches/compiz-extra-01-solaris-port.diff: Drop unused patch
+ * patches/emerald-01-solaris-port.diff: Update support code
+ * patches/libcompizconfig-01-solaris-port.diff: Minor update
+ * patches/transmission-01-solaris.diff: Drop unused patch
+ * patches/transmission-01-sunpro.diff: Studio compatibility
+
2007-11-01 Brian Cameron <[email protected]>
* SFEmugshot.spec: Add SUNWpcre Requires and BuildRequires.
--- a/SFEemerald-themes.spec Thu Nov 01 19:06:59 2007 +0000
+++ b/SFEemerald-themes.spec Fri Nov 02 03:43:23 2007 +0000
@@ -8,10 +8,12 @@
%include Solaris.inc
+%define src_name emerald-themes
+
Name: SFEemerald-themes
Summary: themes for the emerald compiz window decorator
Version: 0.5.2
-Source: http://releases.compiz-fusion.org/0.5.2/emerald-themes-%{version}.tar.bz2
+Source: http://releases.compiz-fusion.org/%{version}/%{src_name}-%{version}.tar.bz2
Patch1: emerald-themes-01-solaris-port.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -19,11 +21,10 @@
# add build and runtime dependencies here:
%prep
-%setup -q -c -n %name-%version
+%setup -q -n %{src_name}-%{version}
%patch1 -p1
%build
-cd emerald-themes-%version
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
CPUS=1
@@ -42,7 +43,6 @@
make -j$CPUS
%install
-cd emerald-themes-%{version}
make install DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -51,9 +51,12 @@
%files
%defattr (0755, root, sys)
%dir %attr(0755, root, sys) %{_datadir}
-%{_datadir}/*
+%dir %attr(0755, root, other) %{_datadir}/emerald
+%{_datadir}/emerald/*
%changelog
+* Thu Nov 01 2007 - [email protected]
+- Fix permissions
* Fri Sep 11 2007 - [email protected]
- Initial spec
--- a/SFEemerald.spec Thu Nov 01 19:06:59 2007 +0000
+++ b/SFEemerald.spec Fri Nov 02 03:43:23 2007 +0000
@@ -8,10 +8,12 @@
%include Solaris.inc
+%define src_name emerald
+
Name: SFEemerald
Summary: window decorator for compiz
Version: 0.5.2
-Source: http://releases.compiz-fusion.org/0.5.2/emerald-%{version}.tar.bz2
+Source: http://releases.compiz-fusion.org/%{version}/%{src_name}-%{version}.tar.bz2
Patch1: emerald-01-solaris-port.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -20,12 +22,7 @@
BuildRequires: SFEcompiz
BuildRequires: SFEcompiz-devel
Requires: SFEcompiz
-Requires: %{name}-root
-
-%package root
-Summary: %{summary} - / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
+Requires: SUNWgnome-base-libs
%package devel
Summary: %{summary} - development files
@@ -35,11 +32,10 @@
%prep
-%setup -q -c -n %name-%version
+%setup -q -n %{src_name}-%{version}
%patch1 -p1
%build
-cd emerald-%version
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
CPUS=1
@@ -64,8 +60,37 @@
make -j$CPUS
%install
-cd emerald-%{version}
make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/emerald/engines/*.*a
+
+
+%if %build_l10n
+%else
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%post
+( echo 'test -x /usr/bin/update-desktop-database || exit 0';
+ echo '/usr/bin/update-desktop-database'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( echo 'test -x %{_bindir}/update-mime-database || exit 0';
+ echo '%{_bindir}/update-mime-database %{_datadir}/mime'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
+ echo '/usr/bin/scrollkeeper-update'
+) | $BASEDIR/lib/postrun -b -u -c JDS
+
+%postun
+( echo 'test -x /usr/bin/update-desktop-database || exit 0';
+ echo '/usr/bin/update-desktop-database'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( echo 'test -x %{_bindir}/update-mime-database || exit 0';
+ echo '%{_bindir}/update-mime-database %{_datadir}/mime'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
+ echo '/usr/bin/scrollkeeper-update'
+) | $BASEDIR/lib/postrun -b -u -c JDS
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,10 +100,29 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/*
+%{_libdir}/lib*so*
+%dir %attr (0755, root, bin) %{_libdir}/emerald
+%{_libdir}/emerald/*
%dir %attr(0755, root, sys) %{_datadir}
-%{_datadir}/*
-
+%dir %attr (0755, root, other) %{_datadir}/emerald
+%{_datadir}/emerald/*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*.desktop
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/mimetypes/
+%{_datadir}/icons/hicolor/48x48/mimetypes/*
+%dir %attr (0755, root, root) %{_datadir}/mime
+%dir %attr (0755, root, root) %{_datadir}/mime/packages
+%{_datadir}/mime/packages/*
+%dir %attr (0755, root, other) %{_datadir}/mime-info
+%{_datadir}/mime-info/*
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/*
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
%files devel
%defattr (-, root, bin)
@@ -87,7 +131,16 @@
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
%changelog
+* Thu Nov 01 2007 - [email protected]
+- Fix file contents
+- Remove -root
* Fri Sep 6 2007 - [email protected]
- Initial spec
--- a/SFEtransmission.spec Thu Nov 01 19:06:59 2007 +0000
+++ b/SFEtransmission.spec Fri Nov 02 03:43:23 2007 +0000
@@ -5,20 +5,18 @@
%define source_name transmission
Name: SFEtransmission
-Summary: Transmission - BitTorrent client
-Version: 0.82
-Source: http://download.m0k.org/transmission/files/transmission-%{version}.tar.gz
+Summary: Transmission - GTK and console BitTorrent client
+Version: 0.91
+Source: http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
URL: http://transmission.m0k.org/
-Patch1: transmission-01-solaris.diff
+Patch1: transmission-01-sunpro.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{source_name}-%{version}-build
%include default-depend.inc
BuildRequires: SUNWgnome-base-libs
BuildRequires: SUNWopenssl-include
-BuildRequires: SFElibevent
Requires: SUNWgnome-base-libs
Requires: SUNWopenssl-libraries
-Requires: SFElibevent
%if %build_l10n
%package l10n
@@ -29,9 +27,9 @@
%endif
%prep
-#%setup -q -n %{source_name}-%{version}
+%setup -q -n %{source_name}-%{version}
# temporary workaround for missing parent dir in 0.82
-%setup -q -c -n %{name}
+#%setup -q -c -n %{name}
%patch1 -p1
%build
@@ -42,7 +40,7 @@
export CFLAGS="%optflags -mt -I/usr/sfw/include"
export CXXFLAGS="%cxx_optflags -mt -I/usr/sfw/include"
-export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib -lm -lsocket -lnsl"
+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib"
./configure --prefix=%{_prefix} \
--datadir=%{_datadir} \
@@ -55,12 +53,10 @@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_prefix}/man/* $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/sfw/share/zsh
-mv $RPM_BUILD_ROOT%{_datadir}/zsh/* $RPM_BUILD_ROOT%{_prefix}/sfw/share/zsh
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zsh
+#mkdir -p $RPM_BUILD_ROOT%{_prefix}/sfw/share/zsh
+#mv $RPM_BUILD_ROOT%{_datadir}/zsh/* $RPM_BUILD_ROOT%{_prefix}/sfw/share/zsh
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/zsh
%if %build_l10n
%else
@@ -82,9 +78,10 @@
%{_datadir}/applications/*
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
-%dir %attr (0755, root, bin) %{_prefix}/sfw
-%dir %attr (0755, root, bin) %{_prefix}/sfw/share
-%{_prefix}/sfw/share/zsh
+#%dir %attr (0755, root, bin) %{_prefix}/sfw
+#%dir %attr (0755, root, bin) %{_prefix}/sfw/share
+#%{_prefix}/sfw/share/zsh
+#%{_prefix}/share/zsh
%if %build_l10n
%files l10n
@@ -95,6 +92,8 @@
%endif
%changelog
+* Thu Nov 01 2007 - [email protected]
+- Bump to 0.91, replace patch1
* Mon Sep 10 2007 - [email protected]
- Bump to 0.82
* Thu Sep 6 2007 - Petr Sobotka [email protected]
--- a/patches/compiz-extra-01-solaris-port.diff Thu Nov 01 19:06:59 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3258 +0,0 @@
-diff -Nrup8 extra-plugins-0.5.0/3d/Makefile extra-plugins-new/3d/Makefile
---- extra-plugins-0.5.0/3d/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/3d/Makefile 2007-05-31 14:31:40.457758000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = 3d
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/animation/Makefile extra-plugins-new/animation/Makefile
---- extra-plugins-0.5.0/animation/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/animation/Makefile 2007-05-31 14:31:40.821368000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = animation
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -rup ../extra-plugins-0.5.0/animation/animation.schema extra-plugins-0.5.0/animation/animation.schema
---- ../extra-plugins-0.5.0/animation/animation.schema 2007-04-07 14:07:21.000000000 +0200
-+++ extra-plugins-0.5.0/animation/animation.schema 2007-07-06 17:41:54.971994000 +0200
-@@ -1750,7 +1750,7 @@
- <applyto>/apps/compiz/plugins/animation/screen0/options/all_random</applyto>
- <owner>compiz</owner>
- <type>bool</type>
-- <default>false</default>
-+ <default>true</default>
- <locale name="C">
- <short>Random Animations For All Events</short>
- <long>All effects are chosen randomly, ignoring the selected effect. If None is selected for an event, that event won't be animated.</long>
-diff -Nrup8 extra-plugins-0.5.0/bench/Makefile extra-plugins-new/bench/Makefile
---- extra-plugins-0.5.0/bench/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/bench/Makefile 2007-05-31 14:31:40.848210000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = bench
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/bench/bench.options extra-plugins-new/bench/bench.options
---- extra-plugins-0.5.0/bench/bench.options 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/bench/bench.options 2007-06-22 10:59:33.986535000 +0800
-@@ -1,15 +1,15 @@
- <plugin name="bench">
- <display>
- <group name="Main">
- <option name="initiate" type="action">
- <short>Initiate</short>
- <long>Start benchmark</long>
-- <key>Super+F12</key>
-+ <key>Mod4+F12</key>
- </option>
- <option name="disable_limiter" type="bool">
- <short>Disable limiter</short>
- <long>Disable beryl integrated FPS limiter</long>
- <default>true</default>
- </option>
- <subgroup name="Screen Output">
- <option name="output_screen" type="bool">
-diff -Nrup8 extra-plugins-0.5.0/bench/bench_options.c extra-plugins-new/bench/bench_options.c
---- extra-plugins-0.5.0/bench/bench_options.c 2007-04-09 01:46:08.000000000 +0800
-+++ extra-plugins-new/bench/bench_options.c 2007-05-31 14:35:43.447871000 +0800
-@@ -42,16 +42,17 @@ typedef struct _BenchOptionsDisplay
-
- CompOption opt[BenchDisplayOptionNum];
- CompOption *mOpt;
- benchDisplayOptionChangeNotifyProc notify[BenchDisplayOptionNum];
- } BenchOptionsDisplay;
-
- typedef struct _BenchOptionsScreen
- {
-+ int i;
- } BenchOptionsScreen;
-
- #define BENCH_INITIATE_KEY_MODIFIERS_DEFAULT CompSuperMask
- #define BENCH_INITIATE_KEY_DEFAULT "F12"
- #define BENCH_DISABLE_LIMITER_DEFAULT TRUE
-
- #define BENCH_OUTPUT_SCREEN_DEFAULT TRUE
-
-diff -Nrup8 extra-plugins-0.5.0/bs/Makefile extra-plugins-new/bs/Makefile
---- extra-plugins-0.5.0/bs/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/bs/Makefile 2007-05-31 14:31:40.884198000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = bs
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/crashhandler/Makefile extra-plugins-new/crashhandler/Makefile
---- extra-plugins-0.5.0/crashhandler/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/crashhandler/Makefile 2007-05-31 18:09:56.125804000 +0800
-@@ -21,23 +21,23 @@
- ##
-
- DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = crashhandler
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/crashhandler/crashhandler.options extra-plugins-new/crashhandler/crashhandler.options
---- extra-plugins-0.5.0/crashhandler/crashhandler.options 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/crashhandler/crashhandler.options 2007-05-31 18:09:56.127406000 +0800
-@@ -1,21 +1,22 @@
--<plugin name="crash">
-+<plugin name="crashandler">
- <display>
- <group name="Main">
- <option name="enabled" type="bool">
- <short>Enable Crash Handler</short>
- <long>Activate Crash Handler.</long>
- <default>true</default>
- </option>
- <option name="start_wm" type="bool">
- <short>Start Other Window Manager</short>
- <long>Start other window manager on Crash.</long>
- <default>false</default>
- </option>
- <option name="wm_cmd" type="string">
- <short>Window Manager Command Line</short>
- <long>Window manager command line. DO NOT ENTER COMPIZ HERE!!!</long>
- <hints>command;</hints>
-+ <default>metacity</default>
- </option>
- </group>
- </display>
- </plugin>
-\ No newline at end of file
-diff -Nrup8 extra-plugins-0.5.0/crashhandler/crashhandler_options.c extra-plugins-new/crashhandler/crashhandler_options.c
---- extra-plugins-0.5.0/crashhandler/crashhandler_options.c 2007-04-08 00:49:36.000000000 +0800
-+++ extra-plugins-new/crashhandler/crashhandler_options.c 2007-05-31 18:09:56.127569000 +0800
-@@ -42,16 +42,17 @@ typedef struct _CrashOptionsDisplay
-
- CompOption opt[CrashDisplayOptionNum];
- CompOption *mOpt;
- crashDisplayOptionChangeNotifyProc notify[CrashDisplayOptionNum];
- } CrashOptionsDisplay;
-
- typedef struct _CrashOptionsScreen
- {
-+ int i;
- } CrashOptionsScreen;
-
- #define CRASH_ENABLED_DEFAULT TRUE
-
- #define CRASH_START_WM_DEFAULT FALSE
-
- #define CRASH_WM_CMD_DEFAULT "(null)"
-
-diff -Nrup8 extra-plugins-0.5.0/desktopclick/Makefile extra-plugins-new/desktopclick/Makefile
---- extra-plugins-0.5.0/desktopclick/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/desktopclick/Makefile 2007-05-31 14:31:40.927553000 +0800
-@@ -13,29 +13,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = desktopclick
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz` -DIMAGEDIR=\"/usr/share/compiz\"
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz` -DIMAGEDIR=\"/usr/share/compiz\"
- LDFLAGS = `pkg-config --libs x11 `
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -46,28 +46,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/fakeargb/Makefile extra-plugins-new/fakeargb/Makefile
---- extra-plugins-0.5.0/fakeargb/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/fakeargb/Makefile 2007-05-31 14:31:40.937475000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = fakeargb
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/fakeargb/fakeargb.schema extra-plugins-new/fakeargb/fakeargb.schema
---- extra-plugins-0.5.0/fakeargb/fakeargb.schema 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/fakeargb/fakeargb.schema 2007-06-22 11:06:36.396210000 +0800
-@@ -144,17 +144,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/fakeargb/allscreens/options/window_toggle_key</key>
- <applyto>/apps/compiz/plugins/fakeargb/allscreens/options/window_toggle_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>f</default>
-+ <default><Mod4>f</default>
- <locale name="C">
- <short>Toggle Window Fake ARGB</short>
- <long>Toggle Window Fake ARGB.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/fakeargb/allscreens/options/window_toggle_button</key>
-diff -Nrup8 extra-plugins-0.5.0/flash/Makefile extra-plugins-new/flash/Makefile
---- extra-plugins-0.5.0/flash/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/flash/Makefile 2007-05-31 14:31:40.963361000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = flash
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/flash/flash.schema extra-plugins-new/flash/flash.schema
---- extra-plugins-0.5.0/flash/flash.schema 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/flash/flash.schema 2007-06-22 11:07:05.271868000 +0800
-@@ -145,17 +145,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/flash/allscreens/options/initiate_key</key>
- <applyto>/apps/compiz/plugins/flash/allscreens/options/initiate_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>F5</default>
-+ <default><Mod4>F5</default>
- <locale name="C">
- <short>Initiate</short>
- <long>Start flash</long>
- </locale>
- <locale name="cs">
- <short>Iniciovat</short>
- <long>Start flash</long>
- </locale>
-diff -Nrup8 extra-plugins-0.5.0/group/Makefile extra-plugins-new/group/Makefile
---- extra-plugins-0.5.0/group/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/group/Makefile 2007-05-31 14:31:40.966740000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = group
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,94 +48,94 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/libgroup.lo: group.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/libtab.lo: tab.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/libinit.lo: init.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/liboption.lo: group_options.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/libpaint.lo: paint.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/libqueues.lo: queues.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/libselection.lo: selection.c group.h group_glow.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/libgroup.lo $(BUILDDIR)/libtab.lo $(BUILDDIR)/libinit.lo $(BUILDDIR)/liboption.lo $(BUILDDIR)/libpaint.lo $(BUILDDIR)/libqueues.lo $(BUILDDIR)/libselection.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/group/group.options extra-plugins-new/group/group.options
---- extra-plugins-0.5.0/group/group.options 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/group/group.options 2007-06-22 11:08:28.519879000 +0800
-@@ -1,69 +1,69 @@
- <plugin name="group">
- <display>
- <group name="Selection">
- <subgroup name="Key bindings">
- <option name="select" type="action">
- <short>Select</short>
- <long>The key for starting selecting windows.</long>
-- <button>Super+Button1</button>
-+ <button>Mod4+Button1</button>
- </option>
- <option name="select_single" type="action">
- <short>Select Single Window</short>
- <long>The key for selecting the current window.</long>
-- <key>Super+s</key>
-+ <key>Mod4+s</key>
- </option>
- </subgroup>
- </group>
- <group name="Grouping">
- <subgroup name="Key bindings">
- <option name="group" type="action">
- <short>Group Windows</short>
- <long>The key for grouping windows.</long>
-- <key>Super+g</key>
-+ <key>Mod4+g</key>
- </option>
- <option name="ungroup" type="action">
- <short>Ungroup Windows</short>
- <long>The key for ungrouping the current group.</long>
-- <key>Super+u</key>
-+ <key>Mod4+u</key>
- </option>
- <option name="remove" type="action">
- <short>Remove Group Window</short>
- <long>The key for removing the selected window from its group.</long>
-- <key>Super+r</key>
-+ <key>Mod4+r</key>
- </option>
- <option name="close" type="action">
- <short>Close Group</short>
- <long>The key for closing all windows in the group.</long>
-- <key>Super+c</key>
-+ <key>Mod4+c</key>
- </option>
- <option name="ignore" type="action">
- <short>Ignore Group</short>
- <long>The key for ignoring the group. If this key is pressed, you can do actions for a single window in the group only.</long>
-- <key>Super+x</key>
-+ <key>Mod4+x</key>
- </option>
- </subgroup>
- </group>
- <group name="Tabbing">
- <subgroup name="Key bindings">
- <option name="tabmode" type="action">
- <short>Tab Group</short>
- <long>The key for toggling the tab mode for the current group.</long>
-- <key>Super+t</key>
-+ <key>Mod4+t</key>
- </option>
- <option name="change_tab_left" type="action">
- <short>Change Tab Left</short>
- <long>The key for switching to the tab left of the current one.</long>
-- <key>Super+Left</key>
-+ <key>Mod4+Left</key>
- </option>
- <option name="change_tab_right" type="action">
- <short>Change Tab Right</short>
- <long>The key for switching to the tab right of the current one.</long>
-- <key>Super+Right</key>
-+ <key>Mod4+Right</key>
- </option>
- </subgroup>
- </group>
- <group name="Glow">
- <subgroup name="Key bindings">
- <option name="change_color" type="action">
- <short>Glow Color Change</short>
- <long>If you don't like the current glow color, you can change it with this key.</long>
-diff -Nrup8 extra-plugins-0.5.0/jpeg/Makefile extra-plugins-new/jpeg/Makefile
---- extra-plugins-0.5.0/jpeg/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/jpeg/Makefile 2007-06-22 11:31:59.107879000 +0800
-@@ -13,29 +13,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = jpeg
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -ggdb3 -O0 -Wall `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11` -ljpeg
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -46,28 +46,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/jpeg/jpeg.c extra-plugins-new/jpeg/jpeg.c
---- extra-plugins-0.5.0/jpeg/jpeg.c 2007-04-07 20:12:49.000000000 +0800
-+++ extra-plugins-new/jpeg/jpeg.c 2007-06-19 15:57:41.126384000 +0800
-@@ -283,17 +283,17 @@ static Bool JPEGFileToImage(CompDisplay
- if (!filename)
- return FALSE;
-
- // Do some testing here to see if it's got a .jpg or .jpeg extension
- // TODO: fix for mixed & uppercase extensions!
- char *extension = strrchr(filename, '.');
- if (extension)
- {
-- extension++; /* we want the char after the dot */
-+ /*extension++; we want the char after the dot */
- if (strcasecmp(extension, ".jpeg") == 0 ||
- strcasecmp(extension, ".jpg") == 0)
- {
- FILE *file = fopen(filename, "rb");
- if (file)
- {
- status = readJPEGFileToImage(file, width, height, data);
- fclose(file);
-diff -Nrup8 extra-plugins-0.5.0/kiosk/Makefile extra-plugins-new/kiosk/Makefile
---- extra-plugins-0.5.0/kiosk/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/kiosk/Makefile 2007-05-31 14:31:41.022025000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = kiosk
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/mblur/Makefile extra-plugins-new/mblur/Makefile
---- extra-plugins-0.5.0/mblur/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/mblur/Makefile 2007-05-31 14:31:41.058457000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = mblur
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/mousegestures/Makefile extra-plugins-new/mousegestures/Makefile
---- extra-plugins-0.5.0/mousegestures/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/mousegestures/Makefile 2007-05-31 14:31:41.062276000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = mousegestures
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/mousegestures/mousegestures.schema extra-plugins-new/mousegestures/mousegestures.schema
---- extra-plugins-0.5.0/mousegestures/mousegestures.schema 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/mousegestures/mousegestures.schema 2007-06-22 11:12:38.272730000 +0800
-@@ -208,17 +208,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/mousegestures/allscreens/options/initiate_button</key>
- <applyto>/apps/compiz/plugins/mousegestures/allscreens/options/initiate_button</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Shift><Super>Button3</default>
-+ <default><Mod4><Shift>Button3</default>
- <locale name="C">
- <short>Initiate</short>
- <long>Initiate the gesture</long>
- </locale>
- <locale name="cs">
- <short>Iniciovat</short>
- <long>Initiate the gesture</long>
- </locale>
-diff -Nrup8 extra-plugins-0.5.0/neg/Makefile extra-plugins-new/neg/Makefile
---- extra-plugins-0.5.0/neg/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/neg/Makefile 2007-05-31 14:31:41.065551000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = neg
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g `pkg-config --cflags x11 compiz cairo-xlib-xrender dbus-1 glib-2.0`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/neg/neg.options extra-plugins-new/neg/neg.options
---- extra-plugins-0.5.0/neg/neg.options 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/neg/neg.options 2007-06-22 11:13:08.404781000 +0800
-@@ -1,19 +1,19 @@
- <plugin name="neg">
- <display>
- <option name="window_toggle" type="action">
- <short>Toggle Window Negative</short>
- <long>Toggle active window negative</long>
-- <key>Super+n</key>
-+ <key>Mod4+n</key>
- </option>
- <option name="screen_toggle" type="action">
- <short>Toggle Screen Negative</short>
- <long>Toggle screen negative</long>
-- <key>Super+m</key>
-+ <key>Mod4+m</key>
- </option>
- </display>
- <screen>
- <option name="exclude_match" type="match">
- <short>Exclude Windows</short>
- <long>Windows to exclude from negating</long>
- <default>Type=Desktop</default>
- </option>
-diff -Nrup8 extra-plugins-0.5.0/neg/neg.schemas extra-plugins-new/neg/neg.schemas
---- extra-plugins-0.5.0/neg/neg.schemas 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/neg/neg.schemas 2007-06-21 16:16:59.456709000 +0800
-@@ -141,17 +141,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/neg/allscreens/options/window_toggle_key</key>
- <applyto>/apps/compiz/plugins/neg/allscreens/options/window_toggle_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>n</default>
-+ <default><Shift>n</default>
- <locale name="C">
- <short>Toggle Negative</short>
- <long>Toggle Window Negative</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/neg/allscreens/options/window_toggle_button</key>
-@@ -190,17 +190,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/neg/allscreens/options/screen_toggle_key</key>
- <applyto>/apps/compiz/plugins/neg/allscreens/options/screen_toggle_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>m</default>
-+ <default><Shift>m</default>
- <locale name="C">
- <short>Toggle Negative</short>
- <long>Toggle Screen Negative</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/neg/allscreens/options/screen_toggle_button</key>
-diff -Nrup8 extra-plugins-0.5.0/opacify/Makefile extra-plugins-new/opacify/Makefile
---- extra-plugins-0.5.0/opacify/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/opacify/Makefile 2007-05-31 14:31:41.092387000 +0800
-@@ -14,30 +14,30 @@
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # Originally ported for compiz by mikedee.
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = opacify
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -60,28 +60,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/opacify/opacify.schema extra-plugins-new/opacify/opacify.schema
---- extra-plugins-0.5.0/opacify/opacify.schema 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/opacify/opacify.schema 2007-06-22 11:13:39.063170000 +0800
-@@ -144,17 +144,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/opacify/allscreens/options/toggle_key</key>
- <applyto>/apps/compiz/plugins/opacify/allscreens/options/toggle_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>o</default>
-+ <default><Mod4>o</default>
- <locale name="C">
- <short>Toggle Opacify</short>
- <long>Use this to enable/disable opacify on the fly. Previously opacified windows will not be reset once you disable it like this.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/opacify/allscreens/options/toggle_button</key>
-diff -Nrup8 extra-plugins-0.5.0/put/Makefile extra-plugins-new/put/Makefile
---- extra-plugins-0.5.0/put/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/put/Makefile 2007-06-22 11:46:03.043093000 +0800
-@@ -1,27 +1,27 @@
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
-
- PLUGIN = put
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
--CFLAGS = -Wall `pkg-config --cflags compiz`
-+CFLAGS = -g -w `pkg-config --cflags compiz`
- LDFLAGS = `pkg-config --libs compiz`
-
- %.lo: %.c
-- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-
- %.la: $(PLUGIN).lo
-- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-
- all: lib$(PLUGIN).la
-
- install: lib$(PLUGIN).la
-- $(LIBTOOL) --mode=install $(INSTALL) lib$(PLUGIN).la \
-+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) lib$(PLUGIN).la \
- $(DESTDIR)/lib$(PLUGIN).la
-
- clean:
- rm -rf *.lo *.o lib$(PLUGIN).* .libs
-
-
-diff -Nrup8 extra-plugins-0.5.0/put/put.schema extra-plugins-new/put/put.schema
---- extra-plugins-0.5.0/put/put.schema 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/put/put.schema 2007-06-22 10:57:14.295060000 +0800
-@@ -149,17 +149,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_center_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_center_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Begin</default>
-+ <default><Mod4>KP_Begin</default>
- <locale name="C">
- <short>Put Center</short>
- <long>Move window to the center</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_center_button</key>
-@@ -198,17 +198,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_left_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_left_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Left</default>
-+ <default><Mod4>KP_Left</default>
- <locale name="C">
- <short>Put Left</short>
- <long>Move window to the center of the left edge</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_left_button</key>
-@@ -247,17 +247,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_left_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_top_left_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Home</default>
-+ <default><Mod4>KP_Home</default>
- <locale name="C">
- <short>Put Top Left</short>
- <long>Move Window to the top left corner</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_left_button</key>
-@@ -296,17 +296,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_top_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Up</default>
-+ <default><Mod4>KP_Up</default>
- <locale name="C">
- <short>Put Top</short>
- <long>Move window to the center of the top edge</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_button</key>
-@@ -345,17 +345,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_right_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_top_right_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Prior</default>
-+ <default><Mod4>KP_Prior</default>
- <locale name="C">
- <short>Put Top Right</short>
- <long>Move window to the top right corner</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_top_right_button</key>
-@@ -394,17 +394,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_right_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_right_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Right</default>
-+ <default><Mod4>KP_Right</default>
- <locale name="C">
- <short>Put Right</short>
- <long>Move window to the center of the right edge</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_right_button</key>
-@@ -443,17 +443,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_right_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_bottom_right_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Next</default>
-+ <default><Mod4>KP_Next</default>
- <locale name="C">
- <short>Put Bottom Right</short>
- <long>Move window to the bottom right corner</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_right_button</key>
-@@ -492,17 +492,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_bottom_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Down</default>
-+ <default><Mod4>KP_Down</default>
- <locale name="C">
- <short>Put Bottom</short>
- <long>Move window to the center of the bottom edge</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_button</key>
-@@ -541,17 +541,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_left_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_bottom_left_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_End</default>
-+ <default><Mod4>KP_End</default>
- <locale name="C">
- <short>Put Bottom Left</short>
- <long>Move window to the bottom left corner</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_bottom_left_button</key>
-@@ -590,17 +590,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_restore_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_restore_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>KP_Insert</default>
-+ <default><Mod4>KP_Insert</default>
- <locale name="C">
- <short>Restore Position</short>
- <long>Move window to the last position</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_restore_button</key>
-@@ -1423,17 +1423,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_pointer_key</key>
- <applyto>/apps/compiz/plugins/put/allscreens/options/put_pointer_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>z</default>
-+ <default><Mod4>z</default>
- <locale name="C">
- <short>Put Pointer</short>
- <long>Move window to the pointer position using screen quadrant</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/put/allscreens/options/put_pointer_button</key>
-diff -Nrup8 extra-plugins-0.5.0/quickchange/Makefile extra-plugins-new/quickchange/Makefile
---- extra-plugins-0.5.0/quickchange/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/quickchange/Makefile 2007-05-31 14:31:41.098416000 +0800
-@@ -13,31 +13,31 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
--IMAGEDIR = $(HOME)/.compiz/images
-+#DESTDIR = /usr/lib/compiz
-+#IMAGEDIR = /usr/share/compiz
- PLUGIN = quickchange
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -60,28 +60,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -DIMAGEDIR=\"$(IMAGEDIR)\" -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -DIMAGEDIR=\"$(IMAGEDIR)\" -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/quickchange/quickchange.schema extra-plugins-new/quickchange/quickchange.schema
---- extra-plugins-0.5.0/quickchange/quickchange.schema 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/quickchange/quickchange.schema 2007-06-22 11:14:11.912925000 +0800
-@@ -143,17 +143,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/quickchange/allscreens/options/cube_size_up_key</key>
- <applyto>/apps/compiz/plugins/quickchange/allscreens/options/cube_size_up_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Control><Super>KP_Add</default>
-+ <default><Control><Mod4>KP_Add</default>
- <locale name="C">
- <short>Increase cube horizontal size (ie. number of faces)</short>
- <long>Increase cube horizontal size (ie. number of faces)</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/quickchange/allscreens/options/cube_size_up_button</key>
-@@ -204,17 +204,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/quickchange/allscreens/options/cube_size_down_key</key>
- <applyto>/apps/compiz/plugins/quickchange/allscreens/options/cube_size_down_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Control><Super>KP_Subtract</default>
-+ <default><Control><Mod4>KP_Subtract</default>
- <locale name="C">
- <short>Decrease cube horizontal size (ie. number of faces)</short>
- <long>Decrease cube horizontal size (ie. number of faces)</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/quickchange/allscreens/options/cube_size_down_button</key>
-diff -Nrup8 extra-plugins-0.5.0/reflex/Makefile extra-plugins-new/reflex/Makefile
---- extra-plugins-0.5.0/reflex/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/reflex/Makefile 2007-05-31 14:31:41.101756000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = reflex
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/resize/Makefile extra-plugins-new/resize/Makefile
---- extra-plugins-0.5.0/resize/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/resize/Makefile 2007-05-31 14:31:41.104833000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = ~/.compiz/plugins
-+DESTDIR = /export/home/chi/.compiz/plugins
- PLUGIN = resize
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/ring/Makefile extra-plugins-new/ring/Makefile
---- extra-plugins-0.5.0/ring/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/ring/Makefile 2007-05-31 14:31:41.107883000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = ring
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/ring/ring.options extra-plugins-new/ring/ring.options
---- extra-plugins-0.5.0/ring/ring.options 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/ring/ring.options 2007-06-22 11:15:36.593111000 +0800
-@@ -1,30 +1,30 @@
- <plugin name="ring">
- <display>
- <group name="Key bindings">
- <option name="next" type="action">
- <short>Next Window</short>
- <long>Show switcher if not visible and select next window.</long>
-- <key>Super+Tab</key>
-+ <key>Mod4+Tab</key>
- </option>
- <option name="prev" type="action">
- <short>Previous Window</short>
- <long>Show switcher if not visible and select previous window.</long>
-- <key>Super+Shift+Tab</key>
-+ <key>Mod4+Shift+Tab</key>
- </option>
- <option name="next_all" type="action">
- <short>Next Window (All Workspaces)</short>
- <long>Show switcher if not visible and select next window out of all windows.</long>
-- <key>Super+Alt+Tab</key>
-+ <key>Control+Alt+Tab</key>
- </option>
- <option name="prev_all" type="action">
- <short>Previous Window (All Workspaces)</short>
- <long>Show switcher if not visible and select previous window out of all windows.</long>
-- <key>Super+Shift+Alt+Tab</key>
-+ <key>Mod4+Shift+Alt+Tab</key>
- </option>
- <option name="next_group" type="action">
- <short>Next Window (Group)</short>
- <long>Show switcher if not visible and select next window of the current application.</long>
- </option>
- <option name="prev_group" type="action">
- <short>Previous Window (Group)</short>
- <long>Show switcher if not visible and select previous window of the current application.</long>
-diff -Nrup8 extra-plugins-0.5.0/screensaver/Makefile extra-plugins-new/screensaver/Makefile
---- extra-plugins-0.5.0/screensaver/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/screensaver/Makefile 2007-05-31 14:31:41.122026000 +0800
-@@ -16,32 +16,32 @@
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
- WM = compiz
-
--DESTDIR = $(HOME)/.$(WM)/plugins
-+#DESTDIR = $(HOME)/.$(WM)/plugins
- PLUGIN = screensaver
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
- DEFINE := $(shell if [ $(WM) = "compiz" ]; then echo "COMPIZ"; else echo "BERYL"; fi)
- IMAGE_INSTALL_DIR := $(shell if [ $(WM) = "compiz" ]; then echo "csm"; else echo "/usr/share/bsm/images/beryl-settings-section-screensaver.svg"; fi)
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 $(WM)` -DIMAGEDIR=\"/usr/share/$(WM)\" -D$(DEFINE)
-+CFLAGS = -g -w `pkg-config --cflags x11 $(WM)`
- LDFLAGS = `pkg-config --libs x11 `
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -52,36 +52,36 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @if [ "$$MODE" == 'noXExt' ]; then \
-- $(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -DNO_X_EXTENSION -c -o $@ $<; \
-+ @if [ "$$MODE" = 'noXExt' ]; then \
-+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -DNO_X_EXTENSION -D$(DEFINE) -c -o $@ $<; \
- else \
-- $(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<; \
-+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -D$(DEFINE) -c -o $@ $<; \
- fi
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @if [ "$$MODE" == 'noXExt' ]; then \
-- $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<; \
-+ @if [ "$$MODE" = 'noXExt' ]; then \
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<; \
- else \
-- $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -lXss -lXext -rpath $(DESTDIR) -o $@ $<; \
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -lXss -lXext -rpath $(DESTDIR) -o $@ $<; \
- fi
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
-diff -Nrup8 extra-plugins-0.5.0/screensaver/screensaver.schema extra-plugins-new/screensaver/screensaver.schema
---- extra-plugins-0.5.0/screensaver/screensaver.schema 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/screensaver/screensaver.schema 2007-06-22 11:16:44.364830000 +0800
-@@ -54,17 +54,17 @@ Choose a time in ms between 100 and 1000
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/screensaver/allscreens/options/hotkey_key</key>
- <applyto>/apps/compiz/plugins/screensaver/allscreens/options/hotkey_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>F2</default>
-+ <default><Mod4>F2</default>
- <locale name="C">
- <short>The Screensaver hotkey</short>
- <long>Define a hotkey which initate the screensaver</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/screensaver/allscreens/options/hotkey_button</key>
-@@ -118,17 +118,17 @@ Choose a time in ms between 100 and 1000
- <schema>
- <key>/schemas/apps/compiz/plugins/screensaver/allscreens/options/slow_mode</key>
- <applyto>/apps/compiz/plugins/screensaver/allscreens/options/slow_mode</applyto>
- <owner>compiz</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Use Slow-Mode</short>
-- <long>Use Slow-Mode while rotate the cube, the same as Shift+F10</long>
-+ <long>Use Slow-Mode while rotate the cube, the same as Mod4+F10</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/screensaver/allscreens/options/rain</key>
- <applyto>/apps/compiz/plugins/screensaver/allscreens/options/rain</applyto>
- <owner>compiz</owner>
- <type>bool</type>
-diff -Nrup8 extra-plugins-0.5.0/showdesktop/Makefile extra-plugins-new/showdesktop/Makefile
---- extra-plugins-0.5.0/showdesktop/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/showdesktop/Makefile 2007-05-31 14:31:41.125254000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = showdesktop
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/snap/Makefile extra-plugins-new/snap/Makefile
---- extra-plugins-0.5.0/snap/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/snap/Makefile 2007-05-31 14:31:41.128451000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = snap
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/snow/Makefile extra-plugins-new/snow/Makefile
---- extra-plugins-0.5.0/snow/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/snow/Makefile 2007-05-31 14:31:41.131653000 +0800
-@@ -13,31 +13,31 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
--IMAGEDIR = $(HOME)/.compiz/images
-+#DESTDIR = /usr/lib/compiz
-+IMAGEDIR = /usr/share/compiz
- PLUGIN = snow
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -60,28 +60,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -DIMAGEDIR=\"$(IMAGEDIR)\" -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -DIMAGEDIR=\"$(IMAGEDIR)\" -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/snow/snow.schema extra-plugins-new/snow/snow.schema
---- extra-plugins-0.5.0/snow/snow.schema 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/snow/snow.schema 2007-06-22 11:17:29.177750000 +0800
-@@ -284,17 +284,17 @@
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/snow/allscreens/options/initiate_key</key>
- <applyto>/apps/compiz/plugins/snow/allscreens/options/initiate_key</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default><Super>F3</default>
-+ <default><Mod4>F3</default>
- <locale name="C">
- <short>snow toggle key</short>
- <long>snow toggle key</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/snow/allscreens/options/initiate_button</key>
-@@ -394,17 +394,17 @@
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/snow/allscreens/options/snow_textures</key>
- <applyto>/apps/compiz/plugins/snow/allscreens/options/snow_textures</applyto>
- <owner>compiz</owner>
- <type>list</type>
- <list_type>string</list_type>
-- <default>[/home/mike/.compiz/images/snowflake2.png]</default>
-+ <default>[/usr/share/compiz/snowflake_2.png]</default>
- <locale name="C">
- <short>Snow Textures</short>
- <long>Snow textures</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/compiz/plugins/snow/allscreens/options/snow_direction</key>
-diff -Nrup8 extra-plugins-0.5.0/splash/Makefile extra-plugins-new/splash/Makefile
---- extra-plugins-0.5.0/splash/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/splash/Makefile 2007-05-31 14:31:41.162268000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = splash
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/splash/splash_options.c extra-plugins-new/splash/splash_options.c
---- extra-plugins-0.5.0/splash/splash_options.c 2007-04-09 01:53:52.000000000 +0800
-+++ extra-plugins-new/splash/splash_options.c 2007-05-31 14:39:00.451337000 +0800
-@@ -42,16 +42,17 @@ typedef struct _SplashOptionsDisplay
-
- CompOption opt[SplashDisplayOptionNum];
- CompOption *mOpt;
- splashDisplayOptionChangeNotifyProc notify[SplashDisplayOptionNum];
- } SplashOptionsDisplay;
-
- typedef struct _SplashOptionsScreen
- {
-+ int i;
- } SplashOptionsScreen;
-
- #define SPLASH_INITIATE_KEY_MODIFIERS_DEFAULT ControlMask
- #define SPLASH_INITIATE_KEY_DEFAULT "F11"
- #define SPLASH_FIRSTSTART_DEFAULT TRUE
-
- #define SPLASH_BACKGROUND_DEFAULT "/data/splash_background.png"
-
-diff -Nrup8 extra-plugins-0.5.0/thumbnail/Makefile extra-plugins-new/thumbnail/Makefile
---- extra-plugins-0.5.0/thumbnail/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/thumbnail/Makefile 2007-05-31 14:31:41.204886000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = thumbnail
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/thumbnail/thumbnail.options extra-plugins-new/thumbnail/thumbnail.options
---- extra-plugins-0.5.0/thumbnail/thumbnail.options 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/thumbnail/thumbnail.options 2007-05-31 14:38:37.584627000 +0800
-@@ -1,9 +1,9 @@
--<plugin name="thumb">
-+<plugin name="thumbnail">
- <screen>
- <group name="Settings">
- <option name="thumb_size" type="int">
- <short>Thumbnail Window Size</short>
- <long>Thumbnail window size.</long>
- <min>50</min>
- <max>1500</max>
- <default>200</default>
-diff -Nrup8 extra-plugins-0.5.0/thumbnail/thumbnail_options.c extra-plugins-new/thumbnail/thumbnail_options.c
---- extra-plugins-0.5.0/thumbnail/thumbnail_options.c 2007-04-09 01:54:17.000000000 +0800
-+++ extra-plugins-new/thumbnail/thumbnail_options.c 2007-05-31 17:51:23.851170000 +0800
-@@ -24,17 +24,16 @@ static int displayPrivateIndex;
- static CompPluginVTable *thumbPluginVTable = NULL;
- CompPluginVTable thumbOptionsVTable;
-
- #define GET_THUMB_OPTIONS_DISPLAY(d) \
- ((ThumbOptionsDisplay *) (d)->privates[displayPrivateIndex].ptr)
-
- #define THUMB_OPTIONS_DISPLAY(d) \
- ThumbOptionsDisplay *od = GET_THUMB_OPTIONS_DISPLAY (d)
--
- #define GET_THUMB_OPTIONS_SCREEN(s, od) \
- ((ThumbOptionsScreen *) (s)->privates[(od)->screenPrivateIndex].ptr)
-
- #define THUMB_OPTIONS_SCREEN(s) \
- ThumbOptionsScreen *os = GET_THUMB_OPTIONS_SCREEN (s, GET_THUMB_OPTIONS_DISPLAY (s->display))
-
- typedef struct _ThumbOptionsDisplay
- {
-diff -Nrup8 extra-plugins-0.5.0/tile/Makefile extra-plugins-new/tile/Makefile
---- extra-plugins-0.5.0/tile/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/tile/Makefile 2007-05-31 14:31:41.223517000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = tile
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender`
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/tile/tile.options extra-plugins-new/tile/tile.options
---- extra-plugins-0.5.0/tile/tile.options 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/tile/tile.options 2007-06-22 11:18:34.929827000 +0800
-@@ -59,28 +59,28 @@
- </option>
- <option name="tile_horizontally" type="action">
- <short>Tile Windows Horizontally</short>
- <long>Move and resize all visible windows so that they have full width, same height and occupy whole screen.</long>
- </option>
- <option name="tile_tile" type="action">
- <short>Tile Windows</short>
- <long>Move and resize all visible windows both vertically and horizontally, so that the occupy whole screen and are in a grid.</long>
-- <key>Super+Shift+a</key>
-+ <key>Mod4+Shift+a</key>
- </option>
- <option name="tile_cascade" type="action">
- <short>Cascade Windows</short>
- <long>Move and resize all visible windows with the delta value set for cascading.</long>
-- <key>Super+Shift+s</key>
-+ <key>Mod4+Shift+s</key>
- </option>
- <option name="tile_restore" type="action">
- <short>Restore Windows</short>
- <long>Restore windows to their original position they had before tiling.</long>
-- <key>Super+Shift+z</key>
-+ <key>Mod4+Shift+z</key>
- </option>
- <option name="tile_toggle" type="action">
- <short>Toggle Tiling</short>
- <long>Toggle between tile and restore</long>
-- <key>Super+Shift+x</key>
-+ <key>Mod4+Shift+x</key>
- </option>
- </group>
- </display>
- </plugin>
-diff -Nrup8 extra-plugins-0.5.0/tile/tile_options.c extra-plugins-new/tile/tile_options.c
---- extra-plugins-0.5.0/tile/tile_options.c 2007-04-09 01:54:39.000000000 +0800
-+++ extra-plugins-new/tile/tile_options.c 2007-05-31 14:39:14.940501000 +0800
-@@ -44,16 +44,17 @@ typedef struct _TileOptionsDisplay
- CompOption *mOpt;
- tileDisplayOptionChangeNotifyProc notify[TileDisplayOptionNum];
- TileAnimateTypeEnum animate_type;
- TileTileToggleTypeEnum tile_toggle_type;
- } TileOptionsDisplay;
-
- typedef struct _TileOptionsScreen
- {
-+ int i;
- } TileOptionsScreen;
-
- static const char *tileAnimateType[] = {
- N_("None"),
- N_("Filled Outline"),
- N_("Slide"),
- N_("Zoom"),
- N_("Drop From Top"),
-diff -Nrup8 extra-plugins-0.5.0/trailfocus/Makefile extra-plugins-new/trailfocus/Makefile
---- extra-plugins-0.5.0/trailfocus/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/trailfocus/Makefile 2007-05-31 14:31:41.226634000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = trailfocus
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/wall/Makefile extra-plugins-new/wall/Makefile
---- extra-plugins-0.5.0/wall/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/wall/Makefile 2007-05-31 14:31:41.232756000 +0800
-@@ -15,29 +15,29 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = $(HOME)/.compiz/plugins
- PLUGIN = wall
- SHADER = no
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--CFLAGS = -g -Wall `pkg-config --cflags x11 compiz cairo-xlib-xrender`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz cairo-xlib-xrender`
- LDFLAGS = `pkg-config --libs x11 cairo-xlib-xrender` -lGLU
-
- headers := $(shell find -name '$(PLUGIN)*.h' 2> /dev/null | sed -e 's/^.\///')
- headers := $(filter-out $(PLUGIN)_shader.h,$(headers))
-
- color := $(shell if [ $$TERM = "dumb" ]; then echo "no"; else echo "yes"; fi)
-
- .PHONY:
-@@ -48,39 +48,39 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN)_options.lo: $(PLUGIN)_options.c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(PLUGIN)_options.h
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling\033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo $(BUILDDIR)/lib$(PLUGIN)_options.lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $^
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/wall/wall.options extra-plugins-new/wall/wall.options
---- extra-plugins-0.5.0/wall/wall.options 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/wall/wall.options 2007-06-22 11:19:28.753338000 +0800
-@@ -1,15 +1,15 @@
- <plugin name="wall">
- <display>
- <group name="Misc. Settings">
- <option name="expo" type="action">
- <short>Expo</short>
- <long>Engage wall expo mode</long>
-- <key>Super+e</key>
-+ <key>Mod4+e</key>
- <edge>topleft</edge>
- </option>
- <option name="rotate" type="bool">
- <short>Rotate Wall</short>
- <long>Rotate wall in expo mode</long>
- <default>false</default>
- </option>
- <option name="slide_duration" type="float">
-@@ -25,17 +25,17 @@
- <long>Animation used when switching to expo mode</long>
- <value name="Zoom" default="true">Zoom</value>
- <value name="FadeZoom">Fade + Zoom</value>
- <value name="Vortex">Vortex</value>
- </option>
- <option name="sticky" type="action">
- <short>Sticky</short>
- <long>Engage wall sticky mode</long>
-- <key>Super+Alt+s</key>
-+ <key>Mod4+Alt+s</key>
- </option>
- <option name="mipmaps" type="bool">
- <short>Mipmaps</short>
- <long>Generate mipmaps in expo mode</long>
- <default>false</default>
- </option>
- <option name="aspect_ratio" type="float">
- <short>Expo Mode Aspect Ratio</short>
-diff -Nrup8 extra-plugins-0.5.0/wallpaper/Makefile extra-plugins-new/wallpaper/Makefile
---- extra-plugins-0.5.0/wallpaper/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/wallpaper/Makefile 2007-05-31 14:31:41.277086000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = wallpaper
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz dbus-1`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz dbus-1`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz dbus-1`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz dbus-1`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/widget/Makefile extra-plugins-new/widget/Makefile
---- extra-plugins-0.5.0/widget/Makefile 2007-04-07 20:07:20.000000000 +0800
-+++ extra-plugins-new/widget/Makefile 2007-05-31 14:31:41.280263000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = widget
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
-diff -Nrup8 extra-plugins-0.5.0/winrules/Makefile extra-plugins-new/winrules/Makefile
---- extra-plugins-0.5.0/winrules/Makefile 2007-04-07 20:07:21.000000000 +0800
-+++ extra-plugins-new/winrules/Makefile 2007-05-31 14:31:41.300864000 +0800
-@@ -13,30 +13,30 @@
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- ##
-
--DESTDIR = $(HOME)/.compiz/plugins
-+#DESTDIR = /usr/lib/compiz
- PLUGIN = winrules
- SHADER = yes
-
- BUILDDIR = build
-
--CC = gcc
-+CC = cc
- LIBTOOL = libtool
- INSTALL = install
-
- CGC = /usr/bin/cgc
-
--#CFLAGS = -g -Wall `pkg-config --cflags x11 compiz`
--CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
-+CFLAGS = -g -w `pkg-config --cflags x11 compiz`
-+#CFLAGS = -g -Wall -DGL_DEBUG `pkg-config --cflags x11 compiz`
- LDFLAGS = `pkg-config --libs x11 `
-
- vert-shaders := $(patsubst %.vcg,%.vert,$(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///'))
- frag-shaders := $(patsubst %.fcg,%.frag,$(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///'))
-
- shader_files := $(shell find -name '*.vcg' 2> /dev/null | sed -e 's/^.\///')
- shader_files += $(shell find -name '*.fcg' 2> /dev/null | sed -e 's/^.\///')
-
-@@ -59,28 +59,28 @@ $(BUILDDIR) :
- @mkdir $(BUILDDIR)
-
- $(BUILDDIR)/lib$(PLUGIN).lo: $(PLUGIN).c $(headers) $(shader_header)
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mcompiling \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "compiling : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
- fi
-
- $(BUILDDIR)/lib$(PLUGIN).la: $(BUILDDIR)/lib$(PLUGIN).lo
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5mlinking \033[0;1;37m: \033[0;32m$< \033[0;1;37m-> \033[0;31m$@\033[0m"; \
- else \
- echo "linking : $< -> $@"; \
- fi
-- @$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
-+ @$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $<
- @if [ '$(color)' != 'no' ]; then \
- echo -e "\r\033[0mlinking : \033[34m$< -> $@\033[0m"; \
- fi
-
- install: all
- @if [ '$(color)' != 'no' ]; then \
- echo -n -e "\033[0;1;5minstall \033[0;1;37m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
- else \
--- a/patches/emerald-01-solaris-port.diff Thu Nov 01 19:06:59 2007 +0000
+++ b/patches/emerald-01-solaris-port.diff Fri Nov 02 03:43:23 2007 +0000
@@ -1,37 +1,26 @@
-diff -rup tmp/emerald-0.5.2/configure.ac emerald-0.5.2/configure.ac
---- tmp/emerald-0.5.2/configure.ac 2007-08-12 23:00:01.000000000 +0200
-+++ emerald-0.5.2/configure.ac 2007-09-06 11:43:04.894494000 +0200
+diff -urN emerald-0.5.2.orig/configure.ac emerald-0.5.2/configure.ac
+--- emerald-0.5.2.orig/configure.ac 2007-08-12 17:00:01.000000000 -0400
++++ emerald-0.5.2/configure.ac 2007-11-01 20:58:11.397594288 -0400
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT([emerald],esyscmd(. ./VERSION;echo -n $VERSION), [[email protected]])
-+AC_INIT([emerald],0.5.2, [[email protected]])
++AC_INIT([emerald],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [[email protected]])
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
-@@ -76,6 +76,18 @@ AC_PATH_PROG(UPDATE_MIME_DATABASE, updat
- AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
- AC_PATH_PROG(UPDATE_ICON_CACHE, gtk-update-icon-cache)
+@@ -19,6 +19,7 @@
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
++AC_CHECK_FUNCS(strverscmp)
-+compiling_on_solaris=no
-+case "$host" in
-+ *-*-solaris*)
-+ AC_MSG_CHECKING(if compiling on Solaris)
-+ compiling_on_solaris=yes
-+ AC_MSG_RESULT($compiling_on_solaris)
-+ AC_DEFINE(SOLARIS, 1, [Compiling on Solaris])
-+ ;;
-+esac
-+
-+
-+
- AC_OUTPUT([
- libengine/emeraldengine.pc
- Makefile
-diff -rup tmp/emerald-0.5.2/engines/line.c emerald-0.5.2/engines/line.c
---- tmp/emerald-0.5.2/engines/line.c 2007-08-12 23:00:01.000000000 +0200
-+++ emerald-0.5.2/engines/line.c 2007-09-06 11:18:14.235338000 +0200
-@@ -45,6 +45,7 @@ typedef struct _private_fs
+ enginesdir=$libdir/emerald/engines
+ AC_SUBST(enginesdir)
+diff -urN emerald-0.5.2.orig/engines/line.c emerald-0.5.2/engines/line.c
+--- emerald-0.5.2.orig/engines/line.c 2007-08-12 17:00:01.000000000 -0400
++++ emerald-0.5.2/engines/line.c 2007-11-01 20:44:46.895838033 -0400
+@@ -45,6 +45,7 @@
*/
typedef struct _private_ws
{
@@ -39,102 +28,139 @@
} private_ws;
void get_meta_info (EngineMetaInfo * emi)
-diff -rup tmp/emerald-0.5.2/themer/main.c emerald-0.5.2/themer/main.c
---- tmp/emerald-0.5.2/themer/main.c 2007-08-12 23:00:01.000000000 +0200
-+++ emerald-0.5.2/themer/main.c 2007-09-06 11:44:31.791672000 +0200
-@@ -38,6 +38,94 @@ GtkWidget * ExportButton;
+diff -urN emerald-0.5.2.orig/themer/compat.c emerald-0.5.2/themer/compat.c
+--- emerald-0.5.2.orig/themer/compat.c 1969-12-31 19:00:00.000000000 -0500
++++ emerald-0.5.2/themer/compat.c 2007-11-01 20:56:51.991921457 -0400
+@@ -0,0 +1,74 @@
++/* Copyright (c) 2007 Albert Lee <[email protected]>.
++ * Copyright (c) 2006 Ulrich Spoerlein <[email protected]>.
++ *
++ * Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "config.h"
++#include "compat.h"
++
++#ifndef HAVE_STRVERSCMP
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int strverscmp(const char *s1, const char *s2)
++{
++ static const char *digits = "0123456789";
++ char *t1, *t2;
++ int ret;
++ long n1, n2;
++ size_t p1, p2;
++
++ p1 = strcspn(s1, digits);
++ p2 = strcspn(s2, digits);
++ while (p1 == p2 && s1[p1] != '\0' && s2[p2] != '\0') {
++ /* Different prefix */
++ if ((ret = strncmp(s1, s2, p1)) != 0)
++ return ret;
++
++ s1 += p1;
++ s2 += p2;
++ n1 = strtol(s1, &t1, 10);
++ n2 = strtol(s2, &t2, 10);
++
++ if (n1 < n2)
++ return -1;
++ else if (n1 > n2)
++ return 1;
++
++ /* One number is "shorter", e.g., "07" vs "007" */
++ if (t1-s1 < t2-s2)
++ return 1;
++ else if (t1-s1 > t2-s2)
++ return -1;
++
++ /* Numbers are equal or not present, try with next ones. */
++ s1 = t1;
++ s2 = t2;
++ p1 = strcspn(s1, digits);
++ p2 = strcspn(s2, digits);
++ }
++
++ return strcmp(s1, s2);
++}
++#endif
+diff -urN emerald-0.5.2.orig/themer/compat.h emerald-0.5.2/themer/compat.h
+--- emerald-0.5.2.orig/themer/compat.h 1969-12-31 19:00:00.000000000 -0500
++++ emerald-0.5.2/themer/compat.h 2007-11-01 20:57:01.548400361 -0400
+@@ -0,0 +1,33 @@
++/* Copyright (c) 2007 Albert Lee <[email protected]>.
++ * Copyright (c) 2006 Ulrich Spoerlein <[email protected]>.
++ *
++ * Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#ifndef _COMPAT_H
++#include "config.h"
++
++#ifndef HAVE_STRVERSCMP
++int strverscmp(const char *s1, const char *s2);
++#endif
++
++#endif /* _COMPAT_H */
+diff -urN emerald-0.5.2.orig/themer/main.c emerald-0.5.2/themer/main.c
+--- emerald-0.5.2.orig/themer/main.c 2007-08-12 17:00:01.000000000 -0400
++++ emerald-0.5.2/themer/main.c 2007-11-01 20:44:46.897672231 -0400
+@@ -38,6 +38,7 @@
GtkWidget * QuitButton;
gchar * svnpath;
gchar * themecache;
-+#ifdef SOLARIS
-+#include <ctype.h>
-+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-+ fractional parts, S_Z: idem but with leading Zeroes only */
-+#define S_N 0x0
-+#define S_I 0x4
-+#define S_F 0x8
-+#define S_Z 0xC
-+
-+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
-+#define CMP 2
-+#define LEN 3
-+
-+
-+/* Compare S1 and S2 as strings holding indices/version numbers,
-+ returning less than, equal to or greater than zero if S1 is less than,
-+ equal to or greater than S2 (for more info, see the Glibc texinfo doc). */
-+
-+int
-+strverscmp (const char *s1, const char *s2)
-+{
-+ const unsigned char *p1 = (const unsigned char *) s1;
-+ const unsigned char *p2 = (const unsigned char *) s2;
-+ unsigned char c1, c2;
-+ int state;
-+ int diff;
-+
-+ /* Symbol(s) 0 [1-9] others (padding)
-+ Transition (10) 0 (01) d (00) x (11) - */
-+ static const unsigned int next_state[] =
-+ {
-+ /* state x d 0 - */
-+ /* S_N */ S_N, S_I, S_Z, S_N,
-+ /* S_I */ S_N, S_I, S_I, S_I,
-+ /* S_F */ S_N, S_F, S_F, S_F,
-+ /* S_Z */ S_N, S_F, S_Z, S_Z
-+ };
-+
-+ static const int result_type[] =
-+ {
-+ /* state x/x x/d x/0 x/- d/x d/d d/0 d/-
-+ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */
-+
-+ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+ /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP,
-+ +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP,
-+ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+ /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP,
-+ -1, CMP, CMP, CMP
-+ };
-+
-+ if (p1 == p2)
-+ return 0;
-+
-+ c1 = *p1++;
-+ c2 = *p2++;
-+ /* Hint: '0' is a digit too. */
-+ state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
-+
-+ while ((diff = c1 - c2) == 0 && c1 != '\0')
-+ {
-+ state = next_state[state];
-+ c1 = *p1++;
-+ c2 = *p2++;
-+ state |= (c1 == '0') + (isdigit (c1) != 0);
-+ }
-+
-+ state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
-+
-+ switch (state)
-+ {
-+ case CMP:
-+ return diff;
-+
-+ case LEN:
-+ while (isdigit (*p1++))
-+ if (!isdigit (*p2++))
-+ return 1;
-+
-+ return isdigit (*p2) ? -1 : diff;
-+
-+ default:
-+ return state;
-+ }
-+}
-+#endif
++#include "compat.h"
static void theme_list_append(gchar * value,gchar * dir, gchar * fil)
{
-
+diff -urN emerald-0.5.2.orig/themer/Makefile.am emerald-0.5.2/themer/Makefile.am
+--- emerald-0.5.2.orig/themer/Makefile.am 2007-08-12 17:00:01.000000000 -0400
++++ emerald-0.5.2/themer/Makefile.am 2007-11-01 20:44:46.896398910 -0400
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+-emerald_theme_manager_SOURCES = main.c
++emerald_theme_manager_SOURCES = main.c compat.c
+ emerald_theme_manager_LDADD = $(EMERALD_LIBS) ../libengine/libemeraldengine.la
+
+ bin_PROGRAMS = emerald-theme-manager
--- a/patches/libcompizconfig-01-solaris-port.diff Thu Nov 01 19:06:59 2007 +0000
+++ b/patches/libcompizconfig-01-solaris-port.diff Fri Nov 02 03:43:23 2007 +0000
@@ -275,7 +275,7 @@
diff -ruN libcompizconfig-0.6.0.orig/src/compat.h libcompizconfig-0.6.0/src/compat.h
--- libcompizconfig-0.6.0.orig/src/compat.h 1969-12-31 19:00:00.000000000 -0500
+++ libcompizconfig-0.6.0/src/compat.h 2007-10-30 23:12:55.926225079 -0400
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007 Albert Lee <[email protected]>.
+ *
@@ -298,6 +298,7 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
++#ifndef _COMPAT_H
+#include "config.h"
+
+#ifndef HAVE_ASPRINTF
@@ -311,6 +312,7 @@
+#ifndef HAVE_STRSEP
+char *strsep(char **stringp, const char *delim);
+#endif
++#endif /* _COMPAT_H */
diff -ruN libcompizconfig-0.6.0.orig/src/compiz.c libcompizconfig-0.6.0/src/compiz.c
--- libcompizconfig-0.6.0.orig/src/compiz.c 2007-10-15 12:51:01.000000000 -0400
+++ libcompizconfig-0.6.0/src/compiz.c 2007-10-30 23:15:03.372232998 -0400
--- a/patches/transmission-01-solaris.diff Thu Nov 01 19:06:59 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- transmission-0.80.orig/configure 2007-08-20 13:33:33.525077318 +0200
-+++ transmission-0.80/configure 2007-08-20 13:55:28.663558518 +0200
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /bin/bash
- #
- # $Id: configure 2604 2007-08-03 15:46:06Z charles $
-
-@@ -433,6 +433,10 @@
- PTHREAD=yes
- ;;
-
-+ SunOS)
-+ PTHREAD=yes
-+ ;;
-+
- CYGWIN*)
- ;;
-
---- transmission-0.80.orig/mk/common.mk 2007年 8月 7日 二 10:21:52
-+++ transmission-0.80/mk/common.mk 2007年 8月 20日 一 17:02:49
-@@ -1,6 +1,6 @@
- # $Id: common.mk 1921 2007-05-24 02:54:21Z joshe $
-
--TMPCFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
-+TMPCFLAGS = -D_FILE_OFFSET_BITS=64 \
- -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
- -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
- TMPCXXFLAGS = $(TMPCFLAGS)
-@@ -30,9 +30,9 @@
- TMPLDFLAGS += -lcrypto
- endif
-
--CFLAGS := $(TMPCFLAGS) $(CFLAGS)
--CXXFLAGS := $(TMPCXXFLAGS) $(CXXFLAGS)
--LDFLAGS := $(TMPLDFLAGS) $(LDFLAGS)
-+CFLAGS := $(CFLAGS) $(TMPCFLAGS)
-+CXXFLAGS := $(CXXFLAGS) $(TMPCXXFLAGS)
-+LDFLAGS := $(LDFLAGS) $(TMPLDFLAGS)
-
- #
- # Utils
-@@ -39,15 +39,9 @@
- #
-
- define DEP_RULE
-- @echo "Checking dependencies..."
-- @$(RM) .depend
-- @$(foreach SRC, $(SRCS), $(CC) -MM $(SRC) $(CFLAGS) >> .depend;)
- endef
-
- define DEP_RULE_CXX
-- @echo "Checking dependencies..."
-- @$(RM) .depend
-- @$(foreach SRC, $(SRCS), $(CXX) -MM $(SRC) $(CXXFLAGS) >> .depend;)
- endef
-
- define CC_RULE
-@@ -76,7 +70,7 @@
-
- define MSGFMT_RULE
- @echo "Msgfmt $<"
-- @msgfmt -f $< -o $@
-+ @msgfmt -f -o $@ $<
- endef
-
- define XRES_RULE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/transmission-01-sunpro.diff Fri Nov 02 03:43:23 2007 +0000
@@ -0,0 +1,16 @@
+--- transmission-0.91/libtransmission/torrent.c.orig Sun Oct 28 19:57:10 2007
++++ transmission-0.91/libtransmission/torrent.c Thu Nov 1 19:47:11 2007
+@@ -890,9 +890,10 @@
+
+ void tr_torrentAvailability( const tr_torrent * tor, int8_t * tab, int size )
+ {
+- return tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
+- tor->info.hash,
+- tab, size );
++ tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
++ tor->info.hash,
++ tab, size );
++ return;
+ }
+
+ void tr_torrentAmountFinished( const tr_torrent * tor, float * tab, int size )