Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wayland-protocols for openSUSE:Factory checked in at 2021-10-20 20:22:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wayland-protocols (Old) and /work/SRC/openSUSE:Factory/.wayland-protocols.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wayland-protocols" Wed Oct 20 20:22:52 2021 rev:24 rq:925043 version:1.23 Changes: -------- --- /work/SRC/openSUSE:Factory/wayland-protocols/wayland-protocols.changes 2021-09-16 23:16:56.487939293 +0200 +++ /work/SRC/openSUSE:Factory/.wayland-protocols.new.1890/wayland-protocols.changes 2021-10-20 20:23:10.557337025 +0200 @@ -1,0 +2,17 @@ +Wed Oct 13 08:04:58 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com> + +- Run test-suite during build: + + Add c_compiler and c++_compiler BuildRequires. + + Stop passing tests=false to meson. + + Add check section and meson_test macro. + +------------------------------------------------------------------- +Wed Oct 6 11:46:58 UTC 2021 - Fabian Vogt <fv...@suse.com> + +- Update to 1.23: + * This release adds the new gesture "hold" to the pointer gesture protocol. +- Switch to building with meson +- Based on work from home:ngh +- Update description to fix grammar + +------------------------------------------------------------------- Old: ---- wayland-protocols-1.22.tar.xz wayland-protocols-1.22.tar.xz.sig New: ---- wayland-protocols-1.23.tar.xz wayland-protocols-1.23.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wayland-protocols.spec ++++++ --- /var/tmp/diff_new_pack.VYeT1w/_old 2021-10-20 20:23:11.053337331 +0200 +++ /var/tmp/diff_new_pack.VYeT1w/_new 2021-10-20 20:23:11.057337333 +0200 @@ -18,34 +18,38 @@ Name: wayland-protocols -Version: 1.22 +Version: 1.23 Release: 0 -Summary: Wayland protocols that adds functionality not available in the core protocol +Summary: Wayland protocols that add functionality not available in the core protocol License: MIT Group: Development/Libraries/C and C++ URL: https://wayland.freedesktop.org/ Source: https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz Source2: https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz.sig Source3: %{name}.keyring + +BuildRequires: c_compiler +BuildRequires: c++_compiler +BuildRequires: meson >= 0.54.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(wayland-scanner) BuildArch: noarch %description -This package contains Wayland protocols that adds functionality not -available in the Wayland core protocol. Such protocols either adds -completely new functionality, or extends the functionality of some other +This package contains Wayland protocols that add functionality not +available in the Wayland core protocol. Such protocols either add +completely new functionality, or extend the functionality of some other protocol either in Wayland core, or some other protocol in wayland-protocols. %package devel -Summary: Wayland protocols that adds functionality not available in the core protocol +Summary: Wayland protocols that add functionality not available in the core protocol Group: Development/Libraries/C and C++ %description devel -This package contains Wayland protocols that adds functionality not -available in the Wayland core protocol. Such protocols either adds -completely new functionality, or extends the functionality of some other +This package contains Wayland protocols that add functionality not +available in the Wayland core protocol. Such protocols either add +completely new functionality, or extend the functionality of some other protocol either in Wayland core, or some other protocol in wayland-protocols. @@ -53,10 +57,14 @@ %autosetup %build -%configure +%meson +%meson_build %install -%make_install +%meson_install + +%check +%meson_test %files devel %doc README.md GOVERNANCE.md MEMBERS.md ++++++ wayland-protocols-1.22.tar.xz -> wayland-protocols-1.23.tar.xz ++++++ ++++ 7351 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/.editorconfig new/wayland-protocols-1.23/.editorconfig --- old/wayland-protocols-1.22/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/wayland-protocols-1.23/.editorconfig 2021-09-15 14:52:03.135998200 +0200 @@ -0,0 +1,6 @@ +root = true + +[*.xml] +indent_style = space +indent_size = 2 +tab_width = 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/.gitlab-ci.yml new/wayland-protocols-1.23/.gitlab-ci.yml --- old/wayland-protocols-1.22/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/wayland-protocols-1.23/.gitlab-ci.yml 2021-09-15 14:52:03.135998200 +0200 @@ -0,0 +1,63 @@ +.templates_sha: &template_sha 290b79e0e78eab67a83766f4e9691be554fc4afd + +include: + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + +stages: + - review + - containers-build + - test + +variables: + FDO_UPSTREAM_REPO: wayland/wayland-protocols + +.debian: + variables: + FDO_DISTRIBUTION_VERSION: bullseye + FDO_DISTRIBUTION_PACKAGES: 'build-essential automake autoconf libtool pkg-config libwayland-dev meson' + FDO_DISTRIBUTION_TAG: '2021-03-24.0' + +check-commit: + extends: + - .fdo.ci-fairy + stage: review + script: + - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +container_build: + extends: + - .debian + - .fdo.container-build@debian + stage: containers-build + variables: + GIT_STRATEGY: none + +test-meson: + stage: test + extends: + - .debian + - .fdo.distribution-image@debian + script: + - meson build + - ninja -C build + - meson test -C build + - ninja -C build install + +test-autotools: + stage: test + extends: + - .debian + - .fdo.distribution-image@debian + script: + - ./autogen.sh + - make check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/MEMBERS.md new/wayland-protocols-1.23/MEMBERS.md --- old/wayland-protocols-1.22/MEMBERS.md 2021-09-01 09:24:41.000000000 +0200 +++ new/wayland-protocols-1.23/MEMBERS.md 2021-09-15 14:52:03.136998200 +0200 @@ -3,7 +3,7 @@ - EFL/Enlightenment: Mike Blumenkrantz <michael.blumenkra...@gmail.com> (@zmike) - GTK/Mutter: Jonas ??dahl <jad...@gmail.com> (@jadahl), Carlos Garnacho <carl...@gnome.org> (@carlosg) -- KWin: Eike Hein <h...@kde.org> (@hein), +- KWin: Vlad Zahorodnii <vlad.zahorod...@kde.org> (@zzag), David Edmundson <da...@davidedmundson.co.uk> (@davidedmundson) - Mir: Christopher James Halse Rogers <r...@ubuntu.com> (@RAOF), Alan Griffiths <alan.griffi...@canonical.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/autogen.sh new/wayland-protocols-1.23/autogen.sh --- old/wayland-protocols-1.22/autogen.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/wayland-protocols-1.23/autogen.sh 2021-09-15 14:52:03.136998200 +0200 @@ -0,0 +1,9 @@ +#!/bin/sh + +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +( + cd "$srcdir" && + autoreconf --force -v --install +) || exit +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/configure.ac new/wayland-protocols-1.23/configure.ac --- old/wayland-protocols-1.22/configure.ac 2021-09-01 09:45:22.000000000 +0200 +++ new/wayland-protocols-1.23/configure.ac 2021-09-15 14:52:03.136998200 +0200 @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([wayland_protocols_major_version], [1]) -m4_define([wayland_protocols_minor_version], [22]) +m4_define([wayland_protocols_minor_version], [23]) m4_define([wayland_protocols_version], [wayland_protocols_major_version.wayland_protocols_minor_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/m4/compat.m4 new/wayland-protocols-1.23/m4/compat.m4 --- old/wayland-protocols-1.22/m4/compat.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/wayland-protocols-1.23/m4/compat.m4 2021-09-15 14:52:03.136998200 +0200 @@ -0,0 +1,12 @@ +dnl noarch_pkgconfigdir only available in pkg-config 0.27 and newer +dnl http://lists.freedesktop.org/archives/pkg-config/2012-July/000875.html +dnl Ubuntu 14.04 provides only pkg-config 0.26 so lacks this function. +dnl +dnl The Wayland project maintains automated builds for Ubuntu 14.04 in +dnl a Launchpad PPA. 14.04 is a Long Term Support distro release, which +dnl will reach EOL April 2019, however the Wayland PPA may stop targeting +dnl it some time after the next LTS release (April 2016). +m4_ifndef([PKG_NOARCH_INSTALLDIR], [AC_DEFUN([PKG_NOARCH_INSTALLDIR], [ + noarch_pkgconfigdir='${datadir}'/pkgconfig + AC_SUBST([noarch_pkgconfigdir]) +])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/meson.build new/wayland-protocols-1.23/meson.build --- old/wayland-protocols-1.22/meson.build 2021-09-01 09:43:24.000000000 +0200 +++ new/wayland-protocols-1.23/meson.build 2021-09-15 14:52:03.136998200 +0200 @@ -1,5 +1,5 @@ project('wayland-protocols', - version: '1.22', + version: '1.23', meson_version: '>= 0.54.0', license: 'MIT/Expat', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/missing new/wayland-protocols-1.23/missing --- old/wayland-protocols-1.22/missing 2021-07-13 20:47:29.000000000 +0200 +++ new/wayland-protocols-1.23/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2018-03-07.03; # UTC - -# Copyright (C) 1996-2018 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <bug-autom...@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/test-driver new/wayland-protocols-1.23/test-driver --- old/wayland-protocols-1.22/test-driver 2021-07-13 20:47:29.000000000 +0200 +++ new/wayland-protocols-1.23/test-driver 1970-01-01 01:00:00.000000000 +0100 @@ -1,148 +0,0 @@ -#! /bin/sh -# test-driver - basic testsuite driver script. - -scriptversion=2018-03-07.03; # UTC - -# Copyright (C) 2011-2018 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-autom...@gnu.org> or send patches to -# <automake-patc...@gnu.org>. - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -usage_error () -{ - echo "$0: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat <<END -Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] - TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] -The '--test-name', '--log-file' and '--trs-file' options are mandatory. -END -} - -test_name= # Used for reporting. -log_file= # Where to save the output of the test script. -trs_file= # Where to save the metadata of the test run. -expect_failure=no -color_tests=no -enable_hard_errors=yes -while test $# -gt 0; do - case $1 in - --help) print_usage; exit $?;; - --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;; - --) shift; break;; - -*) usage_error "invalid option: '$1'";; - *) break;; - esac - shift -done - -missing_opts= -test x"$test_name" = x && missing_opts="$missing_opts --test-name" -test x"$log_file" = x && missing_opts="$missing_opts --log-file" -test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" -if test x"$missing_opts" != x; then - usage_error "the following mandatory options are missing:$missing_opts" -fi - -if test $# -eq 0; then - usage_error "missing argument" -fi - -if test $color_tests = yes; then - # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. - red='[0;31m' # Red. - grn='[0;32m' # Green. - lgn='[1;32m' # Light green. - blu='[1;34m' # Blue. - mgn='[0;35m' # Magenta. - std='[m' # No color. -else - red= grn= lgn= blu= mgn= std= -fi - -do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' -trap "st=129; $do_exit" 1 -trap "st=130; $do_exit" 2 -trap "st=141; $do_exit" 13 -trap "st=143; $do_exit" 15 - -# Test script is run here. -"$@" >$log_file 2>&1 -estatus=$? - -if test $enable_hard_errors = no && test $estatus -eq 99; then - tweaked_estatus=1 -else - tweaked_estatus=$estatus -fi - -case $tweaked_estatus:$expect_failure in - 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; - 0:*) col=$grn res=PASS recheck=no gcopy=no;; - 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; - 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; - *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; - *:*) col=$red res=FAIL recheck=yes gcopy=yes;; -esac - -# Report the test outcome and exit status in the logs, so that one can -# know whether the test passed or failed simply by looking at the '.log' -# file, without the need of also peaking into the corresponding '.trs' -# file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file - -# Report outcome to console. -echo "${col}${res}${std}: $test_name" - -# Register the test result, and other relevant metadata. -echo ":test-result: $res" > $trs_file -echo ":global-test-result: $res" >> $trs_file -echo ":recheck: $recheck" >> $trs_file -echo ":copy-in-global-log: $gcopy" >> $trs_file - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wayland-protocols-1.22/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml new/wayland-protocols-1.23/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml --- old/wayland-protocols-1.22/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml 2021-07-13 20:47:31.000000000 +0200 +++ new/wayland-protocols-1.23/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml 2021-09-15 14:52:03.141998300 +0200 @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <protocol name="pointer_gestures_unstable_v1"> - <interface name="zwp_pointer_gestures_v1" version="2"> + <interface name="zwp_pointer_gestures_v1" version="3"> <description summary="touchpad gestures"> A global interface to provide semantic touchpad gestures for a given pointer. - Two gestures are currently supported: swipe and pinch. - All gestures follow a three-stage cycle: begin, update, end and - are identified by a unique id. + Three gestures are currently supported: swipe, pinch, and hold. + Pinch and swipe gestures follow a three-stage cycle: begin, update, + end, hold gestures follow a two-stage cycle: begin and end. All + gestures are identified by a unique id. Warning! The protocol described in this file is experimental and backward incompatible changes may be made. Backward compatible changes @@ -42,10 +43,22 @@ <request name="release" type="destructor" since="2"> <description summary="destroy the pointer gesture object"> - Destroy the pointer gesture object. Swipe and pinch objects created via this - gesture object remain valid. + Destroy the pointer gesture object. Swipe, pinch and hold objects + created via this gesture object remain valid. </description> </request> + + <!-- Version 3 additions --> + + <request name="get_hold_gesture" since="3"> + <description summary="get hold gesture"> + Create a hold gesture object. See the + wl_pointer_gesture_hold interface for details. + </description> + <arg name="id" type="new_id" interface="zwp_pointer_gesture_hold_v1"/> + <arg name="pointer" type="object" interface="wl_pointer"/> + </request> + </interface> <interface name="zwp_pointer_gesture_swipe_v1" version="2"> @@ -58,7 +71,7 @@ implementation-dependent. A gesture consists of three stages: begin, update (optional) and end. - There cannot be multiple simultaneous pinch or swipe gestures on a + There cannot be multiple simultaneous hold, pinch or swipe gestures on a same pointer/seat, how compositors prevent these situations is implementation-dependent. @@ -121,7 +134,7 @@ such a gesture is detected are implementation-dependent. A gesture consists of three stages: begin, update (optional) and end. - There cannot be multiple simultaneous pinch or swipe gestures on a + There cannot be multiple simultaneous hold, pinch or swipe gestures on a same pointer/seat, how compositors prevent these situations is implementation-dependent. @@ -181,6 +194,60 @@ <arg name="time" type="uint" summary="timestamp with millisecond granularity"/> <arg name="cancelled" type="int" summary="1 if the gesture was cancelled, 0 otherwise"/> </event> + </interface> + <interface name="zwp_pointer_gesture_hold_v1" version="3"> + <description summary="a hold gesture object"> + A hold gesture object notifies a client about a single- or + multi-finger hold gesture detected on an indirect input device such as + a touchpad. The gesture is usually initiated by one or more fingers + being held down without significant movement. The precise conditions + of when such a gesture is detected are implementation-dependent. + + In particular, this gesture may be used to cancel kinetic scrolling. + + A hold gesture consists of two stages: begin and end. Unlike pinch and + swipe there is no update stage. + There cannot be multiple simultaneous hold, pinch or swipe gestures on a + same pointer/seat, how compositors prevent these situations is + implementation-dependent. + + A gesture may be cancelled by the compositor or the hardware. + Clients should not consider performing permanent or irreversible + actions until the end of a gesture has been received. + </description> + + <request name="destroy" type="destructor" since="3"> + <description summary="destroy the hold gesture object"/> + </request> + + <event name="begin" since="3"> + <description summary="multi-finger hold begin"> + This event is sent when a hold gesture is detected on the device. + </description> + <arg name="serial" type="uint"/> + <arg name="time" type="uint" summary="timestamp with millisecond granularity"/> + <arg name="surface" type="object" interface="wl_surface"/> + <arg name="fingers" type="uint" summary="number of fingers"/> + </event> + + <event name="end" since="3"> + <description summary="multi-finger hold end"> + This event is sent when a hold gesture ceases to + be valid. This may happen when the holding fingers are lifted or + the gesture is cancelled, for example if the fingers move past an + implementation-defined threshold, the finger count changes or the hold + gesture changes into a different type of gesture. + + When a gesture is cancelled, the client may need to undo state changes + caused by this gesture. What causes a gesture to be cancelled is + implementation-dependent. + </description> + <arg name="serial" type="uint"/> + <arg name="time" type="uint" summary="timestamp with millisecond granularity"/> + <arg name="cancelled" type="int" summary="1 if the gesture was cancelled, 0 otherwise"/> + </event> + + </interface> </protocol>