<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f5bb40e7e32dcd50f422ed182337bca6ef76c50d">https://github.com/macports/macports-ports/commit/f5bb40e7e32dcd50f422ed182337bca6ef76c50d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f5bb40e xorg-libXfont2: upgrade to 2.0.3
</span>f5bb40e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f5bb40e7e32dcd50f422ed182337bca6ef76c50d
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Thu Aug 23 08:55:59 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> xorg-libXfont2: upgrade to 2.0.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> All the patches seem to have been incorporated into 2.0.3 so
</span><span style='display:block; white-space:pre;color:#404040;'> they've been removed.
</span>---
x11/xorg-libXfont2/Portfile | 114 +++----
...compiler-warning-flags-.-Leave-warning-fi.patch | 356 ---------------------
.../0002-FreeType-Correct-an-allocation-size.patch | 33 --
...-out-on-invalid-input-to-FontFileMakeDir-.patch | 32 --
.../0004-fserve-Silence-a-Wformat-warning.patch | 33 --
.../0005-fstrans-Remove-unused-foo-function.patch | 33 --
...a-buffer-read-overrun-in-_fs_client_acces.patch | 61 ----
...igure-Use-fvisibility-hidden-if-available.patch | 46 ---
...-Fix-a-logic-error-in-computing-face-name.patch | 30 --
9 files changed, 53 insertions(+), 685 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/Portfile b/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 297c957..26a7dae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +1,46 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name xorg-libXfont2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11 devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license X11 BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description X.org libXfont
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name xorg-libXfont2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license X11 BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description X.org libXfont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin macosx
</span> long_description X font handling library for server and utilities
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites xorg:individual/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites xorg:individual/lib/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname libXfont2-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 4cf056ab00bf631649e040051cf8e2b096cc245b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3522b8ec43b6d45f096c815365895fc977046bbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname libXfont2-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0342f0c1264559ac6ab5a21ed200b4ae9d6d8d41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 497085
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span>
use_parallel_build yes
depends_build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xtrans
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xtrans
</span>
depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libfontenc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fontsproto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libfontenc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-fontsproto
</span>
configure.args \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-Revert-Add-compiler-warning-flags-.-Leave-warning-fi.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-FreeType-Correct-an-allocation-size.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-bitmap-Bail-out-on-invalid-input-to-FontFileMakeDir-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-fserve-Silence-a-Wformat-warning.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-fstrans-Remove-unused-foo-function.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-fserve-Fix-a-buffer-read-overrun-in-_fs_client_acces.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-configure-Use-fvisibility-hidden-if-available.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0009-freetype-Fix-a-logic-error-in-computing-face-name.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,26 +50,26 @@ build.args V=1
</span> # Depending on ghostscript for the PDF documentation creates a dependency
# loop, so you may want to install first without the docs variant
variant docs description "Install extra documentation" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xmlto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP="${prefix}/bin/fop"
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0001-Revert-Add-compiler-warning-flags-.-Leave-warning-fi.patch b/x11/xorg-libXfont2/files/0001-Revert-Add-compiler-warning-flags-.-Leave-warning-fi.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f4b9d4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0001-Revert-Add-compiler-warning-flags-.-Leave-warning-fi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,356 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From eefc0b0b908eb8533e704d7156ce983ad7891cc5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Keith Packard <keithp@keithp.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 12 Dec 2015 14:54:26 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/9] Revert "Add compiler warning flags". Leave warning fixes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This reverts commit eb67d10ae82b364a4324e96ce53baaa4e5e75f97, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-leaves the warning fixes in place; it looks like either I was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-confused, or something has changed so that XORG_DEFAULT_OPTIONS now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pulls in the appropriate compiler warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 24 -----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4/attributes.m4 | 283 -------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 307 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete mode 100644 m4/attributes.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a555151..13c8c97 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,6 @@ AC_INIT([libXfont2], [2.0.1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_SRCDIR([Makefile.am])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_HEADERS([config.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CONFIG_MACRO_DIR([m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Initialize Automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,27 +57,6 @@ AC_CHECK_FUNCS([poll readlink])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # must first be located explicitly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_PROG_PKG_CONFIG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--with_cflags=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$GCC" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wall \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wextra \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-sign-compare \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-missing-field-initializers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-unused-parameter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wstrict-prototypes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wmissing-prototypes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fvisibility=hidden \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -pipe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fno-strict-aliasing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -ffunction-sections \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fdata-sections \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fno-strict-aliasing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fdiagnostics-show-option \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -fno-common])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_SUBST([GCC_CFLAGS], $with_cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # select libraries to include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,8 +217,6 @@ case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OS_CFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OS_CFLAGS="$OS_CFLAGS $GCC_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([OS_CFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_FILES([Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/m4/attributes.m4 b/m4/attributes.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-deleted file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5fbd43d..0000000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/m4/attributes.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,283 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Macros to check the presence of generic (non-typed) symbols.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Copyright (c) 2006-2008 xine project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl This program is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl the Free Software Foundation; either version 2, or (at your option)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl This program is distributed in the hope that it will be useful,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl GNU General Public License for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl along with this program; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl As a special exception, the copyright owners of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl macro gives unlimited permission to copy, distribute and modify the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl configure scripts that are the output of Autoconf when processing the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Macro. You need not follow the terms of the GNU General Public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl License when using or distributing such scripts, even though portions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl of the text of the Macro appear in them. The GNU General Public
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl License (GPL) does govern all other use of the material that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl constitutes the Autoconf Macro.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl This special exception to the GPL applies to versions of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Autoconf Macro released by this project. When you make and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl distribute a modified version of the Autoconf Macro, you may extend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl this special exception to the GPL to apply to your modified version as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl well.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Check if FLAG in ENV-VAR is supported by compiler and append it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl to WHERE-TO-APPEND variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_CHECK_FLAG_APPEND], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_TR_SH([cc_cv_$2_$3]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_save_$2])='${$2}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eval "AS_TR_SH([$2])='-Werror $3'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_LINK_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eval "AS_TR_SH([$2])='$cc_save_$2'"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "$1='${$1} $3'"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for flag in $3; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_FLAG_APPEND($1, $2, $flag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Check if the flag is supported by linker (cacheable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_CHECK_LDFLAGS], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([if $CC supports $1 flag],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_TR_SH([cc_cv_ldflags_$1]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ac_save_LDFLAGS="$LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS $1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_LINK_IFELSE([int main() { return 1; }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$ac_save_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$2], [$3])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl the current linker to avoid undefined references in a shared object.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_NOUNDEFINED], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl We check $host for which systems to enable this for.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_REQUIRE([AC_CANONICAL_HOST])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case $host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl are requested, as different implementations are present; to avoid problems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl use -Wl,-z,defs only for those platform not behaving this way.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-freebsd* | *-openbsd*) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl First of all check for the --no-undefined variant of GNU ld. This allows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl for a much more readable commandline, so that people can understand what
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dnl it does without going to look for what the heck -z defs does.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_SUBST([LDFLAGS_NOUNDEFINED])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Check for a -Werror flag or equivalent. -Werror is the GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl and ICC flag that tells the compiler to treat all the warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl as fatal. We usually need this option to make sure that some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl constructs (like attributes) are not simply ignored.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Other compilers don't support -Werror per se, but they support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl an equivalent flag:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl - Sun Studio compiler supports -errwarn=%all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl we don't test for that, it gives us false positives when gcc doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl actually complain about it. If someone wants to compile this on sun, let
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl them fix it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_CHECK_WERROR], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [for $CC way to treat warnings as errors],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_werror],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [CC_CHECK_FLAG_APPEND([cc_cv_werror], [CFLAGS], [-Werror])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_CHECK_ATTRIBUTE], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_REQUIRE([CC_CHECK_WERROR])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_TR_SH([cc_cv_attribute_$1]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ac_save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS $cc_cv_werror"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$ac_save_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $4],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$5])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [constructor],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void __attribute__((constructor)) ctor() { int a; }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_FORMAT], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [format], [format(printf, n, n)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [format_arg], [format_arg(printf)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [visibility_$1], [visibility("$1")],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void __attribute__((visibility("$1"))) $1_function() { }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$2], [$3])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_NONNULL], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [nonnull], [nonnull()],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_UNUSED], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [unused], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void some_function(void *foo, __attribute__((unused)) void *bar);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [sentinel], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void some_function(void *foo, ...) __attribute__((sentinel));],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [deprecated], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void some_function(void *foo, ...) __attribute__((deprecated));],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_ALIAS], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [alias], [weak, alias],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void other_function(void *foo) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void some_function(void *foo) __attribute__((weak, alias("other_function")));],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_MALLOC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [malloc], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [void * __attribute__((malloc)) my_alloc(int n);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_PACKED], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [packed], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_CONST], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC_CHECK_ATTRIBUTE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [const], ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [int __attribute__((const)) twopow(int n) { return 1 << n; } ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$1], [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_FLAG_VISIBILITY], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_flag_visibility],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [CC_CHECK_FLAG_APPEND([cc_cv_flag_visibility], [CFLAGS], [-fvisibility=hidden])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([test "x$cc_cv_flag_visibility" != "x"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [Define this if the compiler supports the -fvisibility flag])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_FUNC_EXPECT], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_REQUIRE([CC_CHECK_WERROR])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([if compiler has __builtin_expect function],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_func_expect],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ac_save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS $cc_cv_werror"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_SOURCE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [int some_function() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int a = 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (int)__builtin_expect(a, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_func_expect=yes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_func_expect=no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$ac_save_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS_IF([test "x$cc_cv_func_expect" = "xyes"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [Define this if the compiler supports __builtin_expect() function])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $1],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [$2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_REQUIRE([CC_CHECK_WERROR])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [cc_cv_attribute_aligned],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ac_save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS $cc_cv_werror"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for cc_attribute_align_try in 64 32 16 8 4 2; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$ac_save_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$cc_cv_attribute_aligned" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [Define the highest alignment supported])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0002-FreeType-Correct-an-allocation-size.patch b/x11/xorg-libXfont2/files/0002-FreeType-Correct-an-allocation-size.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 110f38f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0002-FreeType-Correct-an-allocation-size.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d0fff111992fed9d9bfbf0c19e136bda9ba1db55 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 May 2016 23:29:50 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/9] FreeType: Correct an allocation size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Found by clang static analysis:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Result of 'calloc' is converted to a pointer of type 'int', which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incompatible with sizeof operand type 'int *'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is likely benign because the old size was larger on any platform where
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sizeof(int) <= sizeof(void *), which is everywhere.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/FreeType/ftfuncs.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bbd4db4..e7c8026 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/FreeType/ftfuncs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/FreeType/ftfuncs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -623,7 +623,7 @@ FreeTypeInstanceFindGlyph(unsigned idx_in, int flags, FTInstancePtr instance,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- offset = idx - segment * FONTSEGMENTSIZE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((*available)[segment] == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int *));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((*available)[segment] == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return AllocError;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0003-bitmap-Bail-out-on-invalid-input-to-FontFileMakeDir-.patch b/x11/xorg-libXfont2/files/0003-bitmap-Bail-out-on-invalid-input-to-FontFileMakeDir-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdea610..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0003-bitmap-Bail-out-on-invalid-input-to-FontFileMakeDir-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ac559fad20bbae45332c758abb6a790c3fd341a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 May 2016 23:34:35 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/9] bitmap: Bail out on invalid input to FontFileMakeDir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instead of calling calloc for 0 bytes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Found by clang static analysis:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Call to 'calloc' has an allocation size of 0 bytes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/bitmap/bitscale.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 22747a9..00adcc6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/bitmap/bitscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/bitmap/bitscale.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1477,6 +1477,10 @@ BitmapScaleBitmaps(FontPtr pf, /* scaled font */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lastRow = pfi->lastRow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nchars = (lastRow - firstRow + 1) * (lastCol - firstCol + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (nchars <= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto bail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glyph = pf->glyph;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < nchars; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0004-fserve-Silence-a-Wformat-warning.patch b/x11/xorg-libXfont2/files/0004-fserve-Silence-a-Wformat-warning.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44555b0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0004-fserve-Silence-a-Wformat-warning.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e6009adbc89ec3e1f924bcb57b333c1c02f5e66d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 May 2016 23:37:13 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/9] fserve: Silence a -Wformat warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/fc/fserve.c:653:32: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long') [-Wformat]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " from font server\n", rep->length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1 warning generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fc/fserve.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fc/fserve.c b/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 42c4028..fb1941d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -649,8 +649,8 @@ fs_get_reply (FSFpePtr conn, int *error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rep->length > MAX_REPLY_LENGTH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ErrorF("fserve: reply length %d > MAX_REPLY_LENGTH, disconnecting"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " from font server\n", rep->length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ErrorF("fserve: reply length %ld > MAX_REPLY_LENGTH, disconnecting"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " from font server\n", (long)rep->length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_connection_died (conn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *error = FSIO_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0005-fstrans-Remove-unused-foo-function.patch b/x11/xorg-libXfont2/files/0005-fstrans-Remove-unused-foo-function.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 46895db..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0005-fstrans-Remove-unused-foo-function.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d967caa988eaabd9e84c82879e2f21bd33b952a7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 May 2016 23:39:06 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/9] fstrans: Remove unused foo() function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The point of it seems to have been to silence an unused function warning, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-there's no point if we're just transitioning that to another unused function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-warning.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-src/fc/fstrans.c:32:20: warning: unused function 'foo' [-Wunused-function]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-static inline void foo(void) { (void) is_numeric("a"); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1 warning generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Keith Packard <keithp@keithp.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fc/fstrans.c | 2 --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fc/fstrans.c b/src/fc/fstrans.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66bc978..902ef36 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fc/fstrans.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fc/fstrans.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,5 +28,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FONT_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TRANS_CLIENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xtrans/transport.c>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* inhibit warning about is_numeric */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static inline void foo(void) { (void) is_numeric("a"); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0006-fserve-Fix-a-buffer-read-overrun-in-_fs_client_acces.patch b/x11/xorg-libXfont2/files/0006-fserve-Fix-a-buffer-read-overrun-in-_fs_client_acces.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 87f2219..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0006-fserve-Fix-a-buffer-read-overrun-in-_fs_client_acces.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 30 May 2016 00:46:21 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 6/9] fserve: Fix a buffer read overrun in _fs_client_access
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=83224
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Found by clang's Address Sanitizer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crac.num_auths = set_font_authorizations(&authorizations, &authlen,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- client);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Work around bug in xfs versions up through modular release 1.0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which rejects CreateAC packets with num_auths = 0 & authlen < 4 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crac.num_auths == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- authorizations = padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- authlen = 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- authlen = (authlen + 3) & ~0x3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crac.acid = cur->acid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_add_req_log(conn, FS_CreateAC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_write(conn, authorizations, authlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In the case in the report, set_font_authorizations setup authorizations as a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-34 byte buffer (and authlen set to 34 as one would expect). The following
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-block changed authlen to 36 to make it 4byte aligned and the final _fs_write()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-caused us to read 36 bytes from this 34 byte buffer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This changes the incorrect size increase to instead use _fs_write_pad which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-takes care of the padding for us.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fc/fserve.c | 4 +---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fc/fserve.c b/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb1941d..708fc35 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fc/fserve.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2856,14 +2856,12 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crac.num_auths == 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- authorizations = padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- authlen = 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- authlen = (authlen + 3) & ~0x3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crac.length = (sizeof (fsCreateACReq) + authlen) >> 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crac.acid = cur->acid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_add_req_log(conn, FS_CreateAC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _fs_write(conn, authorizations, authlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _fs_write_pad(conn, authorizations, authlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ignore reply; we don't even care about it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conn->curacid = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur->auth_generation = client_auth_generation(client);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0007-configure-Use-fvisibility-hidden-if-available.patch b/x11/xorg-libXfont2/files/0007-configure-Use-fvisibility-hidden-if-available.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 801d03b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0007-configure-Use-fvisibility-hidden-if-available.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7557fe152d9948bcb4b805bb7b6b6f8121bd34fb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 18 May 2016 11:52:27 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 7/9] configure: Use -fvisibility=hidden if available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-text data bss dec hex filename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 233732 8168 1616 243516 3b73c .libs/libXfont2.so.2.before
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 217113 6816 1616 225545 37109 .libs/libXfont2.so.2.after
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 17 +++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 17 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 13c8c97..062f75d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,6 +217,23 @@ case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OS_CFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS="$CFLAGS -fvisibility=hidden"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS_VISIBILITY=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_COMPILE_IFELSE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_LANG_SOURCE([[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__CYGWIN__) || defined(__MINGW32__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #error No visibility support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern __attribute__((__visibility__("default"))) int x;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [CFLAGS_VISIBILITY=-fvisibility=hidden],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS="$save_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OS_CFLAGS="$OS_CFLAGS $CFLAGS_VISIBILITY"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([OS_CFLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_FILES([Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/files/0009-freetype-Fix-a-logic-error-in-computing-face-name.patch b/x11/xorg-libXfont2/files/0009-freetype-Fix-a-logic-error-in-computing-face-name.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7579861..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/files/0009-freetype-Fix-a-logic-error-in-computing-face-name.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 33a98f2b5343da927f29191348e992f505544873 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 8 Jun 2016 14:28:09 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 9/9] freetype: Fix a logic error in computing face name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gcc6 chirps an indentation warning here, but really this is bad code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Effectively this would ignore en_US or en_UK names for the font, despite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-that those are the English names the font is most likely to have.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Adam Jackson <ajax@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/FreeType/fttools.c | 1 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7c0bd9b..0329fae 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/FreeType/fttools.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/FreeType/fttools.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,6 @@ FTGetName(FT_Face face, int nid, int pid, int eid, FT_SfntName *name_return)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case TT_PLATFORM_MICROSOFT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(name.language_id != TT_MS_LANGID_ENGLISH_UNITED_STATES &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name.language_id != TT_MS_LANGID_ENGLISH_UNITED_KINGDOM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>