diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2022-03-24 12:25:41 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-03-24 12:25:41 +0000 |
commit | f1051ba57a2110c46a136a48f4d60a405bc2c3f5 (patch) | |
tree | d6723bf7a198738bbb997a03951cc0205de0e472 | |
parent | 337eeb104abef33a7ee853bdd6febc1c00cb095a (diff) | |
parent | 0f214fa17d730cc83267e6378d2520082da0864d (diff) | |
download | atk-f1051ba57a2110c46a136a48f4d60a405bc2c3f5.tar.gz |
Merge branch 'ebassi/atk-2-38' into 'master'2.38.0
Release ATK 2.38.0
See merge request GNOME/atk!49
-rw-r--r-- | .gitlab-ci.yml | 12 | ||||
-rw-r--r-- | .gitlab-ci/debian-stable.Dockerfile | 6 | ||||
-rw-r--r-- | .gitlab-ci/fedora-latest.Dockerfile | 6 | ||||
-rwxr-xr-x | .gitlab-ci/run-tests-docker.sh | 2 | ||||
-rwxr-xr-x | .gitlab-ci/setup-build-docker.sh | 8 | ||||
-rw-r--r-- | NEWS | 16 | ||||
-rw-r--r-- | atk/atk-enum-types.c.template | 2 | ||||
-rw-r--r-- | docs/meson.build | 6 | ||||
-rw-r--r-- | meson.build | 6 |
9 files changed, 35 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67fafa..1e54b24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,8 @@ variables: .default-build: script: - - .gitlab-ci/setup-build-docker.sh - - ninja -C _build + - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build . + - meson compile -C _build - .gitlab-ci/run-tests-docker.sh _build artifacts: when: always @@ -30,24 +30,24 @@ variables: fedora-latest: extends: .default-build stage: build - image: registry.gitlab.gnome.org/gnome/atk/fedora-latest:v1 + image: registry.gitlab.gnome.org/gnome/atk/fedora-latest:v2 variables: EXTRA_MESON_FLAGS: "-Dbuildtype=debug -Ddefault_library=both" debian-stable: extends: .default-build stage: build - image: registry.gitlab.gnome.org/gnome/atk/debian-stable:v1 + image: registry.gitlab.gnome.org/gnome/atk/debian-stable:v2 variables: EXTRA_MESON_FLAGS: "-Dbuildtype=debug -Ddefault_library=both" reference: - image: registry.gitlab.gnome.org/gnome/atk/fedora-latest:v1 + image: registry.gitlab.gnome.org/gnome/atk/fedora-latest:v2 stage: docs variables: EXTRA_MESON_FLAGS: "--buildtype=release -Ddocs=true" script: - - .gitlab-ci/setup-build-docker.sh + - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _build . - ninja -C _build atk-doc - mv _build/docs/html _reference artifacts: diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index 75e2105..14ba8b7 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:stable RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ ccache \ @@ -32,6 +32,8 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ # Locale for our build RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8 +RUN pip3 install meson==0.56.2 + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN useradd -u $HOST_USER_ID -ms /bin/bash user @@ -39,6 +41,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user USER user WORKDIR /home/user -RUN pip3 install --user meson==0.49.2 - ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 diff --git a/.gitlab-ci/fedora-latest.Dockerfile b/.gitlab-ci/fedora-latest.Dockerfile index b257596..ca694d2 100644 --- a/.gitlab-ci/fedora-latest.Dockerfile +++ b/.gitlab-ci/fedora-latest.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:latest RUN dnf -y install \ at-spi2-atk-devel \ @@ -26,6 +26,8 @@ RUN dnf -y install \ xorg-x11-server-Xvfb \ && dnf clean all +RUN pip3 install meson==0.56.2 + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN useradd -u $HOST_USER_ID -ms /bin/bash user @@ -33,6 +35,4 @@ RUN useradd -u $HOST_USER_ID -ms /bin/bash user USER user WORKDIR /home/user -RUN pip3 install --user meson==0.49.2 - ENV LANG C.utf8 diff --git a/.gitlab-ci/run-tests-docker.sh b/.gitlab-ci/run-tests-docker.sh index b35dd6e..147299a 100755 --- a/.gitlab-ci/run-tests-docker.sh +++ b/.gitlab-ci/run-tests-docker.sh @@ -6,8 +6,6 @@ set +e srcdir=$( pwd ) builddir=$1 -export PATH="${HOME}/.local/bin:${PATH}" - meson test -C ${builddir} \ --print-errorlogs diff --git a/.gitlab-ci/setup-build-docker.sh b/.gitlab-ci/setup-build-docker.sh deleted file mode 100755 index 96fd6d2..0000000 --- a/.gitlab-ci/setup-build-docker.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set +e -set +x - -export PATH="${HOME}/.local/bin:${PATH}" - -meson ${EXTRA_MESON_FLAGS:-} _build . @@ -1,3 +1,19 @@ +Changes in version 2.38 +======================= + +* Require Meson 0.56.2 +* Add g_autoptr support for ATK types +* Add ATK_STATE_COLLAPSED, matching AT-SPI's state +* Improve support for ATK as a Meson subproject +* Ensure that atk_value_get_value_and_text() can deal with NULL out arguments + +Contributors + Antonio Ospite, Philip Withnall, Colomban Wendling + +Translation updates + Catalan, Galician, Swedish, Belarusian, Persian, Latvian, Spanish + Indonesian, Icelandic + Changes in version 2.36 ========================= diff --git a/atk/atk-enum-types.c.template b/atk/atk-enum-types.c.template index b3c0b13..dc2cae9 100644 --- a/atk/atk-enum-types.c.template +++ b/atk/atk-enum-types.c.template @@ -15,7 +15,7 @@ GType @enum_name@_get_type (void) { - static volatile gsize g_define_type_id__volatile; + static gsize g_define_type_id__volatile; if (g_once_init_enter (&g_define_type_id__volatile)) { diff --git a/docs/meson.build b/docs/meson.build index d6b9c8a..1e491e3 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -5,9 +5,9 @@ private_headers = [ 'atkintl.h', ] -glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') -glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') -docpath = join_paths(atk_datadir, 'gtk-doc', 'html') +glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix') +glib_docpath = glib_prefix / 'share/gtk-doc/html' +docpath = atk_datadir / 'gtk-doc/html' gnome.gtkdoc('atk', main_xml: 'atk-docs.xml', diff --git a/meson.build b/meson.build index a1c7846..205d8db 100644 --- a/meson.build +++ b/meson.build @@ -1,12 +1,12 @@ project('atk', 'c', - version: '2.37.0', - license: 'LGPLv2.1+', + version: '2.38.0', + license: 'LGPL-2.1-or-later', default_options: [ 'buildtype=debugoptimized', 'warning_level=1', 'c_std=c99', ], - meson_version : '>= 0.49.0') + meson_version : '>= 0.56.2') cc = meson.get_compiler('c') host_system = host_machine.system() |