rpms/compiz/devel compiz-0.8.4-wall.patch, 1.1, 1.2 compiz.spec, 1.189, 1.190
Leigh Scott
leigh123linux at fedoraproject.org
Sat Jan 16 16:53:58 UTC 2010
Author: leigh123linux
Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22054
Modified Files:
compiz-0.8.4-wall.patch compiz.spec
Log Message:
fix patch some more
compiz-0.8.4-wall.patch:
compiz-0.8.2/metadata/Makefile.am | 1
compiz-0.8.2/plugins/Makefile.am | 7
compiz-0.8.4/metadata/wall.xml.in | 357 +++++
compiz-0.8.4/plugins/wall.c | 2263 ++++++++++++++++++++++++++++++++++++
compiz-0.8.4/plugins/wall_options.c | 1949 +++++++++++++++++++++++++++++++
compiz-0.8.4/plugins/wall_options.h | 375 +++++
6 files changed, 4951 insertions(+), 1 deletion(-)
Index: compiz-0.8.4-wall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-0.8.4-wall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- compiz-0.8.4-wall.patch 16 Jan 2010 13:01:42 -0000 1.1
+++ compiz-0.8.4-wall.patch 16 Jan 2010 16:53:58 -0000 1.2
@@ -9,8 +9,39 @@ diff -upNr compiz-0.8.2.orign/metadata/M
zoom.xml.in
xml_files = $(xml_in_files:.xml.in=.xml)
xml_DATA = $(xml_files)
-diff -upNr compiz-0.8.4.orign/metadata/wall.xml.in compiz-0.8.4/metadata/wall.xml.in
---- compiz-0.8.4.orign/metadata/wall.xml.in 2010-01-16 12:24:34.000000000 +0000
+diff -upNr compiz-0.8.2.orign/plugins/Makefile.am compiz-0.8.2/plugins/Makefile.am
+--- compiz-0.8.2.orign/plugins/Makefile.am 2009-02-15 10:10:23.000000000 +0100
++++ compiz-0.8.2/plugins/Makefile.am 2009-07-11 10:19:29.303832241 +0200
+@@ -74,6 +74,9 @@ libcommands_la_SOURCES = commands.c
+ libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined
+ libgnomecompat_la_SOURCES = gnomecompat.c
+
++libwall_la_LDFLAGS = -module -avoid-version -no-undefined `pkg-config --libs cairo`
++libwall_la_SOURCES = wall.c wall_options.c
++
+ if USE_LIBRSVG
+ libsvg_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la
+ libsvg_la_LDFLAGS = -module -avoid-version -no-undefined
+@@ -149,7 +152,8 @@ INCLUDES = \
+ -DIMAGEDIR=\"$(imagedir)\" \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+- -DMETADATADIR=\"$(metadatadir)\"
++ -DMETADATADIR=\"$(metadatadir)\" \
++ `pkg-config --cflags cairo`
+
+ moduledir = $(plugindir)
+
+@@ -181,6 +185,7 @@ module_LTLIBRARIES = \
+ libobs.la \
+ libcommands.la \
+ libgnomecompat.la \
++ libwall.la \
+ $(libsvg_module) \
+ $(libannotate_module) \
+ $(libinotify_module) \
+diff -upNr compiz-0.8.4.orig/metadata/wall.xml.in compiz-0.8.4/metadata/wall.xml.in
+--- compiz-0.8.4.orig/metadata/wall.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.4/metadata/wall.xml.in 2009-10-14 02:01:42.000000000 +0100
@@ -0,0 +1,357 @@
+<?xml version="1.0"?>
@@ -370,39 +401,8 @@ diff -upNr compiz-0.8.4.orign/metadata/w
+ </screen>
+ </plugin>
+</compiz>
-diff -upNr compiz-0.8.2.orign/plugins/Makefile.am compiz-0.8.2/plugins/Makefile.am
---- compiz-0.8.2.orign/plugins/Makefile.am 2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/plugins/Makefile.am 2009-07-11 10:19:29.303832241 +0200
-@@ -74,6 +74,9 @@ libcommands_la_SOURCES = commands.c
- libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined
- libgnomecompat_la_SOURCES = gnomecompat.c
-
-+libwall_la_LDFLAGS = -module -avoid-version -no-undefined `pkg-config --libs cairo`
-+libwall_la_SOURCES = wall.c wall_options.h
-+
- if USE_LIBRSVG
- libsvg_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la
- libsvg_la_LDFLAGS = -module -avoid-version -no-undefined
-@@ -149,7 +152,8 @@ INCLUDES = \
- -DIMAGEDIR=\"$(imagedir)\" \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/include \
-- -DMETADATADIR=\"$(metadatadir)\"
-+ -DMETADATADIR=\"$(metadatadir)\" \
-+ `pkg-config --cflags cairo`
-
- moduledir = $(plugindir)
-
-@@ -181,6 +185,7 @@ module_LTLIBRARIES = \
- libobs.la \
- libcommands.la \
- libgnomecompat.la \
-+ libwall.la \
- $(libsvg_module) \
- $(libannotate_module) \
- $(libinotify_module) \
-diff -upNr compiz-0.8.4.orign/plugins/wall.c compiz-0.8.4/plugins/wall.c
---- compiz-0.8.4.orign/plugins/wall.c 2010-01-16 12:13:06.000000000 +0000
+diff -upNr compiz-0.8.4.orig/plugins/wall.c compiz-0.8.4/plugins/wall.c
+--- compiz-0.8.4.orig/plugins/wall.c 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.4/plugins/wall.c 2009-10-14 02:01:42.000000000 +0100
@@ -0,0 +1,2263 @@
+/**
@@ -2668,10 +2668,10 @@ diff -upNr compiz-0.8.4.orign/plugins/wa
+{
+ return &wallVTable;
+}
-diff -upNr compiz-0.8.2.orign/plugins/wall_options.c compiz-0.8.2/plugins/wall_options.c
---- compiz-0.8.2.orign/plugins/wall_options.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/plugins/wall_options.c 2009-07-10 23:02:20.185497000 +0200
-@@ -0,0 +1,1936 @@
+diff -upNr compiz-0.8.4.orig/plugins/wall_options.c compiz-0.8.4/plugins/wall_options.c
+--- compiz-0.8.4.orig/plugins/wall_options.c 1970-01-01 01:00:00.000000000 +0100
++++ compiz-0.8.4/plugins/wall_options.c 2010-01-16 15:52:04.000000000 +0000
+@@ -0,0 +1,1949 @@
+/*
+ * This file is autogenerated with bcop:
+ * The Compiz option code generator
@@ -4357,6 +4357,11 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
+static CompOption * wallOptionsGetDisplayOptions (CompPlugin *plugin, CompDisplay *d, int *count)
+{
+ WALL_OPTIONS_DISPLAY(d);
++ if (!od)
++ {
++ *count = 0;
++ return NULL;
++ }
+ *count = WallDisplayOptionNum;
+ return od->opt;
+}
@@ -4422,6 +4427,11 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
+static CompOption * wallOptionsGetScreenOptions (CompPlugin *plugin, CompScreen *s, int *count)
+{
+ WALL_OPTIONS_SCREEN(s);
++ if (!os)
++ {
++ *count = 0;
++ return NULL;
++ }
+ *count = WallScreenOptionNum;
+ return os->opt;
+}
@@ -4450,11 +4460,13 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
+static void wallOptionsFiniScreen (CompPlugin *p, CompScreen *s)
+{
+ WALL_OPTIONS_SCREEN (s);
++ WALL_OPTIONS_DISPLAY (s->display);
+
+
+ compFiniScreenOptions (s, os->opt, WallScreenOptionNum);
+
+ free (os);
++ s->base.privates[od->screenPrivateIndex].ptr = NULL;
+}
+
+static Bool wallOptionsInitDisplay (CompPlugin *p, CompDisplay *d)
@@ -4493,6 +4505,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
+ compFiniDisplayOptions (d, od->opt, WallDisplayOptionNum);
+
+ free (od);
++ d->base.privates[WallOptionsDisplayPrivateIndex].ptr = NULL;
+}
+
+static Bool wallOptionsInit (CompPlugin *p)
@@ -4608,9 +4621,9 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
+ return &wallOptionsVTable;
+}
+
-diff -upNr compiz-0.8.4.orign/plugins/wall_options.h compiz-0.8.4/plugins/wall_options.h
---- compiz-0.8.4.orign/plugins/wall_options.h 2010-01-16 12:45:43.000000000 +0000
-+++ compiz-0.8.4/plugins/wall_options.h 2010-01-16 12:45:43.000000000 +0000
+diff -upNr compiz-0.8.4.orig/plugins/wall_options.h compiz-0.8.4/plugins/wall_options.h
+--- compiz-0.8.4.orig/plugins/wall_options.h 1970-01-01 01:00:00.000000000 +0100
++++ compiz-0.8.4/plugins/wall_options.h 2010-01-16 15:52:04.000000000 +0000
@@ -0,0 +1,375 @@
+/*
+ * This file is autogenerated with bcop:
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- compiz.spec 16 Jan 2010 13:53:43 -0000 1.189
+++ compiz.spec 16 Jan 2010 16:53:58 -0000 1.190
@@ -43,7 +43,7 @@ BuildRequires: fuse-devel
BuildRequires: cairo-devel
BuildRequires: libtool
-Source0: http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
+Source0: http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
Source1: kde-desktop-effects-%{kde_dialogversion}.tar.bz2
Source2: compiz-gtk
Source3: compiz-gtk.desktop
@@ -309,6 +309,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Jan 16 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-2
- add patch to fix kde decorator build error
+- fix source url
* Sat Jan 16 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-1
- update to 0.8.4
More information about the scm-commits
mailing list