Commits:
-
69151549
by Alan Coopersmith at 2019-02-17T10:59:51-08:00
Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
b23e729d
by Alan Coopersmith at 2022-06-18T10:21:52-07:00
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
915821d4
by Alan Coopersmith at 2022-06-18T10:22:06-07:00
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters
configure.ac:12: warning: AC_OUTPUT should be used without arguments.
configure.ac:12: You should run autoupdate.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
8af9f05e
by Alan Coopersmith at 2022-07-20T15:14:42-07:00
Update m4 to xorg/util/xcb-util-m4@c617eee22ae5c285e79e81
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
1f26aee9
by Alan Coopersmith at 2022-07-20T15:23:07-07:00
gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
696899a8
by Alan Coopersmith at 2022-07-24T14:14:24-07:00
configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
c82fcb38
by Alan Coopersmith at 2022-07-24T14:14:25-07:00
autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
267beff8
by Peter Hutterer at 2022-07-24T14:14:25-07:00
autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
4bb8f74f
by Emil Velikov at 2022-07-24T14:14:25-07:00
autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
07b8ad33
by Mihail Konev at 2022-07-24T14:14:29-07:00
autogen: add default patch prefix
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
439be15c
by Alan Coopersmith at 2022-08-03T13:15:40-07:00
Add COPYING file
Fixes: #2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
85e093f1
by Alan Coopersmith at 2022-10-18T18:26:19-07:00
xcb-util-keysyms 0.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
39278126
by Timo Aaltonen at 2025-01-22T12:45:50+02:00
Merge branch 'upstream-unstable' into debian-unstable
-
c465ce1f
by Timo Aaltonen at 2025-01-22T12:46:11+02:00
version bump
8 changed files:
Changes:
.gitlab-ci.yml
|
|
1
|
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
|
|
|
2
|
+#
|
|
|
3
|
+# This CI uses the freedesktop.org ci-templates.
|
|
|
4
|
+# Please see the ci-templates documentation for details:
|
|
|
5
|
+# https://freedesktop.pages.freedesktop.org/ci-templates/
|
|
|
6
|
+
|
|
|
7
|
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
|
|
8
|
+
|
|
|
9
|
+
|
|
|
10
|
+include:
|
|
|
11
|
+ # Arch container builder template
|
|
|
12
|
+ - project: 'freedesktop/ci-templates'
|
|
|
13
|
+ ref: *template_sha
|
|
|
14
|
+ file: '/templates/arch.yml'
|
|
|
15
|
+ - project: 'freedesktop/ci-templates'
|
|
|
16
|
+ ref: *template_sha
|
|
|
17
|
+ file: '/templates/ci-fairy.yml'
|
|
|
18
|
+ - template: Security/SAST.gitlab-ci.yml
|
|
|
19
|
+
|
|
|
20
|
+
|
|
|
21
|
+stages:
|
|
|
22
|
+ - prep # prep work like rebuilding the container images if there is a change
|
|
|
23
|
+ - build # for actually building and testing things in a container
|
|
|
24
|
+ - test
|
|
|
25
|
+ - deploy
|
|
|
26
|
+
|
|
|
27
|
+
|
|
|
28
|
+variables:
|
|
|
29
|
+ FDO_UPSTREAM_REPO: 'xorg/lib/libxcb-keysyms'
|
|
|
30
|
+ # The tag should be updated each time the list of packages is updated.
|
|
|
31
|
+ # Changing a tag forces the associated image to be rebuilt.
|
|
|
32
|
+ # Note: the tag has no meaning, we use a date format purely for readability
|
|
|
33
|
+ FDO_DISTRIBUTION_TAG: '2022-07-20.2'
|
|
|
34
|
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros doxygen graphviz xorgproto libxcb'
|
|
|
35
|
+ GIT_SUBMODULE_STRATEGY: normal
|
|
|
36
|
+
|
|
|
37
|
+#
|
|
|
38
|
+# Verify that commit messages are as expected
|
|
|
39
|
+#
|
|
|
40
|
+check-commits:
|
|
|
41
|
+ extends:
|
|
|
42
|
+ - .fdo.ci-fairy
|
|
|
43
|
+ stage: prep
|
|
|
44
|
+ script:
|
|
|
45
|
+ - ci-fairy check-commits --junit-xml=results.xml
|
|
|
46
|
+ except:
|
|
|
47
|
+ - master@xorg/lib/libxcb-keysyms
|
|
|
48
|
+ variables:
|
|
|
49
|
+ GIT_DEPTH: 100
|
|
|
50
|
+ artifacts:
|
|
|
51
|
+ reports:
|
|
|
52
|
+ junit: results.xml
|
|
|
53
|
+
|
|
|
54
|
+#
|
|
|
55
|
+# Verify that the merge request has the allow-collaboration checkbox ticked
|
|
|
56
|
+#
|
|
|
57
|
+check-merge-request:
|
|
|
58
|
+ extends:
|
|
|
59
|
+ - .fdo.ci-fairy
|
|
|
60
|
+ stage: deploy
|
|
|
61
|
+ script:
|
|
|
62
|
+ - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
|
|
|
63
|
+ artifacts:
|
|
|
64
|
+ when: on_failure
|
|
|
65
|
+ reports:
|
|
|
66
|
+ junit: results.xml
|
|
|
67
|
+ allow_failure: true
|
|
|
68
|
+
|
|
|
69
|
+
|
|
|
70
|
+#
|
|
|
71
|
+# Build a container with the given tag and the packages pre-installed.
|
|
|
72
|
+# This only happens if/when the tag changes, otherwise the existing image is
|
|
|
73
|
+# re-used.
|
|
|
74
|
+#
|
|
|
75
|
+container-prep:
|
|
|
76
|
+ extends:
|
|
|
77
|
+ - .fdo.container-build@arch
|
|
|
78
|
+ stage: prep
|
|
|
79
|
+ variables:
|
|
|
80
|
+ GIT_STRATEGY: none
|
|
|
81
|
+
|
|
|
82
|
+
|
|
|
83
|
+#
|
|
|
84
|
+# The default build, runs on the image built above.
|
|
|
85
|
+#
|
|
|
86
|
+build:
|
|
|
87
|
+ stage: build
|
|
|
88
|
+ extends:
|
|
|
89
|
+ - .fdo.distribution-image@arch
|
|
|
90
|
+ script:
|
|
|
91
|
+ - autoreconf -ivf
|
|
|
92
|
+ - mkdir _builddir
|
|
|
93
|
+ - pushd _builddir > /dev/null
|
|
|
94
|
+ - ../configure --disable-silent-rules
|
|
|
95
|
+ - make
|
|
|
96
|
+ - make check
|
|
|
97
|
+ - make distcheck
|
|
|
98
|
+ - popd > /dev/null |
COPYING
|
|
1
|
+Copyright © 2008 Ian Osgood <iano@quirkster.com>
|
|
|
2
|
+Copyright © 2008 Jamey Sharp <jamey@minilop.net>
|
|
|
3
|
+Copyright © 2008 Josh Triplett <josh@freedesktop.org>
|
|
|
4
|
+Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
|
|
|
5
|
+
|
|
|
6
|
+Permission is hereby granted, free of charge, to any person
|
|
|
7
|
+obtaining a copy of this software and associated documentation
|
|
|
8
|
+files (the "Software"), to deal in the Software without
|
|
|
9
|
+restriction, including without limitation the rights to use, copy,
|
|
|
10
|
+modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
|
11
|
+of the Software, and to permit persons to whom the Software is
|
|
|
12
|
+furnished to do so, subject to the following conditions:
|
|
|
13
|
+
|
|
|
14
|
+The above copyright notice and this permission notice shall be
|
|
|
15
|
+included in all copies or substantial portions of the Software.
|
|
|
16
|
+
|
|
|
17
|
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
18
|
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
19
|
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
20
|
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
|
|
|
21
|
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
|
|
|
22
|
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
23
|
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
24
|
+
|
|
|
25
|
+Except as contained in this notice, the names of the authors or
|
|
|
26
|
+their institutions shall not be used in advertising or otherwise to
|
|
|
27
|
+promote the sale, use or other dealings in this Software without
|
|
|
28
|
+prior written authorization from the authors. |
Makefile.am
| ... |
... |
@@ -14,4 +14,4 @@ dist-hook: ChangeLog INSTALL |
|
14
|
14
|
|
|
15
|
15
|
SUBDIRS = keysyms
|
|
16
|
16
|
|
|
17
|
|
-EXTRA_DIST = autogen.sh |
|
|
17
|
+EXTRA_DIST = autogen.sh README.md |
README
→
README.md
| ... |
... |
@@ -13,12 +13,11 @@ you're using and why you aren't in a mental hospital yet. We'd welcome |
|
13
|
13
|
patches/suggestions for enhancement and new libraries; Please report any
|
|
14
|
14
|
issues you find to the freedesktop.org bug tracker, at:
|
|
15
|
15
|
|
|
16
|
|
- <https://bugs.freedesktop.org/enter_bug.cgi?product=XCB>
|
|
|
16
|
+ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms/issues
|
|
17
|
17
|
|
|
18
|
18
|
Discussion about XCB occurs on the XCB mailing list:
|
|
19
|
19
|
|
|
20
|
|
- <mailto:xcb at lists.freedesktop.org>
|
|
21
|
|
- <http://lists.freedesktop.org/mailman/listinfo/xcb>
|
|
|
20
|
+ http://lists.freedesktop.org/mailman/listinfo/xcb
|
|
22
|
21
|
|
|
23
|
22
|
About XCB util-keysyms module
|
|
24
|
23
|
=============================
|
| ... |
... |
@@ -28,10 +27,12 @@ XCB util-keysyms module provides the following library: |
|
28
|
27
|
- keysyms: Standard X key constants and conversion to/from keycodes.
|
|
29
|
28
|
|
|
30
|
29
|
You can obtain the latest development versions of XCB util-keysyms
|
|
31
|
|
-using GIT. For anonymous checkouts, use:
|
|
|
30
|
+using GIT from <https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms>.
|
|
32
|
31
|
|
|
33
|
|
- git clone --recursive git://anongit.freedesktop.org/git/xcb/util-keysyms
|
|
|
32
|
+ For anonymous checkouts, use:
|
|
34
|
33
|
|
|
35
|
|
-For developers, use:
|
|
|
34
|
+ git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git
|
|
36
|
35
|
|
|
37
|
|
- git clone --recursive git+ssh://git.freedesktop.org/git/xcb/util-keysyms |
|
|
36
|
+ For developers, use:
|
|
|
37
|
+
|
|
|
38
|
+ git clone --recursive git@gitlab.freedesktop.org:xorg/lib/libxcb-keysyms.git |
autogen.sh
|
1
|
1
|
#! /bin/sh
|
|
2
|
2
|
|
|
3
|
|
-srcdir=`dirname $0`
|
|
|
3
|
+srcdir=`dirname "$0"`
|
|
4
|
4
|
test -z "$srcdir" && srcdir=.
|
|
5
|
5
|
|
|
6
|
6
|
ORIGDIR=`pwd`
|
|
7
|
|
-cd $srcdir
|
|
|
7
|
+cd "$srcdir"
|
|
8
|
8
|
|
|
9
|
9
|
# If this is a git checkout, verify that the submodules are initialized,
|
|
10
|
10
|
# otherwise autotools will just fail with an unhelpful error message.
|
| ... |
... |
@@ -22,6 +22,11 @@ then |
|
22
|
22
|
fi
|
|
23
|
23
|
|
|
24
|
24
|
autoreconf -v --install || exit 1
|
|
25
|
|
-cd $ORIGDIR || exit $?
|
|
|
25
|
+cd "$ORIGDIR" || exit $?
|
|
26
|
26
|
|
|
27
|
|
-$srcdir/configure --enable-maintainer-mode "$@" |
|
|
27
|
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
|
|
|
28
|
+ git config --local format.subjectPrefix "PATCH libxcb-keysyms"
|
|
|
29
|
+
|
|
|
30
|
+if test -z "$NOCONFIGURE"; then
|
|
|
31
|
+ exec "$srcdir"/configure "$@"
|
|
|
32
|
+fi |
configure.ac
|
1
|
1
|
AC_PREREQ(2.59c)
|
|
2
|
|
-AC_INIT([xcb-util-keysyms],0.4.0,[xcb@lists.freedesktop.org])
|
|
|
2
|
+AC_INIT([xcb-util-keysyms], [0.4.1],
|
|
|
3
|
+ [https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms/-/issues])
|
|
3
|
4
|
AC_CONFIG_SRCDIR([Makefile.am])
|
|
4
|
5
|
AC_CONFIG_MACRO_DIR([m4])
|
|
5
|
|
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
|
6
|
|
-AM_MAINTAINER_MODE
|
|
|
6
|
+AM_INIT_AUTOMAKE([foreign dist-xz])
|
|
7
|
7
|
|
|
8
|
8
|
XCB_UTIL_COMMON([1.4], [1.6])
|
|
9
|
9
|
|
|
10
|
10
|
PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
|
|
11
|
11
|
|
|
12
|
|
-AC_OUTPUT([Makefile
|
|
|
12
|
+AC_CONFIG_FILES([Makefile
|
|
13
|
13
|
keysyms/Makefile keysyms/xcb-keysyms.pc
|
|
14
|
14
|
])
|
|
|
15
|
+AC_OUTPUT |
debian/changelog
|
1
|
|
-xcb-util-keysyms (0.4.0-2) UNRELEASED; urgency=medium
|
|
|
1
|
+xcb-util-keysyms (0.4.1-1) UNRELEASED; urgency=medium
|
|
2
|
2
|
|
|
|
3
|
+ [ Debian Janitor ]
|
|
3
|
4
|
* Trim trailing whitespace.
|
|
4
|
5
|
* Use secure copyright file specification URI.
|
|
5
|
6
|
* Use secure URI in Homepage field.
|
| ... |
... |
@@ -8,6 +9,9 @@ xcb-util-keysyms (0.4.0-2) UNRELEASED; urgency=medium |
|
8
|
9
|
* Update Vcs-* headers to use salsa repository.
|
|
9
|
10
|
* Remove MIA uploader Julien Danjou <acid@debian.org>. Closes: #928585
|
|
10
|
11
|
|
|
|
12
|
+ [ Timo Aaltonen ]
|
|
|
13
|
+ * New upstream release.
|
|
|
14
|
+
|
|
11
|
15
|
-- Debian Janitor <janitor@jelmer.uk> Tue, 21 Jan 2020 00:51:46 +0000
|
|
12
|
16
|
|
|
13
|
17
|
xcb-util-keysyms (0.4.0-1) unstable; urgency=medium
|
m4
|
1
|
|
-Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed |
|
|
1
|
+Subproject commit c617eee22ae5c285e79e81ec39ce96862fd3262f |
|