Skip to content

Commit 5da2985

Browse files
authored
at_spi2_core: New version 2.56.1 (#11067)
1 parent d12c661 commit 5da2985

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

A/at_spi2_core/build_tarballs.jl

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
using BinaryBuilder
44

55
name = "at_spi2_core"
6-
version = v"2.34.0"
6+
version = v"2.56.1"
77

88
# Collection of sources required to build at-spi2-core
99
sources = [
1010
ArchiveSource("http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(version.major).$(version.minor)/at-spi2-core-$(version).tar.xz",
11-
"d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6"),
11+
"fd177fecd8c95006ff0a355eafd7066fe110a2e17eb5eb5fe17ff70e49a4eace"),
1212
]
1313

1414
# Bash recipe for building across all platforms
@@ -19,12 +19,22 @@ mkdir build && cd build
1919
# Get a local gettext for msgfmt cross-building
2020
apk add gettext
2121
22+
# We need `fixesproto @6`, but the latest release is `fixesproto @5`.
23+
# (There is a `libXfixes @6`, but no respective `fixesproto @6` exists.)
24+
# The X11 system is quite stable so this work-around should work.
25+
# See e.g. <https://forums.dolphin-emu.org/Thread-compiling-on-ubuntu-20-04-fixesproto-6-0-error>.
26+
mv $libdir/pkgconfig/fixesproto.pc $libdir/pkgconfig/fixesproto.pc.saved
27+
sed 's/Version: 5.0/Version: 6.0/' $libdir/pkgconfig/fixesproto.pc.saved >$libdir/pkgconfig/fixesproto.pc
28+
2229
meson .. --cross-file="${MESON_TARGET_TOOLCHAIN}" \
23-
-Dintrospection=no \
24-
-Dx11=yes \
30+
-Dintrospection=disabled \
31+
-Dx11=enabled \
2532
-Dsystemd_user_dir=no
2633
ninja -j${nproc}
2734
ninja install
35+
36+
# Undo change from above
37+
mv $libdir/pkgconfig/fixesproto.pc.saved $libdir/pkgconfig/fixesproto.pc
2838
"""
2939

3040
# These are the platforms we will build for by default, unless further
@@ -39,9 +49,16 @@ products = [
3949
# Dependencies that must be installed before this package can be built
4050
dependencies = [
4151
Dependency("Dbus_jll"),
42-
Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
52+
Dependency("Glib_jll"; compat="2.84.0"),
4353
Dependency("Xorg_libXtst_jll"),
54+
BuildDependency("Xorg_fixesproto_jll"),
55+
BuildDependency("Xorg_inputproto_jll"),
56+
BuildDependency("Xorg_kbproto_jll"),
57+
BuildDependency("Xorg_recordproto_jll"),
58+
BuildDependency("Xorg_xextproto_jll"),
59+
BuildDependency("Xorg_xproto_jll"),
4460
]
4561

4662
# Build the tarballs, and possibly a `build.jl` as well.
47-
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
63+
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
64+
julia_compat="1.6", preferred_gcc_version=v"5")

0 commit comments

Comments
 (0)