diff options
5 files changed, 29 insertions, 127 deletions
diff --git a/patches/fontconfig/0001-Drop-set-e-so-missing-bwrap-doesn-t-cause-test-to-fa.patch b/patches/fontconfig/0001-Drop-set-e-so-missing-bwrap-doesn-t-cause-test-to-fa.patch new file mode 100644 index 0000000..47a3ef0 --- /dev/null +++ b/patches/fontconfig/0001-Drop-set-e-so-missing-bwrap-doesn-t-cause-test-to-fa.patch @@ -0,0 +1,24 @@ +From f65bfdda419c2a75d8763ee334a39763f5c49619 Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Wed, 4 Dec 2019 16:03:48 +0000 +Subject: [PATCH] Drop set -e so missing bwrap doesn't cause test to fail + +--- + test/run-test.sh | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/run-test.sh b/test/run-test.sh +index e1ee6d0..e062a16 100644 +--- a/test/run-test.sh ++++ b/test/run-test.sh +@@ -20,7 +20,6 @@ + # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. +-set -e + + case "$OSTYPE" in + msys ) MyPWD=`pwd -W` ;; # On Msys/MinGW, returns a MS Windows style path. +-- +2.21.0 + diff --git a/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch b/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch deleted file mode 100644 index 161c7b0..0000000 --- a/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c81fc168f3ba3f1878e8a6e86c94a4e64c5391d5 Mon Sep 17 00:00:00 2001 -From: Jon Turney <jon.turney@dronecode.org.uk> -Date: Mon, 15 Apr 2019 20:01:22 +0100 -Subject: [PATCH] Only use wrapper-script if host is MinGW - -Currently it fails if the executable extension is .exe, but wine isn't -available (e.g. on Cygwin) - -Possibly the check to use this wrapper should be even more restrictive -e.g. checking if cross-building and/or if wine is available. ---- - test/Makefile.am | 2 ++ - test/run-test.sh | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index fc47a50..8176d99 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -11,7 +11,9 @@ AM_TESTS_ENVIRONMENT= \ - BUILT_SOURCES = $(builddir)/out.expected - - SH_LOG_COMPILER = sh -+if OS_WIN32 - LOG_COMPILER = ${srcdir}/wrapper-script.sh -+endif - TESTS=run-test.sh - - TESTDATA = \ -diff --git a/test/run-test.sh b/test/run-test.sh -index b55efcb..12198ff 100644 ---- a/test/run-test.sh -+++ b/test/run-test.sh -@@ -32,7 +32,6 @@ BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX` - FONTDIR="$BASEDIR"/fonts - CACHEDIR="$BASEDIR"/cache.dir - EXPECTED=${EXPECTED-"out.expected"} --LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"} - - ECHO=true - --- -2.17.0 - diff --git a/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch b/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch deleted file mode 100644 index 99ac117..0000000 --- a/patches/libX11/0001-Add-include-needed-for-FIONREAD-on-Cygwin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a078fe9b51c5630d06344f58b24d547022258981 Mon Sep 17 00:00:00 2001 -From: Jon Turney <jon.turney@dronecode.org.uk> -Date: Wed, 13 Mar 2019 13:12:20 +0000 -Subject: [PATCH lib/libX11] Add include needed for FIONREAD on Cygwin - ---- - src/XlibInt.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/XlibInt.c b/src/XlibInt.c -index a0b2ed2f..56e37e2e 100644 ---- a/src/XlibInt.c -+++ b/src/XlibInt.c -@@ -52,6 +52,9 @@ from The Open Group. - #include <sys/filio.h> - #endif - -+/* Needed for FIONREAD on Cygwin */ -+#include <sys/socket.h> -+ - /* Needed for ioctl() on Solaris */ - #ifdef HAVE_UNISTD_H - #include <unistd.h> --- -2.17.0 - diff --git a/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch b/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch index 4763f63..980cf75 100644 --- a/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch +++ b/patches/mesa-mesa/0001-Disable-export-symbols-check-test.patch @@ -1,25 +1,17 @@ -From eb442289fc452773bf5f0377e412abb7e0860c03 Mon Sep 17 00:00:00 2001 +From a74afd99ae6d9fa7adf1caa5fdeda9c6fe5b5af6 Mon Sep 17 00:00:00 2001 From: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu, 11 Jul 2019 14:33:03 +0100 Subject: [PATCH] Disable export symbols check test --- - bin/symbols-check.py | 5 +++++ - 1 file changed, 5 insertions(+) + bin/symbols-check.py | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/bin/symbols-check.py b/bin/symbols-check.py -index b8562c83b5d..5dcbd7324ec 100644 +index 0d56a19561e..3f2c3b37554 100644 --- a/bin/symbols-check.py +++ b/bin/symbols-check.py -@@ -3,6 +3,7 @@ - import argparse - import subprocess - import os -+import platform - - # This list contains symbols that _might_ be exported for some platforms - PLATFORM_SYMBOLS = [ -@@ -112,4 +113,8 @@ def main(): +@@ -169,4 +169,8 @@ def main(): if __name__ == '__main__': diff --git a/patches/mesa-mesa/0001-rbug-Fix-use-of-alloca-without-include-c99_alloca.h.patch b/patches/mesa-mesa/0001-rbug-Fix-use-of-alloca-without-include-c99_alloca.h.patch deleted file mode 100644 index 90c3a1c..0000000 --- a/patches/mesa-mesa/0001-rbug-Fix-use-of-alloca-without-include-c99_alloca.h.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2fce58cfa24b4f725e162778c163b753f9722c2f Mon Sep 17 00:00:00 2001 -From: Jon Turney <jon.turney@dronecode.org.uk> -Date: Sat, 19 Oct 2019 14:43:49 +0100 -Subject: [PATCH] rbug: Fix use of alloca() without #include <c99_alloca.h> - -[12/60] Compiling C object 'src/gallium/auxiliary/eb820e8@@gallium@sta/rbug_rbug_texture.c.o'. -FAILED: src/gallium/auxiliary/eb820e8@@gallium@sta/rbug_rbug_texture.c.o -[...] -../src/gallium/auxiliary/rbug/rbug_texture.c: In function 'rbug_send_texture_info_reply': -../src/gallium/auxiliary/rbug/rbug_texture.c:302:21: error: implicit declaration of function 'alloca'; did you mean 'malloc'? [-Werror=implicit-function-declaration] - uint32_t *height = alloca(sizeof(uint32_t) * height_len); - ^~~~~~ - malloc -../src/gallium/auxiliary/rbug/rbug_texture.c:302:21: warning: initialization makes pointer from integer without a cast [-Wint-conversion] -../src/gallium/auxiliary/rbug/rbug_texture.c:303:20: warning: initialization makes pointer from integer without a cast [-Wint-conversion] - uint32_t *depth = alloca(sizeof(uint32_t) * height_len); - ^~~~~~ -cc1: some warnings being treated as errors - -Include c99_alloca.h to portably make the alloc() prototype available. - -Fixes: 6174cba7 ("rbug: fix transmitted texture sizes") - -See also: 498d9d0f, adfb9c5c, fc8139b1 ---- - src/gallium/auxiliary/rbug/rbug_texture.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/auxiliary/rbug/rbug_texture.c b/src/gallium/auxiliary/rbug/rbug_texture.c -index 768e9505cca..83fdbac59ef 100644 ---- a/src/gallium/auxiliary/rbug/rbug_texture.c -+++ b/src/gallium/auxiliary/rbug/rbug_texture.c -@@ -34,6 +34,8 @@ - * Functions ending with _reply are replies to requests. - */ - -+#include <c99_alloca.h> -+ - #include "rbug_internal.h" - #include "rbug_texture.h" - --- -2.21.0 - |