Skip to content

Commit 9dac2e8

Browse files
author
marha
committed
Updated the following packages:
kbproto-1.0.7 libXaw-1.0.13 libXrender-0.9.9 libXt-1.1.5 xhost-1.0.7 xproto-7.0.28 font-util-1.3.1
1 parent 1bc3099 commit 9dac2e8

File tree

248 files changed

+18319
-20077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+18319
-20077
lines changed

Diff for: X11/ChangeLog

+42
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
2+
Author: Adam Jackson <[email protected]>
3+
Date: Wed Jul 1 11:35:13 2015 -0400
4+
5+
xproto 7.0.28
6+
7+
Signed-off-by: Adam Jackson <[email protected]>
8+
9+
commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7
10+
Author: Olivier Fourdan <[email protected]>
11+
Date: Fri May 29 18:16:34 2015 +0200
12+
13+
Increase the number of file descriptors
14+
15+
To allow up to 512 clients, the number of file descriptors being
16+
monitored need to be increased accordingly.
17+
18+
Signed-off-by: Adam Jackson <[email protected]>
19+
Signed-off-by: Olivier Fourdan <[email protected]>
20+
Reviewed-by: Alan Coopersmith <[email protected]>
21+
22+
commit 2dc2c38fb530c717b1944c93a889e4deff61b7f9
23+
Author: Jeremy Huddleston Sequoia <[email protected]>
24+
Date: Mon May 25 04:30:29 2015 -0700
25+
26+
darwin: Include strings.h
27+
28+
https://trac.macports.org/ticket/47813
29+
30+
Signed-off-by: Jeremy Huddleston Sequoia <[email protected]>
31+
32+
commit 70cf8acf06705097b009a488994b526832b0ef66
33+
Author: Thomas Klausner <[email protected]>
34+
Date: Sun Jan 11 00:39:14 2015 +0100
35+
36+
Use C99 compliant definition of nonnull attribute.
37+
38+
Fixes warning with clang.
39+
40+
Signed-off-by: Thomas Klausner <[email protected]>
41+
Reviewed-by: Alan Coopersmith <[email protected]>
42+
143
commit 303b137a55bb2d092b008439570a323c89a41d70
244
Author: Alan Coopersmith <[email protected]>
345
Date: Tue Dec 30 21:15:09 2014 -0800

Diff for: X11/Makefile.in

+31-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.14.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.15 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
1616

1717

1818
VPATH = @srcdir@
19-
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19+
am__is_gnu_make = { \
20+
if test -z '$(MAKELEVEL)'; then \
21+
false; \
22+
elif test -n '$(MAKE_HOST)'; then \
23+
true; \
24+
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
25+
true; \
26+
else \
27+
false; \
28+
fi; \
29+
}
2030
am__make_running_with_option = \
2131
case $${target_option-} in \
2232
?) ;; \
@@ -80,16 +90,12 @@ POST_UNINSTALL = :
8090
build_triplet = @build@
8191
host_triplet = @host@
8292
subdir = .
83-
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84-
$(top_srcdir)/configure $(am__configure_deps) \
85-
$(srcdir)/do-not-use-config.h.in $(srcdir)/Xfuncproto.h.in \
86-
$(srcdir)/Xpoll.h.in $(srcdir)/xproto.pc.in $(xproto_HEADERS) \
87-
AUTHORS COPYING ChangeLog INSTALL README compile config.guess \
88-
config.sub install-sh missing
8993
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9094
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9195
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9296
$(ACLOCAL_M4)
97+
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
98+
$(am__configure_deps) $(xproto_HEADERS) $(am__DIST_COMMON)
9399
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
94100
configure.lineno config.status.lineno
95101
mkinstalldirs = $(install_sh) -d
@@ -184,6 +190,10 @@ ETAGS = etags
184190
CTAGS = ctags
185191
CSCOPE = cscope
186192
DIST_SUBDIRS = $(SUBDIRS)
193+
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Xfuncproto.h.in \
194+
$(srcdir)/Xpoll.h.in $(srcdir)/do-not-use-config.h.in \
195+
$(srcdir)/xproto.pc.in AUTHORS COPYING ChangeLog INSTALL \
196+
README compile config.guess config.sub install-sh missing
187197
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
188198
distdir = $(PACKAGE)-$(VERSION)
189199
top_distdir = $(distdir)
@@ -286,6 +296,8 @@ PACKAGE_URL = @PACKAGE_URL@
286296
PACKAGE_VERSION = @PACKAGE_VERSION@
287297
PATH_SEPARATOR = @PATH_SEPARATOR@
288298
PKG_CONFIG = @PKG_CONFIG@
299+
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
300+
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
289301
SED = @SED@
290302
SET_MAKE = @SET_MAKE@
291303
SHELL = @SHELL@
@@ -403,7 +415,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
403415
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
404416
$(am__cd) $(top_srcdir) && \
405417
$(AUTOMAKE) --foreign Makefile
406-
.PRECIOUS: Makefile
407418
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
408419
@case '$?' in \
409420
*config.status*) \
@@ -702,15 +713,15 @@ dist-xz: distdir
702713
$(am__post_remove_distdir)
703714

