Update from 1.3.5 to 1.5.0 based on PR pkg/46183

[ANNOUNCE] libX11 1.5.0
------------------------
 At long last, the stable release of Xlib 1.5.0.

 While it only strictly requires libxcb 1.2, it's recommended that libxcb 1.8.1
 be used to get the fix for network connection fallback from Unix sockets to
 TCP that replaces the code previously found in libX11.

 Since there have been no changes since the final release candidate,
 here's the full list of changes since libX11 1.4.4:

    ( Some 150 lines omitted, see following URL for detail )
 http://lists.x.org/archives/xorg-announce/2012-June/001970.html

[ANNOUNCE] libX11 1.4.4
-----------------------
Thu, 28 Jul 2011 20:05:49 -0700 by  Alan Coopersmith

Another bug fix release of libX11 brings another large set of fixes
found by static analysis or to ease further static analysis, many
documentation fixes and improvments, and improved assertions to
help users and developers figure out why Xlib just crashed on them.

[ANNOUNCE] libX11 1.4.3
-----------------------
Tue Apr 5 14:18:18 PDT 2011 by Alan Coopersmith

A minor release of libX11 to add support for the Sinhala keysyms required
by the recent xkb-config 2.2 release.   Note that to get full support for
these keysyms you will also need to upgrade to x11proto 7.0.21 before
building the new libX11.

[ANNOUNCE] libX11 1.4.2
-----------------------
This bugfix release pulls in a ton of fixes for problems found by code static
analysis tools.  Many thanks to everyone who has helped find and fix these
issues before they turned into nasty problems.

Additionally, Jamey Sharp has provided some fixes for Display lock handling
that caused some deadlocks when using xcb for transport (which was optional
in 1.3.x and is required in 1.4.x), so this update is highly recomended to
users of multi-threaded Xlib applications.

[ANNOUNCE] libX11 1.4.1
------------------------
Tue, 11 Jan 2011 22:35:19 -0800 by Alan Coopersmith

This bugfix release corrects two small issues in Xlib event handling,
and provides, for the first time ever, the XKB API spec in DocBook format.

[ANNOUNCE] libX11 1.4.0
------------------------
Sun Nov 21 14:38:32 PST 2010 by Alan Coopersmith

After 3 release candidates, it's finally done - libX11 1.4 is released.

As previously warned, libX11 1.4 *requires* libxcb.   The Xlib 1.3 branch
continues to support the --without-xcb option for the benefit of any
remaining distributors who do not yet ship XCB in their stable releases.

[ANNOUNCE] libX11 1.3.6
------------------------
2010-09-20 6:16:18 by Daniel Stone

