diff --git a/D/Dbus/build_tarballs.jl b/D/Dbus/build_tarballs.jl index bbcd3c4c696..47e4b80d1a9 100644 --- a/D/Dbus/build_tarballs.jl +++ b/D/Dbus/build_tarballs.jl @@ -1,27 +1,25 @@ # Note that this script can accept some limited command-line arguments, run # `julia build_tarballs.jl --help` to see a usage message. -using BinaryBuilder +using BinaryBuilder, Pkg name = "Dbus" -version = v"1.12.16" +version = v"1.14.10" # Collection of sources required to build Dbus sources = [ - ArchiveSource("https://dbus.freedesktop.org/releases/dbus/dbus-$(version).tar.gz", - "54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80"), + ArchiveSource("https://dbus.freedesktop.org/releases/dbus/dbus-$(version).tar.xz", + "ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f"), ] # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/dbus-* ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} \ - --with-xml=expat \ --with-dbus-user=messagebus \ --with-system-pid-file=/var/run/dbus.pid \ --disable-verbose-mode \ --disable-static \ --enable-inotify \ - --disable-dnotify \ --disable-asserts \ --enable-user-session \ --with-session-socket-dir=/tmp \ @@ -33,9 +31,8 @@ make install # These are the platforms we will build for by default, unless further # platforms are passed in on the command line platforms = filter!(p -> Sys.islinux(p) || Sys.isfreebsd(p), supported_platforms()) -# TODO: Remove this restriction for the next build -filter!(p -> arch(p) != "armv6l", platforms) +# The products that we will ensure are always built products = [ LibraryProduct("libdbus-1", :libdbus), ExecutableProduct("dbus-daemon", :dbus_daemon) @@ -43,8 +40,10 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - Dependency("Expat_jll"; compat="2.2.7"), + Dependency(PackageSpec(name="Expat_jll", uuid="2e619515-83b5-522b-bb60-26c02a35a201"); platforms=platforms), + BuildDependency(PackageSpec(name="Xorg_xorgproto_jll", uuid="c4d99508-4286-5418-9131-c86396af500b"); platforms=platforms) + BuildDependency(PackageSpec(name="Xorg_libX11_jll", uuid="4f6342f7-b3d2-589e-9d20-edeb45f2b2bc"); platforms=platforms) ] # Build the tarballs, and possibly a `build.jl` as well. -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies) +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")