Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/files/, x11-libs/libxcb/
Date: Fri, 24 Jun 2022 16:26:35
Message-Id: 1656087956.4b9aeb321da82a48bd45b8018390a1236a7bb888.mattst88@gentoo
1 commit: 4b9aeb321da82a48bd45b8018390a1236a7bb888
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 24 16:19:00 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 24 16:25:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9aeb32
7
8 x11-libs/libxcb: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-libs/libxcb/Manifest | 1 -
13 ...on-t-use-deprecated-fail_unless-check-API.patch | 86 ----------------------
14 x11-libs/libxcb/libxcb-1.14.ebuild | 58 ---------------
15 3 files changed, 145 deletions(-)
16
17 diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
18 index 8ea9468f9062..345b1fd64638 100644
19 --- a/x11-libs/libxcb/Manifest
20 +++ b/x11-libs/libxcb/Manifest
21 @@ -1,2 +1 @@
22 -DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
23 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
24
25 diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
26 deleted file mode 100644
27 index cc7f22ba4e9d..000000000000
28 --- a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
29 +++ /dev/null
30 @@ -1,86 +0,0 @@
31 -From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
32 -From: Ran Benita <ran@×××××××××.com>
33 -Date: Tue, 17 Nov 2020 23:43:06 +0200
34 -Subject: [PATCH] tests: don't use deprecated fail_unless check API
35 -
36 -It causes errors like this when running make check:
37 -
38 -check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
39 - 40 | fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
40 -
41 -Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
42 -Tested-by: Matt Turner <mattst88@×××××.com>
43 -Signed-off-by: Ran Benita <ran@×××××××××.com>
44 ----
45 - configure.ac | 2 +-
46 - tests/check_public.c | 30 +++++++++++++++---------------
47 - 2 files changed, 16 insertions(+), 16 deletions(-)
48 -
49 -diff --git a/tests/check_public.c b/tests/check_public.c
50 -index 2094bfe..aed40c8 100644
51 ---- a/tests/check_public.c
52 -+++ b/tests/check_public.c
53 -@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
54 - got_display = got_screen = -42;
55 - mark_point();
56 - success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
57 -- fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
58 -- fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
59 -- fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
60 -- fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
61 -+ ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
62 -+ ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
63 -+ ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
64 -+ ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
65 -
66 - got_host = (char *) -1;
67 - got_display = got_screen = -42;
68 - mark_point();
69 - success = xcb_parse_display(argument, &got_host, &got_display, 0);
70 -- fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
71 -- fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
72 -- fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
73 -+ ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
74 -+ ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
75 -+ ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
76 - }
77 - putenv("DISPLAY=");
78 - }
79 -@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
80 - got_display = got_screen = -42;
81 - mark_point();
82 - success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
83 -- fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
84 -- fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
85 -- fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
86 -- fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
87 -+ ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
88 -+ ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
89 -+ ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
90 -+ ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
91 -
92 - got_host = (char *) -1;
93 - got_display = got_screen = -42;
94 - mark_point();
95 - success = xcb_parse_display(argument, &got_host, &got_display, 0);
96 -- fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
97 -- fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
98 -- fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
99 -+ ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
100 -+ ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
101 -+ ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
102 - }
103 - putenv("DISPLAY=");
104 - }
105 -@@ -183,7 +183,7 @@ END_TEST
106 -
107 - static void popcount_eq(uint32_t bits, int count)
108 - {
109 -- fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
110 -+ ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
111 - }
112 -
113 - START_TEST(popcount)
114 ---
115 -2.26.2
116 -
117
118 diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
119 deleted file mode 100644
120 index 8cd1a7ed1915..000000000000
121 --- a/x11-libs/libxcb/libxcb-1.14.ebuild
122 +++ /dev/null
123 @@ -1,58 +0,0 @@
124 -# Copyright 1999-2022 Gentoo Authors
125 -# Distributed under the terms of the GNU General Public License v2
126 -
127 -EAPI=7
128 -
129 -PYTHON_COMPAT=( python3_{8..10} )
130 -PYTHON_REQ_USE=xml
131 -
132 -XORG_TARBALL_SUFFIX="xz"
133 -XORG_MULTILIB=yes
134 -XORG_DOC=doc
135 -
136 -inherit python-any-r1 xorg-3
137 -
138 -DESCRIPTION="X C-language Bindings library"
139 -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
140 -
141 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
142 -IUSE="doc selinux test +xkb"
143 -RESTRICT="!test? ( test )"
144 -SLOT="0/1.12"
145 -
146 -RDEPEND="
147 - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
148 - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
149 -"
150 -DEPEND="${RDEPEND}
151 - >=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP}]
152 - elibc_Darwin? ( dev-libs/libpthread-stubs )
153 - test? ( dev-libs/check[${MULTILIB_USEDEP}] )
154 -"
155 -# Note: ${PYTHON_USEDEP} needs to go verbatim
156 -BDEPEND="${PYTHON_DEPS}
157 - $(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
158 - doc? ( app-doc/doxygen[dot] )
159 - test? ( dev-libs/libxslt )
160 -"
161 -
162 -PATCHES=(
163 - "${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
164 -)
165 -
166 -python_check_deps() {
167 - has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
168 -}
169 -
170 -pkg_setup() {
171 - python-any-r1_pkg_setup
172 - xorg-3_pkg_setup
173 -}
174 -
175 -src_configure() {
176 - local XORG_CONFIGURE_OPTIONS=(
177 - $(use_enable doc devel-docs)
178 - $(use_enable selinux)
179 - )
180 - xorg-3_src_configure
181 -}