Accepting request 172342 from X11:XOrg

- u_disable-acpi-code.patch
  * Don't build the ACPI code (bnc#805304)

- Update to version 1.14.1:
  This release contains the fix for CVE-2013-1940, see here for more
  detail: http://lists.x.org/archives/xorg-devel/2013-April/036014.html
  In the remainder we have two build fixes, a couple of comment fixes and a
  change to the list.h code to inline the xorg_list_init function. Fairly
  unintrusive, the lot.

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

u_disable-acpi-code.patch

@@ -0,0 +1,23 @@
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Nov 2011 11:52:06 +1000
+Subject: [PATCH 2/7] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a12783c..54f4464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*|ia64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;
+-- 
+1.7.10.1

xorg-server-1.14.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630
-size 5507907

xorg-server-1.14.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa
+size 5509219

xorg-x11-server.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Apr 18 12:00:53 UTC 2013 - sndirsch@suse.com
+
+- u_disable-acpi-code.patch
+  * Don't build the ACPI code (bnc#805304)
+
+-------------------------------------------------------------------
+Wed Apr 17 16:31:36 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 1.14.1:
+  This release contains the fix for CVE-2013-1940, see here for more
+  detail: http://lists.x.org/archives/xorg-devel/2013-April/036014.html
+  In the remainder we have two build fixes, a couple of comment fixes and a
+  change to the list.h code to inline the xorg_list_init function. Fairly
+  unintrusive, the lot.
+
 -------------------------------------------------------------------
 Fri Apr  5 08:05:09 UTC 2013 - idonmez@suse.com
 

xorg-x11-server.spec

@@ -18,7 +18,7 @@
 
 Name:           xorg-x11-server
 
-%define dirsuffix 1.14.0
+%define dirsuffix 1.14.1
 %define vnc 0
 Summary:        X
 License:        GPL-2.0+ and MIT
@@ -180,6 +180,7 @@ Patch222:       N_sync-fix.patch
 Patch226:       u_vgaHW-no-legacy.patch
 Patch227:       u_init_framebuffer_base.patch
 Patch228:       u_aarch64-support.patch
+Patch229:       u_disable-acpi-code.patch
 
 %description
 This package contains the X.Org Server.
@@ -299,6 +300,7 @@ cp %{SOURCE96} .
 %patch226 -p0
 %patch227 -p1
 %patch228 -p1
+%patch229 -p1
 
 %build
 autoreconf -fi