From e7838795830d700d60ea72bae8f209549539c4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <m.giordano@ucl.ac.uk>
Date: Thu, 10 Oct 2019 22:01:05 +0100
Subject: [PATCH] Use new Artifacts framework to install binary dependencies

---
 .travis.yml   |  9 ++++++---
 Project.toml  |  8 +++-----
 appveyor.yml  |  5 ++---
 deps/build.jl | 34 ----------------------------------
 src/Rsvg.jl   |  6 ++----
 5 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 deps/build.jl

diff --git a/.travis.yml b/.travis.yml
index 431c07c..24c62db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,17 @@ os:
   - linux
   - osx
 julia:
-  - 0.7
-  - 1.0
-  - 1.1
+  - 1.3
   - nightly
 matrix:
   allow_failures:
   - julia: nightly
 notifications:
     email: false
+
+script:
+ - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+ - julia -e 'using Pkg; pkg"add https://github.com/staticfloat/Cairo.jl#sf/jll_pkg"; Pkg.build(verbose=true); Pkg.test(coverage=true)'
+
 after_success:
     - julia -e 'using Pkg; cd(Pkg.dir("Rsvg")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
diff --git a/Project.toml b/Project.toml
index 6813dd3..0e89063 100644
--- a/Project.toml
+++ b/Project.toml
@@ -3,14 +3,12 @@ uuid = "c4c386cf-5103-5370-be45-f3a111cca3b8"
 version = "0.3.0"
 
 [deps]
-BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
-Homebrew = "d9be37ee-ecc9-5288-90f1-b9ca67657a75"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-WinRPM = "c17dfb99-b4f7-5aad-8812-456da1ad7187"
+Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
+Librsvg_jll = "925c91fb-5dd6-59dd-8e8c-345e74382d89"
 
 [compat]
-julia = "0.7, 1"
+julia = "1.3"
 
 [extras]
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
diff --git a/appveyor.yml b/appveyor.yml
index 1821e66..f1a5587 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,6 @@
 environment:
   matrix:
-  - julia_version: 0.7
-  - julia_version: 1.0
-  - julia_version: 1.1
+  - julia_version: 1.3
   - julia_version: nightly
 
 platform:
@@ -28,6 +26,7 @@ install:
 
 build_script:
   - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "using Pkg; pkg\"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages\"" 
   - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
diff --git a/deps/build.jl b/deps/build.jl
deleted file mode 100644
index 6748b39..0000000
--- a/deps/build.jl
+++ /dev/null
@@ -1,34 +0,0 @@
-using BinDeps
-
-@BinDeps.setup
-
-
-rsvg = library_dependency("rsvg", aliases = ["librsvg", "librsvg-2.2", "librsvg-2-2", "librsvg-2", "librsvg-2.so.2"])
-gio = library_dependency("gio", aliases = ["libgio-2.0", "libgio-2.0-0"])
-
-
-
-@static if Sys.islinux() begin
-        provides(AptGet, "librsvg2-2", rsvg)
-        provides(AptGet, "libgio", gio)
-    end
-end
-
-@static if Sys.isapple() begin
-        using Homebrew
-        provides(Homebrew.HB, "librsvg", [rsvg], os=:Darwin)
-        provides(Homebrew.HB, "libgio", [gio], os=:Darwin)
-    end
-end
-
-@static if Sys.iswindows() begin
-        using WinRPM
-        provides(WinRPM.RPM,"librsvg-2-2",rsvg,os = :Windows)
-        provides(WinRPM.RPM,"glib2",gio,os = :Windows)
-    end
-end
-
-@BinDeps.install Dict([
-	(:rsvg => :librsvg),
-    (:gio, :libgio),
-])
diff --git a/src/Rsvg.jl b/src/Rsvg.jl
index 9e798a5..65d1074 100644
--- a/src/Rsvg.jl
+++ b/src/Rsvg.jl
@@ -1,10 +1,8 @@
 module Rsvg
 
-depsjl = joinpath(@__DIR__, "..", "deps", "deps.jl")
-isfile(depsjl) ? include(depsjl) : error("Rsvg not properly ",
-    "installed. Please run\nPkg.build(\"Rsvg\")")
-
 using Cairo
+using Glib_jll
+using Librsvg_jll
 
 include("gerror.jl")
 include("gio.jl")