at-spi2-core: 2.44.1 → 2.45.1

atk and at-spi2-atk were merged into the repo.

https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/AT_SPI2_CORE_2_44_1...AT_SPI2_CORE_2_45_1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar 2022-07-23 15:44:06 +00:00
parent 8979d027ba
commit f554de212a
5 changed files with 11 additions and 136 deletions

View file

@ -1,45 +0,0 @@
{ lib, stdenv
, fetchurl
, meson
, ninja
, pkg-config
, at-spi2-core
, atk
, dbus
, glib
, libxml2
, gnome # To pass updateScript
}:
stdenv.mkDerivation rec {
pname = "at-spi2-atk";
version = "2.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
doCheck = false; # fails with "No test data file provided"
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
meta = with lib; {
description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}

View file

@ -11,6 +11,7 @@
, glib
, dconf
, libX11
, libxml2
, libXtst
, libXi
, libXext
@ -19,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "at-spi2-core";
version = "2.44.1";
version = "2.45.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "S+sjJwumz3yvILWXNU11GU2Jr7adLvzxX0JxaIum90Y=";
sha256 = "upXzRukxCPuzRixiQ3CB1YIVTbJ5tAUt7cUqcGgosZI=";
};
nativeBuildInputs = [
@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libX11
libxml2
# at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
libXtst
libXi
@ -46,6 +48,7 @@ stdenv.mkDerivation rec {
];
# In atspi-2.pc dbus-1 glib-2.0
# In atk.pc gobject-2.0
propagatedBuildInputs = [
dbus
glib
@ -55,6 +58,7 @@ stdenv.mkDerivation rec {
doCheck = false;
mesonFlags = [
"-Dintrospection=${if stdenv.buildPlatform == stdenv.hostPlatform then "yes" else "no"}"
# Provide dbus-daemon fallback when it is not already running when
# at-spi2-bus-launcher is executed. This allows us to avoid
# including the entire dbus closure in libraries linked with
@ -80,7 +84,7 @@ stdenv.mkDerivation rec {
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]);
platforms = platforms.unix;
};
}

View file

@ -1,77 +0,0 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, gettext
, pkg-config
, glib
, fixDarwinDylibNames
, gobject-introspection
, gnome
}:
stdenv.mkDerivation rec {
pname = "atk";
version = "2.38.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY=";
};
patches = [
# meson builds an incorrect .pc file
# glib should be Requires not Requires.private
./fix_pc.patch
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
gobject-introspection
glib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
buildInputs = [ gobject-introspection ];
propagatedBuildInputs = [
# Required by atk.pc
glib
];
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
};
meta = {
description = "Accessibility toolkit";
longDescription = ''
ATK is the Accessibility Toolkit. It provides a set of generic
interfaces allowing accessibility technologies such as screen
readers to interact with a graphical user interface. Using the
ATK interfaces, accessibility tools have full access to view and
control running applications.
'';
homepage = "https://gitlab.gnome.org/GNOME/atk";
license = lib.licenses.lgpl2Plus;
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View file

@ -1,9 +0,0 @@
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -162,5 +162,6 @@ pkgconfig.generate(libatk,
name: 'Atk',
description: 'Accessibility Toolkit',
subdirs: atk_api_name,
+ requires: glib_dep,
filebase: 'atk',
)

View file

@ -17831,7 +17831,8 @@ with pkgs;
at-spi2-core = callPackage ../development/libraries/at-spi2-core { };
at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { };
# Not moved to aliases while we decide if we should split the package again.
at-spi2-atk = at-spi2-core;
aqbanking = callPackage ../development/libraries/aqbanking { };
@ -18943,7 +18944,8 @@ with pkgs;
ace = callPackage ../development/libraries/ace { };
atk = callPackage ../development/libraries/atk { };
# Not moved to aliases while we decide if we should split the package again.
atk = at-spi2-core;
atkmm = callPackage ../development/libraries/atkmm { };