Accepting request 214080 from X11:XOrg

- removed N_randr_fix_abi.patch, since it caused the crash with
  current NVIDIA drivers built against xorg-server 1.15 (bnc#858827)

- changed license back to MIT, since xf4nc is no longer patched
  into X.Org sources (bnc#856905)

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

N_randr_fix_abi.patch

@@ -1,26 +0,0 @@
-Author: Michal Srb <msrb@suse.com>
-
-Fix compatibility with nvidia binary drivers
-
-(bnc#849152)
-
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index 15299fd..03ed146 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -301,7 +301,6 @@ typedef struct _rrScrPriv {
-     Bool changed;               /* some config changed */
-     Bool configChanged;         /* configuration changed */
-     Bool layoutChanged;         /* screen layout changed */
--    Bool resourcesChanged;      /* screen resources change */
- 
-     CARD16 minWidth, minHeight;
-     CARD16 maxWidth, maxHeight;
-@@ -338,6 +337,7 @@ typedef struct _rrScrPriv {
- 
-     RRProviderDestroyProcPtr rrProviderDestroy;
- 
-+    Bool resourcesChanged;      /* screen resources change */
- } rrScrPrivRec, *rrScrPrivPtr;
- 
- extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec;

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jan 15 13:39:58 UTC 2014 - sndirsch@suse.com
+
+- removed N_randr_fix_abi.patch, since it caused the crash with
+  current NVIDIA drivers built against xorg-server 1.15 (bnc#858827)
+
+-------------------------------------------------------------------
+Tue Jan  7 16:02:22 UTC 2014 - sndirsch@suse.com
+
+- changed license back to MIT, since xf4nc is no longer patched
+  into X.Org sources (bnc#856905)
+
 -------------------------------------------------------------------
 Wed Jan  1 05:35:47 UTC 2014 - crrodriguez@opensuse.org
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ Name:           xorg-x11-server
 %define dirsuffix 1.15.0
 
 Summary:        X
-License:        GPL-2.0+ and MIT
+License:        MIT
 Group:          System/X11/Servers/XF86_4
 Source0:        xorg-server-%{dirsuffix}.tar.bz2
 Source1:        sysconfig.displaymanager.template
@@ -118,7 +118,6 @@ Patch1:         N_default-module-path.diff
 Patch2:         N_zap_warning_xserver.diff
 Patch3:         N_driver-autoconfig.diff
 Patch4:         N_fix_fglrx_screendepth_issue.patch
-Patch5:         N_randr_fix_abi.patch
 Patch6:         N_fix-dpi-values.diff
 
 Patch100:       u_fbdevhw.diff
@@ -193,7 +192,6 @@ cp %{SOURCE90} .
 %patch2 -p1
 %patch3 -p0
 %patch4 -p0
-%patch5 -p1
 %patch6 -p0
 
 %patch100