Module Name: src Committed By: riz Date: Thu Jun 6 16:48:35 UTC 2013
Modified Files: src/external/mit/xorg/lib/fontconfig/src [netbsd-5-1]: Makefile src/external/mit/xorg/lib/libX11 [netbsd-5-1]: Makefile.libx11 src/external/mit/xorg/lib/libXi [netbsd-5-1]: Makefile Log Message: Apply patch (requested by mrg in ticket #1866): external/mit/xorg/lib/fontconfig/src/Makefile patch external/mit/xorg/lib/libX11/Makefile.libx11 patch external/mit/xorg/lib/libXi/Makefile patch Silence gcc 4.1 warnings from ticket #1866. [mrg, ticket #1866] To generate a diff of this commit: cvs rdiff -u -r1.4.4.1 -r1.4.4.1.2.1 \ src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.5.2.1 -r1.5.2.1.2.1 \ src/external/mit/xorg/lib/libX11/Makefile.libx11 cvs rdiff -u -r1.3.6.1 -r1.3.6.1.2.1 src/external/mit/xorg/lib/libXi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/lib/fontconfig/src/Makefile diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.4.4.1 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.4.4.1.2.1 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.4.4.1 Thu Sep 17 04:24:31 2009 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Jun 6 16:48:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.4.1 2009/09/17 04:24:31 snj Exp $ +# $NetBSD: Makefile,v 1.4.4.1.2.1 2013/06/06 16:48:35 riz Exp $ .include <bsd.own.mk> @@ -98,5 +98,7 @@ PKGCONFIG= fontconfig # fontconfig uses VERSION and not PACKAGE_VERSION PKGCONFIG_VERSION.fontconfig= 2.6.0 +COPTS.Font.c+= -Wno-error + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libX11/Makefile.libx11 diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.5.2.1 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.5.2.1.2.1 --- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.5.2.1 Thu Sep 17 04:24:31 2009 +++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Thu Jun 6 16:48:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libx11,v 1.5.2.1 2009/09/17 04:24:31 snj Exp $ +# $NetBSD: Makefile.libx11,v 1.5.2.1.2.1 2013/06/06 16:48:35 riz Exp $ LIB= X11 .PATH: ${X11SRCDIR.${LIB}}/src @@ -446,5 +446,11 @@ CPPFLAGS.ximtrans.c= $(TRANS_INCLUDES) $ COPTS.StBytes.c+= -Wno-error COPTS.lcUTF8.c+= -Wno-error +COPTS.LiHosts.c+= -Wno-error +COPTS.Font.c+= -Wno-error +COPTS.FontNames.c+= -Wno-error +COPTS.GetFPath.c+= -Wno-error +COPTS.ListExt.c+= -Wno-error +COPTS.ModMap.c+= -Wno-error .include "${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys" Index: src/external/mit/xorg/lib/libXi/Makefile diff -u src/external/mit/xorg/lib/libXi/Makefile:1.3.6.1 src/external/mit/xorg/lib/libXi/Makefile:1.3.6.1.2.1 --- src/external/mit/xorg/lib/libXi/Makefile:1.3.6.1 Thu Sep 17 04:24:31 2009 +++ src/external/mit/xorg/lib/libXi/Makefile Thu Jun 6 16:48:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3.6.1 2009/09/17 04:24:31 snj Exp $ +# $NetBSD: Makefile,v 1.3.6.1.2.1 2013/06/06 16:48:35 riz Exp $ .include <bsd.own.mk> @@ -50,5 +50,7 @@ MLINKS= XGetDeviceControl.3 XChangeDevic PKGDIST= ${LIB} +COPTS.XGetFCtl.c+= -Wno-error + .include <bsd.x11.mk> .include <bsd.lib.mk>