--- a/build/config/linux/atspi2/BUILD.gn 2024-01-22 18:41:38.057928000 +0000 +++ b/build/config/linux/atspi2/BUILD.gn 2024-01-24 15:50:48.707179734 +0000 @@ -17,30 +17,13 @@ "--version-as-components", ], "value") - major = atspi_version[0] - minor = atspi_version[1] - micro = atspi_version[2] - - # These aren't necessarily used if atspi is not old enough to require them. - # Also, gn considers variables unused if the only use of them is - # short-circuited away, so for example if major == 2 and minor == 48, micro - # would be unused. - not_needed([ - "major", - "minor", - "micro", - ]) - - # ATSPI 2.49.90 now defines these for us and it's an error for us to - # redefine them on the compiler command line. - # See ATSPI 927344a34cd5bf81fc64da4968241735ecb4f03b - if (major < 2 || (major == 2 && minor < 49) || - (major == 2 && minor == 49 && micro < 90)) { - defines = [ - "ATSPI_MAJOR_VERSION=$major", - "ATSPI_MINOR_VERSION=$minor", - "ATSPI_MICRO_VERSION=$micro", - ] - } + atspi_major_version = atspi_version[0] + atspi_minor_version = atspi_version[1] + atspi_micro_version = atspi_version[2] + defines = [ + "ATSPI_MAJOR_VERSION=$atspi_major_version", + "ATSPI_MINOR_VERSION=$atspi_minor_version", + "ATSPI_MICRO_VERSION=$atspi_micro_version", + ] } }