From 0b8abce77168f24bf0f5ab7ab5b3bc8df76b314c Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Sat, 21 Jan 2017 19:42:08 +0100
Subject: [PATCH 1/3] Avoid some stuff for `mach bootstrap` on Ubuntu

---
 servo-build-dependencies/init.sls | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls
index 95a1bff7..15fdd74a 100644
--- a/servo-build-dependencies/init.sls
+++ b/servo-build-dependencies/init.sls
@@ -37,6 +37,7 @@ servo-dependencies:
       - xserver-xorg-input-void
       - xserver-xorg-video-dummy
       {% endif %}
+  {% if salt['pillar.get']('fully_managed', True) %}
   pip.installed:
     - pkgs:
       - ghp-import
@@ -44,8 +45,9 @@ servo-dependencies:
     - require:
       - pkg: pip
       - pip: virtualenv
+  {% endif %}
 
-{% if grains['os'] == 'Ubuntu' %}
+{% if grains['os'] == 'Ubuntu' and grains['oscodename'] == 'trusty' %}
 multiverse:
   pkgrepo.managed:
     - name: 'deb http://archive.ubuntu.com/ubuntu trusty multiverse'

From f11af728343924e0dabd54333914ac66398cafb6 Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Sun, 22 Jan 2017 17:45:29 +0100
Subject: [PATCH 2/3] Add missing Ubuntu package

---
 servo-build-dependencies/init.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls
index 15fdd74a..313262dc 100644
--- a/servo-build-dependencies/init.sls
+++ b/servo-build-dependencies/init.sls
@@ -18,6 +18,7 @@ servo-dependencies:
       - yasm
       {% elif grains['os'] == 'Ubuntu' %}
       - autoconf2.13
+      - curl
       - freeglut3-dev
       - gperf
       - libavcodec-dev

From 4dc622785f229bfb0a5a6e2e4967c01baa24a0c8 Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Sun, 22 Jan 2017 17:45:04 +0100
Subject: [PATCH 3/3] Add support for Fedora/CentOS

---
 python/init.sls                   |  2 +-
 servo-build-dependencies/init.sls | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/python/init.sls b/python/init.sls
index 929f4b2f..51722649 100644
--- a/python/init.sls
+++ b/python/init.sls
@@ -21,7 +21,7 @@ python2-dev:
 pip:
   pkg.installed:
     - pkgs:
-      {% if grains['os'] == 'Ubuntu' %}
+      {% if grains['os'] in ['CentOS', 'Fedora', 'Ubuntu'] %}
       - python-pip
       {% elif grains['os'] == 'MacOS' %}
       - python # pip is included with python in homebrew
diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls
index 313262dc..83fa2c0d 100644
--- a/servo-build-dependencies/init.sls
+++ b/servo-build-dependencies/init.sls
@@ -37,6 +37,31 @@ servo-dependencies:
       - xpra
       - xserver-xorg-input-void
       - xserver-xorg-video-dummy
+      {% elif grains['os'] in ['CentOS', 'Fedora'] %}
+      - bzip2-devel
+      - cabextract
+      - curl
+      - dbus-devel
+      - expat-devel
+      - fontconfig-devel
+      - freeglut-devel
+      - freetype-devel
+      - gcc-c++
+      - glib2-devel
+      - gperf
+      - libtool
+      - libX11-devel
+      - libXcursor-devel
+      - libXi-devel
+      - libXmu-devel
+      - libXrandr-devel
+      - llvm-devel
+      - mesa-libEGL-devel
+      - mesa-libGL-devel
+      - mesa-libOSMesa-devel
+      - openssl-devel
+      - rpm-build
+      - ttmkfdir
       {% endif %}
   {% if salt['pillar.get']('fully_managed', True) %}
   pip.installed: