Merge pull request #31 from KristofferC/kc/jll

use FontConfig_jll instead of BinaryProvider
JuliaGraphics · Apr 1, 2020 · d9f8daf · d9f8daf · SimonDanisch · Apr 1, 2020
2 parents 130ca0c + ef31051
commit d9f8daf
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 367 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,3 @@
-deps/builds
-deps/downloads
-deps/usr
-deps/src
-deps/build.log
 .DS_Store
 *~
 Manifest.toml
-deps/deps.jl
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
   - osx
   - windows
 julia:
-  - 1.2
+  - 1.3
   - nightly
 notifications:
   email: false

diff --git a/Project.toml b/Project.toml
@@ -1,15 +1,14 @@
 name = "Fontconfig"
 uuid = "186bb1d3-e1f7-5a2c-a377-96d770f13627"
-version = "0.3.0"
+version = "0.4.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
+Fontconfig_jll = "a3f928ae-7b40-5064-980b-68af3947d34b"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [compat]
-BinaryProvider = "≥ 0.3.0"
-julia = "≥ 1"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 # Documentation: https://github.com/JuliaCI/Appveyor.jl
 environment:
   matrix:
-  - julia_version: 1.2
+  - julia_version: 1.3
   - julia_version: nightly
 platform:
   - x86

diff --git a/deps/build.jl b/deps/build.jl
diff --git a/deps/build_Bzip2.v1.0.6.jl b/deps/build_Bzip2.v1.0.6.jl
diff --git a/deps/build_Expat.v2.2.7.jl b/deps/build_Expat.v2.2.7.jl
diff --git a/deps/build_Fontconfig.v2.13.1.jl b/deps/build_Fontconfig.v2.13.1.jl
diff --git a/deps/build_FreeType2.v2.10.1.jl b/deps/build_FreeType2.v2.10.1.jl
diff --git a/deps/build_Libuuid.v2.34.0.jl b/deps/build_Libuuid.v2.34.0.jl
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ os: @@
       - osx
       - windows
     julia:
-      - 1.2
+      - 1.3
       - nightly
     notifications:
       email: false
@@ Expand Down @@