Just a small maintenance release for libX11; pending any catastrophic
bugs, this will probably be the last release from the 1.3.x branch.  The
XStringToKeysym changes should provide a not-insignificant speedup for
X server and application startup.
This commit is contained in:
mef 2012-07-10 03:03:01 +00:00
parent 0d5680a5ce
commit eea650b868
5 changed files with 33 additions and 31 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.26 2011/09/18 11:55:22 bsiegert Exp $
# $NetBSD: Makefile,v 1.27 2012/07/10 03:03:01 mef Exp $
#
DISTNAME= libX11-1.3.5
DISTNAME= libX11-1.5.0
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@ -39,6 +39,8 @@ CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
CPPFLAGS.MirBSD+= -pthread
LDFLAGS.MirBSD+= -pthread
BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2010/09/10 20:28:03 joerg Exp $
@comment $NetBSD: PLIST,v 1.9 2012/07/10 03:03:01 mef Exp $
include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
@ -132,6 +132,7 @@ man/man3/XCloseIM.3
man/man3/XCloseOM.3
man/man3/XColor.3
man/man3/XColormapEvent.3
man/man3/XCompose.3
man/man3/XConfigureEvent.3
man/man3/XConfigureRequestEvent.3
man/man3/XConfigureWindow.3
@ -232,7 +233,7 @@ man/man3/XFreeFontNames.3
man/man3/XFreeFontPath.3
man/man3/XFreeFontSet.3
man/man3/XFreeGC.3
man/man3/XFreeModifierMap.3
man/man3/XFreeModifiermap.3
man/man3/XFreePixmap.3
man/man3/XFreeStringList.3
man/man3/XGCValues.3
@ -835,7 +836,6 @@ man/man3/XwcTextPropertyToTextList.3
man/man5/Compose.5
man/man5/XCompose.5
share/X11/XErrorDB
share/X11/XKeysymDB
share/X11/locale/C/Compose
share/X11/locale/C/XI18N_OBJS
share/X11/locale/C/XLC_LOCALE

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.18 2011/09/15 19:50:14 bsiegert Exp $
$NetBSD: distinfo,v 1.19 2012/07/10 03:03:01 mef Exp $
SHA1 (libX11-1.3.5.tar.bz2) = c5dda2b6279f3e3267646576138fcd091a7f3c54
RMD160 (libX11-1.3.5.tar.bz2) = 84544006514eec6f37b642b294ea5f3658b52934
Size (libX11-1.3.5.tar.bz2) = 2104595 bytes
SHA1 (patch-aa) = 553d0905e16f8e17e746d79761709c11c4fa3d55
SHA1 (patch-ac) = 06d4b2c34d8fa39bddbc1ce625e0dc344e5dea7e
SHA1 (libX11-1.5.0.tar.bz2) = 8177535c9c59d8c3ab98d55ce53520b5737ccd1a
RMD160 (libX11-1.5.0.tar.bz2) = 53873128000cb6827941ee81cb005f5b730a7940
Size (libX11-1.5.0.tar.bz2) = 2322265 bytes
SHA1 (patch-aa) = ed69aa016d58e46fa9349778852264e3e1975135
SHA1 (patch-ac) = 5d73fc6b7544f8be7a988f0fd5cb17dd84b25896

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.9 2011/09/15 19:50:14 bsiegert Exp $
$NetBSD: patch-aa,v 1.10 2012/07/10 03:03:01 mef Exp $
Include pthread.h as thread stubs might be macros like on NetBSD.
@ -7,9 +7,9 @@ Define conditional for cross-compiling support.
Also, don't look for keysmydef.h, as this could break cross
builds (from GIT).
--- configure.ac.orig Wed Aug 11 23:23:48 2010
+++ configure.ac
@@ -315,7 +315,7 @@ xyes)
--- configure.ac.orig 2012-06-02 15:37:17.000000000 +0900
+++ configure.ac 2012-06-28 19:14:45.000000000 +0900
@@ -277,7 +277,7 @@
;;
esac
@ -17,9 +17,9 @@ builds (from GIT).
+AC_CHECK_DECLS([pthread_self], [thrstubs="no"], [thrstubs="yes"], [[#include <pthread.h>]])
AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
dnl XXX incomplete, please fill this in
@@ -324,12 +324,12 @@ if test x$xthreads = xyes ; then
linux*|openbsd*|gnu*|k*bsd*-gnu)
# XXX incomplete, please fill this in
@@ -286,12 +286,12 @@
linux*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
@ -29,8 +29,8 @@ builds (from GIT).
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
- dragonfly*)
+ dragonfly*|mirbsd*)
- dragonfly*|openbsd*)
+ dragonfly*|openbsd*|mirbsd*)
XTHREADLIB="-pthread" ;;
solaris*)
XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;

View file

@ -1,20 +1,20 @@
$NetBSD: patch-ac,v 1.11 2011/09/15 19:50:14 bsiegert Exp $
$NetBSD: patch-ac,v 1.12 2012/07/10 03:03:01 mef Exp $
See patch-aa.
--- configure.orig Wed Jul 27 08:46:21 2011
+++ configure
@@ -14431,43 +14431,18 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>c
--- configure.orig 2012-06-02 15:37:31.000000000 +0900
+++ configure 2012-06-28 19:20:03.000000000 +0900
@@ -19942,43 +19942,18 @@
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
-$as_echo_n "checking for pthread_self in -lc... " >&6; }
-if test "${ac_cv_lib_c_pthread_self+set}" = set; then :
-if ${ac_cv_lib_c_pthread_self+:} false; then :
- $as_echo_n "(cached) " >&6
+ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
+"
+if test "x$ac_cv_have_decl_pthread_self" = x""yes; then :
+if test "x$ac_cv_have_decl_pthread_self" = xyes; then :
+ ac_have_decl=1
else
- ac_check_lib_save_LIBS=$LIBS
@ -52,13 +52,13 @@ See patch-aa.
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
-$as_echo "$ac_cv_lib_c_pthread_self" >&6; }
-if test "x$ac_cv_lib_c_pthread_self" = x""yes; then :
-if test "x$ac_cv_lib_c_pthread_self" = xyes; then :
+if test $ac_have_decl = 1; then :
thrstubs="no"
else
thrstubs="yes"
@@ -14487,12 +14462,12 @@ if test x$xthreads = xyes ; then
linux*|openbsd*|gnu*|k*bsd*-gnu)
@@ -19999,12 +19974,12 @@
linux*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
@ -68,8 +68,8 @@ See patch-aa.
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
- dragonfly*)
+ dragonfly*|mirbsd*)
- dragonfly*|openbsd*)
+ dragonfly*|openbsd*|mirbsd*)
XTHREADLIB="-pthread" ;;
solaris*)
XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;