OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=129

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 11 03:48:03 CEST 2009 - sndirsch@suse.de
+
+- use %moblin define in specfile 
+
+-------------------------------------------------------------------
+Wed Jun 10 16:39:15 CEST 2009 - sndirsch@suse.de
+
+- xserver-1.5.0-bg-none-root.patch
+  * removed patch for compalloc.c, which hurts on Moblin
+- disabled xserver-1.5.0-bg-none-root.patch (only useful for Moblin)
+
 -------------------------------------------------------------------
 Tue Jun  9 15:55:52 CEST 2009 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -17,6 +17,7 @@
 
 # norootforbuild
 
+%define moblin 0
 
 Name:           xorg-x11-server
 %define dirsuffix 1.6.1
@@ -32,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        41
+Release:        42
 License:        GPL v2 or later; X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -247,8 +248,10 @@ popd
 %patch145 -p0
 %patch160 -p1
 %patch161 -p1
-# %patch162 -p1
+%if %moblin
+%patch162 -p1
 %patch163 -p1
+%endif
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
@@ -562,6 +565,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun 11 2009 sndirsch@suse.de
+- use %%moblin define in specfile
+* Wed Jun 10 2009 sndirsch@suse.de
+- xserver-1.5.0-bg-none-root.patch
+  * removed patch for compalloc.c, which hurts on Moblin
+- disabled xserver-1.5.0-bg-none-root.patch (only useful for Moblin)
 * Tue Jun 09 2009 sndirsch@suse.de
 - diabled build of Xdmx since it conflict's with NOMAD's Xdmx
   (bnc #511269)

xserver-1.5.0-bg-none-root.patch

@@ -151,35 +151,3 @@ index b100949..c41b45b 100644
          else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
               if(++i < argc) {
                   long reqSizeArg = atol(argv[i]);
-From 6a39049e34eeefeeb821970d83e1994870af8f3e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 1 Nov 2007 14:56:25 -0400
-Subject: [PATCH] Don't backfill bg=None windows in Composite.
-
----
- composite/compalloc.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/composite/compalloc.c b/composite/compalloc.c
-index 006e808..67d830d 100644
---- a/composite/compalloc.c
-+++ b/composite/compalloc.c
-@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
- 	 * Copy bits from the parent into the new pixmap so that it will
- 	 * have "reasonable" contents in case for background None areas.
- 	 */
-+#if 0
- 	if (pGC)
- 	{
- 	    XID val = IncludeInferiors;
-@@ -492,6 +493,7 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
- 				   w, h, 0, 0);
- 	    FreeScratchGC (pGC);
- 	}
-+#endif
-     }
-     else
-     {
--- 
-1.5.3.4
-