704715
dist-tarZ: distdir
705-
@echo WARNING: "Support for shar distribution archives is" \
706-
"deprecated." >&2
716+
@echo WARNING: "Support for distribution archives compressed with" \
717+
"legacy program 'compress' is deprecated." >&2
707718
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
708719
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
709720
$(am__post_remove_distdir)
710721

711722
dist-shar: distdir
712-
@echo WARNING: "Support for distribution archives compressed with" \
713-
"legacy program 'compress' is deprecated." >&2
723+
@echo WARNING: "Support for shar distribution archives is" \
724+
"deprecated." >&2
714725
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
715726
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
716727
$(am__post_remove_distdir)
@@ -746,17 +757,17 @@ distcheck: dist
746757
esac
747758
chmod -R a-w $(distdir)
748759
chmod u+w $(distdir)
749-
mkdir $(distdir)/_build $(distdir)/_inst
760+
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
750761
chmod a-w $(distdir)
751762
test -d $(distdir)/_build || exit 0; \
752763
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
753764
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
754765
&& am__cwd=`pwd` \
755-
&& $(am__cd) $(distdir)/_build \
756-
&& ../configure \
766+
&& $(am__cd) $(distdir)/_build/sub \
767+
&& ../../configure \
757768
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
758769
$(DISTCHECK_CONFIGURE_FLAGS) \
759-
--srcdir=.. --prefix="$$dc_install_base" \
770+
--srcdir=../.. --prefix="$$dc_install_base" \
760771
&& $(MAKE) $(AM_MAKEFLAGS) \
761772
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
762773
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -939,6 +950,8 @@ uninstall-am: uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
939950
tags-am uninstall uninstall-am uninstall-nodist_xprotoHEADERS \
940951
uninstall-pkgconfigDATA uninstall-xprotoHEADERS
941952

953+
.PRECIOUS: Makefile
954+
942955

943956
.PHONY: ChangeLog INSTALL
944957

Diff for: X11/Xfuncproto.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ in this Software without prior written authorization from The Open Group.
152152
argument macros, must be only used inside #ifdef _X_NONNULL guards, as
153153
many legacy X clients are compiled in C89 mode still. */
154154
#if __has_attribute(nonnull) \
155+
&& defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
156+
#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
157+
#elif __has_attribute(nonnull) \
155158
|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
156159
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
157160
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */

Diff for: X11/Xfuncs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void bcopy();
4444
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
4545
# else
4646
# include <string.h>
47-
# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX)
47+
# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
4848
# include <strings.h>
4949
# endif
5050
# define _XFUNCS_H_INCLUDED_STRING_H

Diff for: X11/Xos.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
6060
*/
6161

6262
# include <string.h>
63-
# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX)
63+
# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
6464
# include <strings.h>
6565
# else
6666
# ifndef index

Diff for: X11/Xpoll.h.in

+11-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef long fd_mask;
6767
# endif
6868
#endif
6969

70-
#define XFD_SETSIZE 256
70+
#define XFD_SETSIZE 512
7171

7272
#ifndef FD_SETSIZE
7373
#define FD_SETSIZE XFD_SETSIZE
@@ -127,7 +127,16 @@ typedef struct fd_set {
127127
(howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
128128
(howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
129129
(howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
130-
(howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
130+
(howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))) || \
131+
(howmany(FD_SETSIZE, NFDBITS) > 8 && (__XFDS_BITS(p, 8))) || \
132+
(howmany(FD_SETSIZE, NFDBITS) > 9 && (__XFDS_BITS(p, 9))) || \
133+
(howmany(FD_SETSIZE, NFDBITS) > 10 && (__XFDS_BITS(p, 10))) || \
134+
(howmany(FD_SETSIZE, NFDBITS) > 11 && (__XFDS_BITS(p, 11))) || \
135+
(howmany(FD_SETSIZE, NFDBITS) > 12 && (__XFDS_BITS(p, 12))) || \
136+
(howmany(FD_SETSIZE, NFDBITS) > 13 && (__XFDS_BITS(p, 13))) || \
137+
(howmany(FD_SETSIZE, NFDBITS) > 14 && (__XFDS_BITS(p, 14))) || \
138+
(howmany(FD_SETSIZE, NFDBITS) > 15 && (__XFDS_BITS(p, 15))))
139+
131140

132141
#define XFD_COPYSET(src,dst) { \
133142
int __i__; \

0 commit comments

Comments
 (0)