[src/netbsd-6-1]: src Apply patch (requested by mrg in ticket 1208):

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3cfc39ee4707
branches:  netbsd-6-1
changeset: 776027:3cfc39ee4707
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 21 19:06:33 2014 +0000

description:
Apply patch (requested by mrg in ticket 1208):
Pass -Wno-error to work around a build failure on vax with gcc 4.1

diffstat:

 doc/CHANGES-6.1.6                                |  4 ++--
 external/mit/xorg/server/xorg-server/Xi/Makefile |  5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 311597cb0e35 -r 3cfc39ee4707 doc/CHANGES-6.1.6
--- a/doc/CHANGES-6.1.6 Sun Dec 14 14:05:42 2014 +0000
+++ b/doc/CHANGES-6.1.6 Sun Dec 21 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.16 2014/12/14 14:05:42 martin Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.17 2014/12/21 19:07:11 snj Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -238,7 +238,7 @@
        Fix debugging format in ppbus(4) reported by John D. Baker.
        Fixes PR/49281.
        [snj, ticket #1190]
-
+external/mit/xorg/server/xorg-server/Xi/Makefile patch
 xsrc/external/mit/xorg-server/dist/configure    patch
 xsrc/external/mit/xorg-server/dist/configure.ac patch
 xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch
diff -r 311597cb0e35 -r 3cfc39ee4707 external/mit/xorg/server/xorg-server/Xi/Makefile
--- a/external/mit/xorg/server/xorg-server/Xi/Makefile  Sun Dec 14 14:05:42 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/Xi/Makefile  Sun Dec 21 19:06:33 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $
+#      $NetBSD: Makefile,v 1.4.16.1 2014/12/21 19:06:33 snj Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -38,5 +38,8 @@
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare
 
+# XXX: uint16 vs INT_MAX
+COPTS.xichangehierarchy.c+=    -Wno-error
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>