rpms/compiz/devel compiz-0.8.2-wall.patch, 1.1, 1.2 compiz.spec, 1.171, 1.172
drago01
drago01 at fedoraproject.org
Sat Jul 11 08:25:55 UTC 2009
Author: drago01
Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28677
Modified Files:
compiz-0.8.2-wall.patch compiz.spec
Log Message:
fix build
compiz-0.8.2-wall.patch:
Index: compiz-0.8.2-wall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-0.8.2-wall.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- compiz-0.8.2-wall.patch 10 Jul 2009 21:24:50 -0000 1.1
+++ compiz-0.8.2-wall.patch 11 Jul 2009 08:25:55 -0000 1.2
@@ -359,36 +359,40 @@ diff -upNr compiz-0.8.2.orign/metadata/w
+ </screen>
+ </plugin>
+</compiz>
-diff -upNr compiz-0.8.2.orign/src/Makefile.am compiz-0.8.2/src/Makefile.am
---- compiz-0.8.2.orign/src/Makefile.am 2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/src/Makefile.am 2009-07-10 23:09:39.215435000 +0200
-@@ -5,12 +5,13 @@ INCLUDES = \
- -I$(top_builddir)/include \
- -DPLUGINDIR=\"$(plugindir)\" \
- -DIMAGEDIR=\"$(imagedir)\" \
+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)\" \
++ -DMETADATADIR=\"$(metadatadir)\" \
+ `pkg-config --cflags cairo`
- bin_PROGRAMS = compiz
+ moduledir = $(plugindir)
- compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
--compiz_LDFLAGS = -export-dynamic
-+compiz_LDFLAGS = -export-dynamic `pkg-config --libs cairo`
- compiz_SOURCES = \
- main.c \
- privates.c \
-@@ -29,4 +30,6 @@ compiz_SOURCES = \
- matrix.c \
- cursor.c \
- match.c \
-- metadata.c
-+ metadata.c \
-+ wall_options.c \
-+ wall.c
-diff -upNr compiz-0.8.2.orign/src/wall.c compiz-0.8.2/src/wall.c
---- compiz-0.8.2.orign/src/wall.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/src/wall.c 2009-03-05 04:36:21.000000000 +0100
+@@ -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.2.orign/plugins/wall.c compiz-0.8.2/plugins/wall.c
+--- compiz-0.8.2.orign/plugins/wall.c 1970-01-01 01:00:00.000000000 +0100
++++ compiz-0.8.2/plugins/wall.c 2009-03-05 04:36:21.000000000 +0100
@@ -0,0 +1,2215 @@
+/**
+ *
@@ -2605,9 +2609,9 @@ diff -upNr compiz-0.8.2.orign/src/wall.c
+{
+ return &wallVTable;
+}
-diff -upNr compiz-0.8.2.orign/src/wall_options.c compiz-0.8.2/src/wall_options.c
---- compiz-0.8.2.orign/src/wall_options.c 1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/src/wall_options.c 2009-07-10 23:02:20.185497000 +0200
+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 @@
+/*
+ * This file is autogenerated with bcop:
@@ -4545,9 +4549,9 @@ diff -upNr compiz-0.8.2.orign/src/wall_o
+ return &wallOptionsVTable;
+}
+
-diff -upNr compiz-0.8.2.orign/src/wall_options.h compiz-0.8.2/src/wall_options.h
---- compiz-0.8.2.orign/src/wall_options.h 1970-01-01 01:00:00.000000000 +0100
-+++ compiz-0.8.2/src/wall_options.h 2009-07-10 23:02:18.076511000 +0200
+diff -upNr compiz-0.8.2.orign/plugins/wall_options.h compiz-0.8.2/plugins/wall_options.h
+--- compiz-0.8.2.orign/plugins/wall_options.h 1970-01-01 01:00:00.000000000 +0100
++++ compiz-0.8.2/plugins/wall_options.h 2009-07-10 23:02:18.076511000 +0200
@@ -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.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- compiz.spec 10 Jul 2009 21:27:22 -0000 1.171
+++ compiz.spec 11 Jul 2009 08:25:55 -0000 1.172
@@ -14,7 +14,7 @@ URL: http://www.go-compiz.org
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -359,6 +359,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 11 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-6
+- Fix build
+
* Fri Jul 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-5
- Move wall plugin from fusion to the main compiz package
- Drop requires on compiz-fusion-gnome
More information about the fedora-extras-commits
mailing list