packages: xorg-xserver-server/xorg-xserver-server.spec, xorg-xserver-server...

[baggins]

Author: baggins                      Date: Tue Mar 20 17:39:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- os.h uses defs from xorg-server.h but don't includes it leading to
  false ifdefs and compile breakage in third party programs (VirtualBox for once)

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.303 -> 1.304) , xorg-xserver-server-include-defs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.303 packages/xorg-xserver-server/xorg-xserver-server.spec:1.304
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.303	Tue Mar  6 18:23:48 2012
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Tue Mar 20 18:39:21 2012
@@ -25,7 +25,7 @@
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
 Version:	1.12.0
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -41,6 +41,7 @@
 Patch4:		%{name}-builtin-SHA1.patch
 Patch5:		%{name}-export-GetMaster.patch
 Patch6:		110_nvidia_slowdow_fix.patch
+Patch7:		%{name}-include-defs.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -370,6 +371,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -604,6 +606,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.304  2012/03/20 17:39:21  baggins
+- rel 2
+- os.h uses defs from xorg-server.h but don't includes it leading to
+  false ifdefs and compile breakage in third party programs (VirtualBox for once)
+
 Revision 1.303  2012/03/06 17:23:48  qboosh
 - updated libpciaccess version
 

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-include-defs.patch
diff -u /dev/null packages/xorg-xserver-server/xorg-xserver-server-include-defs.patch:1.1
--- /dev/null	Tue Mar 20 18:39:26 2012
+++ packages/xorg-xserver-server/xorg-xserver-server-include-defs.patch	Tue Mar 20 18:39:21 2012
@@ -0,0 +1,10 @@
+--- xorg-server-1.12.0/include/os.h~	2012-01-17 00:51:54.000000000 +0100
++++ xorg-server-1.12.0/include/os.h	2012-03-20 18:36:45.042937701 +0100
+@@ -49,6 +49,7 @@
+ #ifndef OS_H
+ #define OS_H
+ 
++#include "xorg-server.h"
+ #include "misc.h"
+ #include <stdarg.h>
+ #include <string.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.303&r2=1.304&f=u