.gitlab-ci.yml

@@ -1,103 +0,0 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
-#
-# This CI uses the freedesktop.org ci-templates.
-# Please see the ci-templates documentation for details:
-# https://freedesktop.pages.freedesktop.org/ci-templates/
-
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-
-include:
-  # Arch container builder template
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/arch.yml'
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/ci-fairy.yml'
-  - template: Security/SAST.gitlab-ci.yml
-
-
-stages:
-  - prep             # prep work like rebuilding the container images if there is a change
-  - build            # for actually building and testing things in a container
-  - test
-  - deploy
-
-
-variables:
-  FDO_UPSTREAM_REPO: 'xorg/lib/libxcb-errors'
-  # The tag should be updated each time the list of packages is updated.
-  # Changing a tag forces the associated image to be rebuilt.
-  # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2023-12-11.0'
-  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros doxygen graphviz python xorgproto libxcb xcb-proto xorg-server-xvfb'
-  GIT_SUBMODULE_STRATEGY: normal
-
-#
-# Verify that commit messages are as expected
-#
-check-commits:
-  extends:
-    - .fdo.ci-fairy
-  stage: prep
-  script:
-    - ci-fairy check-commits --junit-xml=results.xml
-  except:
-    - master@xorg/lib/libxcb-errors
-  variables:
-    GIT_DEPTH: 100
-  artifacts:
-    reports:
-      junit: results.xml
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: deploy
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-  artifacts:
-    when: on_failure
-    reports:
-      junit: results.xml
-  allow_failure: true
-
-
-#
-# Build a container with the given tag and the packages pre-installed.
-# This only happens if/when the tag changes, otherwise the existing image is
-# re-used.
-#
-container-prep:
-  extends:
-    - .fdo.container-build@arch
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-
-#
-# The default build, runs on the image built above.
-#
-build:
-  stage: build
-  extends:
-    - .fdo.distribution-image@arch
-  script:
-    - autoreconf -ivf
-    - mkdir _builddir
-    - pushd _builddir > /dev/null
-    - ../configure --disable-silent-rules
-    - make
-    - xvfb-run --server-args='-noreset' make check
-    - make distcheck
-    - popd > /dev/null
-  artifacts:
-    when: on_failure
-    paths:
-      - _builddir/config.log
-      - _builddir/test-suite.log

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "m4"]
 	path = m4
-	url = https://gitlab.freedesktop.org/xorg/util/xcb-util-m4.git
+	url = git://anongit.freedesktop.org/xcb/util-common-m4.git

Makefile.am

@@ -12,7 +12,7 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-EXTRA_DIST = autogen.sh xcb-errors.pc.in src/errors.h src/extensions.py README.md
+EXTRA_DIST = autogen.sh xcb-errors.pc.in src/errors.h src/extensions.py
 
 lib_LTLIBRARIES = libxcb-errors.la
 
@@ -20,9 +20,8 @@ xcbinclude_HEADERS = src/xcb_errors.h
 
 AM_CFLAGS = $(CWARNFLAGS)
 
-libxcb_errors_la_SOURCES = src/xcb_errors.c
-nodist_libxcb_errors_la_SOURCES = src/extensions.c
-libxcb_errors_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS) -I$(srcdir)/src
+libxcb_errors_la_SOURCES = src/xcb_errors.c src/extensions.c
+libxcb_errors_la_CPPFLAGS = $(XCB_CFLAGS) $(XPROTO_CFLAGS)
 libxcb_errors_la_LIBADD = $(XCB_LIBS) $(XPROTO_LIBS)
 libxcb_errors_la_LDFLAGS = -version-info 0:0:0 -no-undefined -export-symbols-regex '^xcb_errors_'
 
@@ -37,5 +36,5 @@ tests_test_LDADD = libxcb-errors.la $(XCB_LIBS)
 CLEANFILES = src/extensions.c
 
 src/extensions.c: src/extensions.py
