rpms/compiz/devel compiz.spec,1.45,1.46 plane.patch,1.6,1.7

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Sep 18 23:14:00 UTC 2006


Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32138

Modified Files:
	compiz.spec plane.patch 
Log Message:
Change plane patch to correctly initialize screen size


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- compiz.spec	18 Sep 2006 21:30:47 -0000	1.45
+++ compiz.spec	18 Sep 2006 23:13:57 -0000	1.46
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.25.%{snapshot}git%{?dist}
+Release:        0.26.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -172,8 +172,12 @@
 
 %changelog
 * Mon Sep 18 2006 Soren Sandmann <sandmann at redhat.com>
+- Change plane patch to correctly initialize the screen size to the
+  defaults (bug 206088).
+
+* Mon Sep 18 2006 Soren Sandmann <sandmann at redhat.com>
 - Run update-desktop-database and gtk-update-icon-cache in post. Add icons
-  to list of packaged files. Also bump to 0.6.137 of dialog (which makes
+  to list of packaged files. Also bump to 0.6.137 of dialog (which just makes
   directories before attempting to install to them).
 
 * Mon Sep 18 2006 Soren Sandmann <sandmann at redhat.com>

plane.patch:
 include/compiz.h          |   20 
 plugins/Makefile.am       |    5 
 plugins/compiz.schemas.in |  962 +++++++++++++++++++++++++++++++++++++++++++++-
 plugins/cube.c            |   66 +--
 plugins/place.c           |   13 
 plugins/plane.c           |  894 ++++++++++++++++++++++++++++++++++++++++++
 plugins/rotate.c          |   57 +-
 src/event.c               |    3 
 src/screen.c              |  180 +++++---
 src/window.c              |   72 ++-
 10 files changed, 2107 insertions(+), 165 deletions(-)

Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plane.patch	12 Sep 2006 21:20:56 -0000	1.6
+++ plane.patch	18 Sep 2006 23:13:57 -0000	1.7
@@ -1,5 +1,5 @@
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am	2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am	2006-09-18 18:57:25.000000000 -0400
 @@ -46,6 +46,10 @@
  libwater_la_LIBADD = @COMPIZ_LIBS@
  libwater_la_SOURCES = water.c
@@ -20,7 +20,7 @@
  
  EXTRA_DIST = $(schema_in_files)
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in	2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in	2006-09-18 18:57:25.000000000 -0400
 @@ -13,7 +13,7 @@
              <owner>compiz</owner>
              <type>list</type>
@@ -1055,7 +1055,7 @@
  
          <schema>
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c	2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c	2006-09-18 18:57:25.000000000 -0400
 @@ -593,8 +593,10 @@
      getOuterRectOfWindow (window, &rect);
  
@@ -1105,7 +1105,7 @@
      if (find_first_fit (window, windows, x, y, &x, &y))
  	goto done_check_denied_focus;
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c	2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c	2006-09-18 18:57:25.000000000 -0400
 @@ -419,15 +419,15 @@
  	    rs->xrot += rs->xVelocity * chunk;
  	    rs->yrot += rs->yVelocity * chunk;
@@ -1253,8 +1253,8 @@
  
  		    o[0].type    = CompOptionTypeInt;
  		    o[0].name    = "x";
---- /dev/null	2006-09-11 12:25:53.882564752 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-12 17:11:30.000000000 -0400
+--- /dev/null	2006-09-18 16:28:46.882919268 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-18 18:57:25.000000000 -0400
 @@ -0,0 +1,894 @@
 +/*
 + * Copyright © 2006 Red Hat, Inc.
@@ -2150,8 +2150,8 @@
 +{
 +    return &planeVTable;
 +}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-12 16:54:06.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-12 16:54:06.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-18 18:57:25.000000000 -0400
 @@ -741,7 +741,7 @@
      case CUBE_SCREEN_OPTION_IN:
  	if (compSetBoolOption (o, value))
@@ -2333,8 +2333,8 @@
  	return FALSE;
  
      if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-12 16:54:06.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-12 16:54:06.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-18 18:57:25.000000000 -0400
 @@ -1055,7 +1055,8 @@
  #define COMP_SCREEN_OPTION_OPACITY_STEP        4
  #define COMP_SCREEN_OPTION_UNREDIRECT_FS       5
@@ -2397,8 +2397,8 @@
  
  CompIcon *
  getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-12 16:54:06.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-12 16:54:06.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-18 18:57:25.000000000 -0400
 @@ -1763,7 +1763,8 @@
  
  	    if (!(w->state & CompWindowStateHiddenMask))
@@ -2409,8 +2409,8 @@
  
  		applyStartupProperties (w->screen, w);
  
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-12 16:54:06.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-12 16:54:06.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-18 18:58:17.000000000 -0400
 @@ -48,9 +48,13 @@
  
  #define DETECT_REFRESH_RATE_DEFAULT TRUE
@@ -2561,8 +2561,8 @@
 -    s->size = 4;
 +    s->x     = 0;
 +    s->y     = 0;
-+    s->hsize = 4;
-+    s->vsize = 4;
++    s->hsize = SCREEN_SIZE_DEFAULT;
++    s->vsize = SCREEN_VSIZE_DEFAULT;
  
      for (i = 0; i < SCREEN_EDGE_NUM; i++)
      {
@@ -2714,8 +2714,8 @@
  }
  
  void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-12 16:54:06.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-12 16:54:06.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-18 18:57:25.000000000 -0400
 @@ -1501,7 +1501,8 @@
      w->shaded		 = FALSE;
      w->hidden		 = FALSE;




More information about the fedora-cvs-commits mailing list