574dbdebb7
This release of libX11 includes a number of fixes to handle realloc() failure better, resolves a number of compiler & static analyzer warnings, fixes several bugs in the X Input Method framework, and cleans up the XKB code to be a little more maintainable. Alan Coopersmith (28): Fix file leak on malloc error in XlcDL.c:resolve_object() lcfile: skip over any null entries in args list xlibi18n: convert sprintf calls to snprintf ximcp/imRm.c: convert sprintf calls to snprintf omGeneric.c: convert sprintf calls to snprintf Avoid memory leak/corruption if realloc fails in XlcDL.c:resolve_object() lcDB.c: ensure buffer size is updated correctly if realloc fails Avoid memory leak/corruption if realloc fails in imLcPrs.c:parseline() Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macro miRegionCopy(): handle realloc failure better miRegionOp(): ensure region size is not updated if realloc fails Delete unused XKB_INSURE_SIZE macro from XKBlibint.h init_om: remove unneeded extra copy of string to local buffer Constify lc_name argument to _XlcLocaleDirName() & _XlcLocaleLibDirName() Fix const handling in XSetLocaleModifiers xlibi18n: Fix a bunch of const cast warnings i18n modules: Fix some const cast warnings xlibi18n: fix argsize argument to _XlcParsePath Remove even more casts of return values from Xmalloc/Xrealloc Don't cast sizeof() results to unsigned when passing to Xmalloc/Xcalloc Remove unnecessary casts of pointers to (char *) in calls to Xfree() Remove long unused src/udcInf.c Fix overflow checks in _XkbReadKeySyms when key_sym_map is already created Reindent XKB code to X.Org standard style Rearrange some variable declarations & initializations in XKB Stop checking for HAVE_DIX_CONFIG_H on the client side Bug 68413 - [Bisected]Error in `xterm': realloc(): invalid next size libX11 1.6.2 Benno Schulenberg (1): nls: Adding more accessible compose sequences for J́ and j́. Egbert Eich (2): XIM: Fix race on focus change: set 'FABRICATED' only when keyev filters in place. XIM: Fix sync problem on focus change. ISHIKAWA,chiaki (1): Fix bogus timestamp generated by XIM Julien Cristau (1): Add missing locales to configure.ac
61 lines
1.7 KiB
Makefile
61 lines
1.7 KiB
Makefile
# $NetBSD: Makefile,v 1.35 2013/09/09 09:44:41 wiz Exp $
|
|
|
|
DISTNAME= libX11-1.6.2
|
|
CATEGORIES= x11 devel
|
|
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
|
|
EXTRACT_SUFX= .tar.bz2
|
|
|
|
MAINTAINER= joerg@NetBSD.org
|
|
HOMEPAGE= http://xorg.freedesktop.org/
|
|
COMMENT= Base X libraries from modular Xorg X11
|
|
LICENSE= mit
|
|
|
|
PKG_INSTALLATION_TYPES= overwrite pkgviews
|
|
|
|
USE_LIBTOOL= yes
|
|
GNU_CONFIGURE= yes
|
|
USE_TOOLS+= gmake pkg-config
|
|
|
|
CONFIGURE_ARGS+= --enable-man-pages=3
|
|
CONFIGURE_ARGS+= --with-xcb
|
|
CONFIGURE_ARGS+= --disable-specs
|
|
PKGCONFIG_OVERRIDE+= x11.pc.in
|
|
|
|
CONFIGURE_ENV+= FILE_MAN_SUFFIX=5
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
.if ${OPSYS} == "NetBSD"
|
|
CONFIGURE_ARGS+= --disable-malloc0returnsnull
|
|
.endif
|
|
|
|
CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
|
|
CPPFLAGS.MirBSD+= -pthread
|
|
LDFLAGS.MirBSD+= -pthread
|
|
|
|
BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
|
|
|
|
TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
|
|
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
|
|
|
|
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
|
|
CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
|
|
|
|
# XXX This needs to match the version of xcb-proto we get for the
|
|
# target by buildlink3.
|
|
TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto
|
|
.endif
|
|
|
|
.include "../../x11/bigreqsproto/buildlink3.mk"
|
|
.include "../../x11/inputproto/buildlink3.mk"
|
|
.include "../../x11/kbproto/buildlink3.mk"
|
|
.include "../../x11/libXau/buildlink3.mk"
|
|
.include "../../x11/libXdmcp/buildlink3.mk"
|
|
.include "../../x11/libxcb/buildlink3.mk"
|
|
.include "../../x11/xcmiscproto/buildlink3.mk"
|
|
.include "../../x11/xextproto/buildlink3.mk"
|
|
.include "../../x11/xf86bigfontproto/buildlink3.mk"
|
|
.include "../../x11/xproto/buildlink3.mk"
|
|
.include "../../x11/xtrans/buildlink3.mk"
|
|
|
|
.include "../../mk/bsd.pkg.mk"
|