-	$(AM_V_GEN)$(PYTHON) $(srcdir)/src/extensions.py $@.tmp ${XCBPROTO_XCBINCLUDEDIR}/*.xml && \
+	$(AM_V_GEN)src/extensions.py $@.tmp ${XCBPROTO_XCBINCLUDEDIR}/*.xml && \
 	mv $@.tmp $@

README.md

@@ -1,23 +0,0 @@
-xcb-util-errors is a utility library that gives human readable names to error
-codes and event codes and also to major and minor numbers.
-
-The necessary information is drawn from xcb-proto's protocol descriptions.
-
-This library is especially useful when working with extensions and is mostly
-useful for debugging.
-
-All questions regarding this software should be directed at the
-XCB mailing list:
-
-  https://lists.x.org/mailman/listinfo/xcb
-
-The primary development code repository can be found at:
-
-  https://gitlab.freedesktop.org/xorg/lib/libxcb-errors
-
-Please submit bug reports and requests to merge patches there.
-
-For patch submission instructions, see:
-
-  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-

autogen.sh

@@ -1,10 +1,10 @@
 #! /bin/sh
 
-srcdir=`dirname "$0"`
+srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
-cd "$srcdir"
+cd $srcdir
 
 # If this is a git checkout, verify that the submodules are initialized,
 # otherwise autotools will just fail with an unhelpful error message.
@@ -22,11 +22,6 @@ then
 fi
 
 autoreconf -v --install || exit 1
-cd "$ORIGDIR" || exit $?
+cd $ORIGDIR || exit $?
 
-git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
-    git config --local format.subjectPrefix "PATCH libxcb-errors"
-
-if test -z "$NOCONFIGURE"; then
-    exec "$srcdir"/configure "$@"
-fi
+$srcdir/configure --enable-maintainer-mode "$@"

configure.ac

@@ -1,7 +1,6 @@
 dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62
 AC_PREREQ(2.62)
-AC_INIT([xcb-util-errors], [1.0.1],
-        [https://gitlab.freedesktop.org/xorg/lib/libxcb-errors/-/issues])
+AC_INIT([xcb-util-errors],1.0,[xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -10,15 +9,14 @@ AC_CONFIG_MACRO_DIR([m4])
 # to avoid autoconf errors.
 AC_USE_SYSTEM_EXTENSIONS
 
-AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+AM_MAINTAINER_MODE
 
 AC_TYPE_SSIZE_T
 
 XCB_UTIL_M4_WITH_INCLUDE_PATH
 XCB_UTIL_COMMON([1.4], [1.6])
 
-AM_PATH_PYTHON
-
 # Checks for xcb-proto's XML files, inspired from libxcb's configure.ac
 PKG_CHECK_MODULES(XCBPROTO, xcb-proto)
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
@@ -30,7 +28,6 @@ AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
 XCBPROTO_VERSION=`$PKG_CONFIG --modversion xcb-proto`
 AC_SUBST(XCBPROTO_VERSION)
 
-AC_CONFIG_FILES([Makefile
+AC_OUTPUT([Makefile
 	xcb-errors.pc
 	])
-AC_OUTPUT

m4

@@ -1 +1 @@
-Subproject commit c617eee22ae5c285e79e81ec39ce96862fd3262f
+Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed

tests/test.c

@@ -303,8 +303,7 @@ static int test_xinput(xcb_connection_t *c, xcb_errors_context_t *ctx)
 	err |= check_xge_event(ctx, reply->major_opcode, 0, "Unknown (0)", "Input");
 	err |= check_xge_event(ctx, reply->major_opcode, 1, "DeviceChanged", "Input");
 	err |= check_xge_event(ctx, reply->major_opcode, 26, "BarrierLeave", "Input");
-	err |= check_xge_event(ctx, reply->major_opcode, 32, "GestureSwipeEnd", "Input");
-	err |= check_xge_event(ctx, reply->major_opcode, 33, NULL, "Input");
+	err |= check_xge_event(ctx, reply->major_opcode, 27, NULL, "Input");
 	err |= check_xge_event(ctx, reply->major_opcode, 1337, NULL, "Input");
 	err |= check_xge_event(ctx, reply->major_opcode, 0xffff, NULL, "Input");
 	err |= check_minor(ctx, reply->major_opcode, 0, "Unknown (0)");