Accepting request 211222 from home:michalsrb:branches:X11:XOrg

- Exclude xorg-server-1.13.0/hw/xfree86/modes/xf86gtf.c and
  xorg-server-1.13.0/hw/xfree86/utils/gtf/gtf.c from xserver
  sources. (bnc#855566)

OBS-URL: https://build.opensuse.org/request/show/211222
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=7

n_tigervnc-dont-build-gtf.patch

@@ -0,0 +1,32 @@
+diff -ur xorg-server-1.13.0.orig/configure.ac xorg-server-1.13.0/configure.ac
+--- xorg-server-1.13.0.orig/configure.ac	2012-09-06 00:45:08.000000000 +0300
++++ xorg-server-1.13.0/configure.ac	2013-12-16 13:50:39.880775219 +0200
+@@ -2268,7 +2268,6 @@
+ hw/xfree86/utils/Makefile
+ hw/xfree86/utils/man/Makefile
+ hw/xfree86/utils/cvt/Makefile
+-hw/xfree86/utils/gtf/Makefile
+ hw/dmx/config/Makefile
+ hw/dmx/config/man/Makefile
+ hw/dmx/doc/Makefile
+diff -ur xorg-server-1.13.0.orig/hw/xfree86/modes/Makefile.am xorg-server-1.13.0/hw/xfree86/modes/Makefile.am
+--- xorg-server-1.13.0.orig/hw/xfree86/modes/Makefile.am	2012-09-06 00:45:08.000000000 +0300
++++ xorg-server-1.13.0/hw/xfree86/modes/Makefile.am	2013-12-16 13:46:37.130679730 +0200
+@@ -9,7 +9,6 @@
+ 	xf86Crtc.h \
+ 	xf86Cursors.c \
+ 	xf86cvt.c \
+-	xf86gtf.c \
+ 	xf86DisplayIDModes.c \
+ 	xf86EdidModes.c \
+ 	xf86Modes.c \
+Only in xorg-server-1.13.0.orig/hw/xfree86/modes: xf86gtf.c
+Only in xorg-server-1.13.0.orig/hw/xfree86/utils: gtf
+diff -ur xorg-server-1.13.0.orig/hw/xfree86/utils/Makefile.am xorg-server-1.13.0/hw/xfree86/utils/Makefile.am
+--- xorg-server-1.13.0.orig/hw/xfree86/utils/Makefile.am	2012-09-06 00:45:08.000000000 +0300
++++ xorg-server-1.13.0/hw/xfree86/utils/Makefile.am	2013-12-16 13:46:24.175393782 +0200
+@@ -1,4 +1,3 @@
+ SUBDIRS = \
+-	gtf \
+ 	cvt \
+ 	man

tigervnc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 16 14:51:48 UTC 2013 - msrb@suse.com
+
+- Exclude xorg-server-1.13.0/hw/xfree86/modes/xf86gtf.c and
+  xorg-server-1.13.0/hw/xfree86/utils/gtf/gtf.c from xserver
+  sources. (bnc#855566)
+
 -------------------------------------------------------------------
 Tue Dec  3 14:34:56 UTC 2013 - msrb@suse.com
 

tigervnc.spec

@@ -57,6 +57,7 @@ Patch3:         tigervnc-clean-pressed-key-on-exit.patch
 Patch10:        tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch11:        u_aarch64-support.patch
 Patch12:        N_xorg-server-xdmcp.patch
+Patch13:        n_tigervnc-dont-build-gtf.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -77,6 +78,11 @@ This is the TigerVNC implementation of Xvnc.
 %setup -T -b1 -b2
 cp -r ../xorg-server-*/* unix/xserver/
 
+if [ -e unix/xserver/hw/xfree86/modes/xf86gtf.c -o -e unix/xserver/hw/xfree86/utils/gtf/gtf.c ]; then
+  echo "Files hw/xfree86/modes/xf86gtf hw/xfree86/utils/gtf/gtf.c have to be excluded from the xserver source tar ball (bnc#85566)."
+  exit 1
+fi
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -86,6 +92,7 @@ patch -p1 < ../xserver113.patch
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 popd
 
 %build

xorg-server-1.13.0.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a751cae62dad1f8032613bef96a758c2eceacc0425533e8ee446fc53207174c4
+oid sha256:d5dfd6cda0597a6aafb16e08d18bc052e841b31e332839974e3211283f52e970
-size 3713571
+size 3750165