Update binaries (#303)

* Add .vscode to .gitignore

* Update various binaries

* Update version to 0.8.0

* Add expat, fontconfig, graphite2 and harfbuzz on all platforms

* Test on Julia 1.0 on appveyor

* Update X11 builder

.gitignore

@@ -7,3 +7,4 @@ test/test_results
 .DS_Store
 *~
 deps/build.log
+.vscode

Project.toml

@@ -1,6 +1,6 @@
 name = "Cairo"
 uuid = "159f3aea-2a34-519c-b102-8c37f9878175"
-version = "0.7.0"
+version = "0.8.0"
 
 [deps]
 BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
   - julia_version: 0.7
-  - julia_version: 1
+  - julia_version: 1.0
   - julia_version: 1.2
   - julia_version: 1.3
   - julia_version: nightly

deps/build.jl

@@ -35,21 +35,17 @@ dependencies = [
     "build_LZO.v2.10.0.jl",
     "build_Pixman.v0.38.4.jl",
     "build_libpng.v1.6.37.jl",
-    "build_Cairo.v1.14.12.jl",
+    "build_Cairo.v1.16.0.jl",
     # Pango-only dependencies
     "build_FriBidi.v1.0.5.jl",
     # And finally...Pango!
     "build_Pango.v1.42.4.jl"
 ]
 
 for dependency in dependencies
-    # These libraries are necessary on Linux, FreeBSD and macOS...
-    platform_key_abi() isa Windows &&
-        occursin(r"^build_(Expat|Fontconfig)", dependency) &&
-        continue
     # ...these only on Linux and FreeBSD
     platform_key_abi() isa Union{MacOS,Windows} &&
-        occursin(r"^build_(Libuuid|Graphite2|HarfBuzz|X11)", dependency) &&
+        occursin(r"^build_(Libuuid|X11)", dependency) &&
         continue
 
     # it's a bit faster to run the build in an anonymous module instead of

deps/build_Cairo.v1.16.0.jl

@@ -0,0 +1,48 @@
+using BinaryProvider # requires BinaryProvider 0.3.0 or later
+
+# Parse some basic command-line arguments
+const verbose = "--verbose" in ARGS
+const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
+products = [
+    LibraryProduct(prefix, ["libcairo"], :libcairo),
+]
+
+# Download binaries from hosted location
+bin_prefix = "https://github.com/JuliaBinaryWrappers/Cairo_jll.jl/releases/download/Cairo-v1.16.0+1"
+
+# Listing of files generated by BinaryBuilder:
+download_info = Dict(
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Cairo.v1.16.0.aarch64-linux-gnu.tar.gz", "222d35c12fc2d40fb7ccc501ad50d27ccc08803c5b636cc5d83a8c8fe56c6ceb"),
+    Linux(:aarch64, libc=:musl) => ("$bin_prefix/Cairo.v1.16.0.aarch64-linux-musl.tar.gz", "fb49455b7d677e01e565babd7f1f7eb062acb5991aaf9c0034a5e8faea63bf47"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Cairo.v1.16.0.arm-linux-gnueabihf.tar.gz", "69340376016f0525745fc483e3dc12962d0a1576c44f1243b64f7a56aa78bdb6"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Cairo.v1.16.0.arm-linux-musleabihf.tar.gz", "8a9ab11c22dc7eefc58728c26857baed97004b5c0c5f4e8c4fada49fa5294cf4"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/Cairo.v1.16.0.i686-linux-gnu.tar.gz", "73bf7f7f1c2cbac14f74e16f201b963a8158aa69e797977a3cd3e5633a8281ee"),
+    Linux(:i686, libc=:musl) => ("$bin_prefix/Cairo.v1.16.0.i686-linux-musl.tar.gz", "347db2e09c6e5add3202f44510036ab8f15d153dcbfb6f492b2083b2fb8d72b1"),
+    Windows(:i686) => ("$bin_prefix/Cairo.v1.16.0.i686-w64-mingw32.tar.gz", "5993e7d41106670203614f887b684d22d456b36af7345a782a34c2146613bb64"),
+    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Cairo.v1.16.0.powerpc64le-linux-gnu.tar.gz", "ca629c1b3f48f3659cca5ce953d2c9a8223da1722c122778cd61c013e7b8337e"),
+    MacOS(:x86_64) => ("$bin_prefix/Cairo.v1.16.0.x86_64-apple-darwin14.tar.gz", "fbb3c311d23ccb800a1b18355fbf52328e90769e45550df98bd78342ef650f6c"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Cairo.v1.16.0.x86_64-linux-gnu.tar.gz", "06bc332f8efd661d7806d9a02fd40813be1dd34d568df52a4e7e38e852ecfb6e"),
+    Linux(:x86_64, libc=:musl) => ("$bin_prefix/Cairo.v1.16.0.x86_64-linux-musl.tar.gz", "ee07ba9ce973b47429ca32384550cee97b5ff285099f06fe56939365342f836b"),
+    FreeBSD(:x86_64) => ("$bin_prefix/Cairo.v1.16.0.x86_64-unknown-freebsd11.1.tar.gz", "5eab2fca884e26edc741b7be2fee542f657ac6342c59f6a630e57fa05b42e60b"),
+    Windows(:x86_64) => ("$bin_prefix/Cairo.v1.16.0.x86_64-w64-mingw32.tar.gz", "d85155e3031b0d81da5320a9944821dc47e1b7f299e3c528883a44d776bb533c"),
+)
+
+# Install unsatisfied or updated dependencies:
+unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
+dl_info = choose_download(download_info, platform_key_abi())
+if dl_info === nothing && unsatisfied
+    # If we don't have a compatible .tar.gz to download, complain.
+    # Alternatively, you could attempt to install from a separate provider,
+    # build from source or something even more ambitious here.
+    error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!")
+end
+
+# If we have a download, and we are unsatisfied (or the version we're
+# trying to install is not itself installed) then load it up!
+if unsatisfied || !isinstalled(dl_info...; prefix=prefix)
+    # Download and install binaries
+    install(dl_info...; prefix=prefix, force=true, verbose=verbose)
+end
+
+# Write out a deps.jl file that will contain mappings for our products
+write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose)

deps/build_Fontconfig.v2.13.1.jl

@@ -8,21 +8,23 @@ products = [
 ]
 
 # Download binaries from hosted location
-bin_prefix = "https://github.com/JuliaBinaryWrappers/Fontconfig_jll.jl/releases/download/Fontconfig-v2.13.1+4"
+bin_prefix = "https://github.com/JuliaBinaryWrappers/Fontconfig_jll.jl/releases/download/Fontconfig-v2.13.1+6"
 
 # Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.aarch64-linux-gnu.tar.gz", "ce3c8ea36231e5dcdbd71d96c654f97eb1fb5f8e7a4b7951e55999c7699ab108"),
-    Linux(:aarch64, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.aarch64-linux-musl.tar.gz", "1bfe11f61556b7f26db16cafbccf1d89c2f782b1a0d41317b568eaed6276b2d0"),
-    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Fontconfig.v2.13.1.arm-linux-gnueabihf.tar.gz", "ead1d8207e6977597fadd0fe6ad786a11f77f7aab5d30ff9c4335d80d26ff84c"),
-    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Fontconfig.v2.13.1.arm-linux-musleabihf.tar.gz", "08c440433f941b836792f963d89e7f83196838b0551012a689dadfad27bc053b"),
-    Linux(:i686, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.i686-linux-gnu.tar.gz", "6668ec0b363c2cc4bfda390f49cd36e94065b24f4b623223fd727099be71eb07"),
-    Linux(:i686, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.i686-linux-musl.tar.gz", "f8d4142ba05652301c52e364babbd6f318868c8e42c84bbaa24be3512e887e2c"),
-    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.powerpc64le-linux-gnu.tar.gz", "27b7b0bfa274e62d19e0e96b0af2caca60c56579b2d2d6b86f13411a8805881b"),
-    MacOS(:x86_64) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-apple-darwin14.tar.gz", "fa7b75c808fd358fca1d70242a471e9c302f569c2093eb7b683dd7f09c148ff0"),
-    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-linux-gnu.tar.gz", "2cc769abdcc16006c576dba061eb850bde37a192093764743f4acd227342a915"),
-    Linux(:x86_64, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-linux-musl.tar.gz", "a13e96078c60882d6f86356b3b514f94d490b783fc7bb5118eda0eb17e614cae"),
-    FreeBSD(:x86_64) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-unknown-freebsd11.1.tar.gz", "1dcd862db04758bff6b60c6f38553e846551f66ca22743d9ea8e3a23ee3433e9"),
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.aarch64-linux-gnu.tar.gz", "5246a8e19ea3daf1173ffc60c5cb6a53255e31144a813cab39def80892cb21c9"),
+    Linux(:aarch64, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.aarch64-linux-musl.tar.gz", "07a4b21fa37c0d35cc9afd66dbcdc533864120dfc2f55d5136486c73995a0c87"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Fontconfig.v2.13.1.arm-linux-gnueabihf.tar.gz", "9f98deecaef1eb34a461ef41e068786d6cd1a729998f5727bf0d202581a43fc7"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Fontconfig.v2.13.1.arm-linux-musleabihf.tar.gz", "7e01b4c4e584716591ded1467fe8e0e034cb48fc5bcad6a75a81ccc4c7eadfdc"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.i686-linux-gnu.tar.gz", "99331d81818b6754f9c48982f4758f5b8fd88b369cd6126a814dece7a0b58bae"),
+    Linux(:i686, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.i686-linux-musl.tar.gz", "b4601b1fab56df7eb30db2b3d360465b03378579a0b9f04900f3354ba09cbd24"),
+    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.powerpc64le-linux-gnu.tar.gz", "d2b44df3f1e7968b1f5c45c284c0f3d7e58633b6f746c9574cce3a43258649e4"),
+    MacOS(:x86_64) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-apple-darwin14.tar.gz", "ce268d75ac1e421a2ec41c60a6c47bf195cf2e2558a2dc830fd4708f8789209f"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-linux-gnu.tar.gz", "e092852fe2dbb8fd0848f030cf9a3f8b5244472f4d7ccfa50ba8fd43941799e0"),
+    Linux(:x86_64, libc=:musl) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-linux-musl.tar.gz", "02f6d59accebe7cd61106893925d3acc766d896bc48b0c21dc8c61fefd1e1063"),
+    FreeBSD(:x86_64) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-unknown-freebsd11.1.tar.gz", "bb1903db96285c6453ac80440e4a2aeb5f431cfc84baa396d158028a283461f7"),
+    Windows(:x86_64) => ("$bin_prefix/Fontconfig.v2.13.1.x86_64-w64-mingw32.tar.gz", "7dc4cfe3d605c936f1097518043f7b7f90e6f46892a0a7ad1db64544a7200cfb"),
+    Windows(:i686) => ("$bin_prefix/Fontconfig.v2.13.1.i686-w64-mingw32.tar.gz", "0dae875ffafce57c29a0d547d108d9c7f85a22f6811075484470613c16a4af80"),
 )
 
 # Install unsatisfied or updated dependencies:

deps/build_Graphite2.v1.3.13.jl

@@ -8,21 +8,23 @@ products = [
 ]
 
 # Download binaries from hosted location
-bin_prefix = "https://github.com/JuliaBinaryWrappers/Graphite2_jll.jl/releases/download/Graphite2-v1.3.13+0"
+bin_prefix = "https://github.com/JuliaBinaryWrappers/Graphite2_jll.jl/releases/download/Graphite2-v1.3.13+1"
 
 # Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.aarch64-linux-gnu.tar.gz", "acf585744bbc606ba332902e33cc46e4f35684c02b781eb118f2bcf9c22d5bd9"),
-    Linux(:aarch64, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.aarch64-linux-musl.tar.gz", "803391b274d1b158166f373f3230ca92a4d880503e5450577d7843e4b749de15"),
-    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Graphite2.v1.3.13.arm-linux-gnueabihf.tar.gz", "934978ae1792d401d6e862b7ffc58db69192bc01c0f9dc89d975573dd461d74a"),
-    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Graphite2.v1.3.13.arm-linux-musleabihf.tar.gz", "cb5c17dd0bfcdfdb73e9a313c104f06cf555244a5e045cf852a5461d3ce7c870"),
-    Linux(:i686, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.i686-linux-gnu.tar.gz", "7bc20a1e9d5273e1770fb76faf0e9c86161108d4d2f7f4a62797bbcfb6eda799"),
-    Linux(:i686, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.i686-linux-musl.tar.gz", "fadc98c4cbb9f1fe5005af34bcf8b4f058bfbeaeff13844f825025a89f1a284c"),
-    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.powerpc64le-linux-gnu.tar.gz", "3575fc2291a143ad588250e514e7e0831549346539167c972455f3712a0e3943"),
-    MacOS(:x86_64) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-apple-darwin14.tar.gz", "4b963c856705132e2da4a7ea2af209946dfb54bd041a19d2d258bb022603a4fd"),
-    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-linux-gnu.tar.gz", "8ff8e87ce7aef15d41a50ed3ca0d9498c4357d2698dd7db26ae6d07bbcb734cb"),
-    Linux(:x86_64, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-linux-musl.tar.gz", "5f14dad8a9431fe6ee4b3862e806c2b814d701476e57d49e6b880a84afa53a5e"),
-    FreeBSD(:x86_64) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-unknown-freebsd11.1.tar.gz", "c7953a9fe91f7a7ca4e8de964825878d6594d511cda884507acd9d3d482d22f5"),
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.aarch64-linux-gnu.tar.gz", "3cc2a89c0066bab3547e8237ea9466becd1ed2587df6d7fe8c666c38f89a74ed"),
+    Linux(:aarch64, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.aarch64-linux-musl.tar.gz", "9b9d6422f34e9fc3efe4519f960e16b0b9d5ea35482e6d78a77b8ce8a5b8f5ea"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/Graphite2.v1.3.13.arm-linux-gnueabihf.tar.gz", "6adb30d8c301c664d165457db4b0893d3f78efb4a49d8425e6bea04a71fd47e4"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/Graphite2.v1.3.13.arm-linux-musleabihf.tar.gz", "5762b77781827a729abdbc2a9534409b330577c483c680cb3357b7ac95c8dd2f"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.i686-linux-gnu.tar.gz", "6acaaf67f7eecac4c035165660833f9de921e7d56a1c3e199012b1be10a80219"),
+    Linux(:i686, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.i686-linux-musl.tar.gz", "9b618d376b0fc7b7b102aaba80636e22d1d897ac42b9135ac21a77b230f442e8"),
+    Windows(:i686) => ("$bin_prefix/Graphite2.v1.3.13.i686-w64-mingw32.tar.gz", "42db7771afd71239d0f17ee223517c7e60ec3a580d93972fdc69fe10d2bfae39"),
+    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.powerpc64le-linux-gnu.tar.gz", "f340a9f15c8694fc4a6c40b9c5ce0b9c7284d3dd776413f4cf52ed092fa671bc"),
+    MacOS(:x86_64) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-apple-darwin14.tar.gz", "4025d5cb3dbbba37349804060c40973fac5fbd2c43d826eee737f8b97fd10134"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-linux-gnu.tar.gz", "3b33ff128bac55362221f3e3360837787f7f608db7a66d08317d20ccb68cada7"),
+    Linux(:x86_64, libc=:musl) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-linux-musl.tar.gz", "c84777e782f89b8a582fb523931f3375c86bad783cd872f166e9f39f3268c68d"),
+    FreeBSD(:x86_64) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-unknown-freebsd11.1.tar.gz", "46e1afeb5df52dc887ceb4efc0dd3ce6039233a9a00043ddcbc2093b5a5c0cfd"),
+    Windows(:x86_64) => ("$bin_prefix/Graphite2.v1.3.13.x86_64-w64-mingw32.tar.gz", "4e73df99ea62550d8e2b6bb24399c1adba7a1f27892478f3395f73c82d1ef403"),
 )
 
 # Install unsatisfied or updated dependencies: