From f7d2079634925904ca18b7e55469c18e3beec64e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 3 Jul 2019 23:03:09 +1000
Subject: [PATCH 1/4] Install raqm on Travis

---
 .travis/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis/install.sh b/.travis/install.sh
index 90c884ee1..e8bf10c4d 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -28,5 +28,8 @@ pushd depends && ./install_openjpeg.sh && popd
 # libimagequant
 pushd depends && ./install_imagequant.sh && popd
 
+# raqm
+pushd depends && ./install_raqm.sh && popd
+
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd

From 1627856127b1172fc8950248cbb49f0172b5c3bb Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Tue, 2 Jul 2019 17:45:50 -0700
Subject: [PATCH 2/4] Include tox.ini in sdist

It is considered good practice to include test files in the source
distribution, as well as the files used to run them. It allows packagers
and users to run the tests locally to ensure the package is complete and
working.
---
 MANIFEST.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index f11ee174c..937f1b651 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
-
 include *.c
 include *.h
 include *.in
@@ -9,6 +8,7 @@ include *.sh
 include *.txt
 include LICENSE
 include Makefile
+include tox.ini
 graft Tests
 graft src
 graft depends
@@ -24,7 +24,6 @@ exclude .editorconfig
 exclude .landscape.yaml
 exclude .readthedocs.yml
 exclude azure-pipelines.yml
-exclude tox.ini
 global-exclude .git*
 global-exclude *.pyc
 global-exclude *.so

From 962f21360c8006147f4a5c448a38d23935d721c4 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Wed, 3 Jul 2019 06:38:47 -0700
Subject: [PATCH 3/4] Remove unused landscape.yml configuration file

Unused since af4d830ce963241d7ff6ca7b5c3c1d0bba43278c and
a2f873c66149e6aa0fa034903265a3ca1a720d89 removed the health badges.
---
 .landscape.yaml | 3 ---
 MANIFEST.in     | 2 --
 2 files changed, 5 deletions(-)
 delete mode 100644 .landscape.yaml

diff --git a/.landscape.yaml b/.landscape.yaml
deleted file mode 100644
index ddd9cef32..000000000
--- a/.landscape.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-strictness: medium
-test-warnings: yes
-max-line-length: 80
diff --git a/MANIFEST.in b/MANIFEST.in
index f11ee174c..d9fc7817b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
-
 include *.c
 include *.h
 include *.in
@@ -21,7 +20,6 @@ exclude .appveyor.yml
 exclude .coveragerc
 exclude .codecov.yml
 exclude .editorconfig
-exclude .landscape.yaml
 exclude .readthedocs.yml
 exclude azure-pipelines.yml
 exclude tox.ini

From b80aa67db29094ac35a163c6758afce6b8bd9665 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Thu, 4 Jul 2019 23:04:16 +0200
Subject: [PATCH 4/4] print winbuild compile output properly

---
 winbuild/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winbuild/build.py b/winbuild/build.py
index d0490e6d8..79b768a1f 100755
--- a/winbuild/build.py
+++ b/winbuild/build.py
@@ -50,9 +50,9 @@ def run_script(params):
         (trace, stderr) = proc.communicate()
         status = proc.returncode
         print("-- stderr --")
-        print(stderr)
+        print(stderr.decode())
         print("-- stdout --")
-        print(trace)
+        print(trace.decode())
         print("Done with %s: %s" % (version, status))
         return (version, status, trace, stderr)
     except Exception as msg: