[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/files/, x11-libs/libxcb/

[Matt Turner]

commit: aac537d67c3588a1834020e1b51f4eaf76e9803c
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 21 21:05:05 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 21 21:07:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac537d6

x11-libs/libxcb: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-libs/libxcb/Manifest   |  1 -
 .../libxcb-1.16-Enable-large-file-support.patch| 25 
 x11-libs/libxcb/libxcb-1.16-r1.ebuild  | 66 --
 3 files changed, 92 deletions(-)

diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 7592b177c19a..59e6b19de21e 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,2 @@
 DIST libxcb-1.16.1.tar.xz 455368 BLAKE2B 
91d489eaf8b0bfb0c02a4d974f72871963dc86cdf60478d618636d580974b260ab822ab33c7174e05dc45adf01e53e423a7449550b7b43fabb3917f7d99219c0
 SHA512 
e3afdae1c0e2a5ae2add7b2c4fdd3283cb86023ef6448f5b8b29a4bb72c274e34eaf0fc7523762bcd3f5116910fe7374490e8f26c25744301563ced80acc3e7f
-DIST libxcb-1.16.tar.xz 452964 BLAKE2B 
1ddd5c2e6be8400a0a77db4b5fbd4698996fd1a00984e370b1f712f6b9ce456c8ccfb6992f2973f5eaf8d5b6b75f39b9f51a1458c2432ddb41edd8199b91b3f9
 SHA512 
002fbc126c6f09eb7db5e4197cd0572d495f64b6de714a76d9a024fe3e13122c1cfc7c55207c0dee76cc63fcccf87b37db513223eadaf760af2bd2a926443bf8
 DIST libxcb-1.17.0.tar.xz 455208 BLAKE2B 
e2a35606981c00f9f18e5590cdc26c7c2efd8f832c37dc4dc82db47e2870bf4ff48786162c5a8eb713cb5f3a305eb22d334e4b0ff631bf0e047f1b79cb0701d3
 SHA512 
945b1f28e8b407a4d0ebf88c99ef3cbef763fd75e6eaa8e971946e44ce8dbe9b478c56ae85dab7fdb25987e88570d9d4fb9ad2febd6d6bf21d644a0e10d0

diff --git a/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch 
b/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch
deleted file mode 100644
index c1c8ad5dc05c..
--- a/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3c946010c8521497b0fba2c8bc9bde184622345a Mon Sep 17 00:00:00 2001
-From: Fergus Dall 
-Date: Tue, 7 Nov 2023 17:42:42 +1100
-Subject: [PATCH libxcb] Enable large file support
-
-Signed-off-by: Fergus Dall 

- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index b78454d..d981bea 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -18,6 +18,7 @@ AM_PATH_PYTHON([3.0])
- # Must be called before any macros that run the compiler (like 
AC_PROG_LIBTOOL)
- # to avoid autoconf errors.
- AC_USE_SYSTEM_EXTENSIONS
-+AC_SYS_LARGEFILE
- 
- # Initialize libtool
- LT_PREREQ([2.2])
--- 
-2.42.0.869.gea05f2083d-goog
-

diff --git a/x11-libs/libxcb/libxcb-1.16-r1.ebuild 
b/x11-libs/libxcb/libxcb-1.16-r1.ebuild
deleted file mode 100644
index cc95d3137ad9..
--- a/x11-libs/libxcb/libxcb-1.16-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_MULTILIB=yes
-XORG_DOC=doc
-
-inherit python-any-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb;
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="doc selinux test +xkb"
-RESTRICT="!test? ( test )"
-SLOT="0/1.12"
-
-RDEPEND="
-   >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-   >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-   >=x11-base/xcb-proto-1.16.0
-   elibc_Darwin? ( dev-libs/libpthread-stubs )
-   test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-BDEPEND="${PYTHON_DEPS}
-   $(python_gen_any_dep '>=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]')
-   doc? ( app-text/doxygen[dot] )
-   test? ( dev-libs/libxslt )
-   >=x11-misc/util-macros-1.18
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.16-Enable-large-file-support.patch"
-)
-
-python_check_deps() {
-   python_has_version ">=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   xorg-3_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   local XORG_CONFIGURE_OPTIONS=(
-   $(use_enable doc devel-docs)
-   $(use_enable selinux)
-   )
-   xorg-3_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/files/, x11-libs/libxcb/

[Matt Turner]

commit: 4d80747a73b7e207fb6460e0e86efd4c641cb405
Author: Fergus Dall  google  com>
AuthorDate: Thu Nov  9 04:20:48 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 10 18:38:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d80747a

x11-libs/libxcb: Enable large file support

This patch is also being submitted upstream for the next libxcb release:
https://gitlab.freedesktop.org/xorg/lib/libxcb/-/merge_requests/54

Signed-off-by: Fergus Dall  google.com>
Closes: https://github.com/gentoo/gentoo/pull/33734
Signed-off-by: Matt Turner  gentoo.org>

 .../libxcb-1.16-Enable-large-file-support.patch| 25 
 x11-libs/libxcb/libxcb-1.16-r1.ebuild  | 66 ++
 2 files changed, 91 insertions(+)

diff --git a/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch 
b/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch
new file mode 100644
index ..c1c8ad5dc05c
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.16-Enable-large-file-support.patch
@@ -0,0 +1,25 @@
+From 3c946010c8521497b0fba2c8bc9bde184622345a Mon Sep 17 00:00:00 2001
+From: Fergus Dall 
+Date: Tue, 7 Nov 2023 17:42:42 +1100
+Subject: [PATCH libxcb] Enable large file support
+
+Signed-off-by: Fergus Dall 
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index b78454d..d981bea 100644
+--- a/configure.ac
 b/configure.ac
+@@ -18,6 +18,7 @@ AM_PATH_PYTHON([3.0])
+ # Must be called before any macros that run the compiler (like 
AC_PROG_LIBTOOL)
+ # to avoid autoconf errors.
+ AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ 
+ # Initialize libtool
+ LT_PREREQ([2.2])
+-- 
+2.42.0.869.gea05f2083d-goog
+

diff --git a/x11-libs/libxcb/libxcb-1.16-r1.ebuild 
b/x11-libs/libxcb/libxcb-1.16-r1.ebuild
new file mode 100644
index ..abb75e7b35a6
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.16-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_MULTILIB=yes
+XORG_DOC=doc
+
+inherit python-any-r1 xorg-3
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb;
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+IUSE="doc selinux test +xkb"
+RESTRICT="!test? ( test )"
+SLOT="0/1.12"
+
+RDEPEND="
+   >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+   >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto
+   >=x11-base/xcb-proto-1.16.0
+   elibc_Darwin? ( dev-libs/libpthread-stubs )
+   test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+BDEPEND="${PYTHON_DEPS}
+   $(python_gen_any_dep '>=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]')
+   doc? ( app-doc/doxygen[dot] )
+   test? ( dev-libs/libxslt )
+   >=x11-misc/util-macros-1.18
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.16-Enable-large-file-support.patch"
+)
+
+python_check_deps() {
+   python_has_version ">=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   xorg-3_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   local XORG_CONFIGURE_OPTIONS=(
+   $(use_enable doc devel-docs)
+   $(use_enable selinux)
+   )
+   xorg-3_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/files/, x11-libs/libxcb/

[Matt Turner]

commit: 4b9aeb321da82a48bd45b8018390a1236a7bb888
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 24 16:19:00 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 24 16:25:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9aeb32

x11-libs/libxcb: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-libs/libxcb/Manifest   |  1 -
 ...on-t-use-deprecated-fail_unless-check-API.patch | 86 --
 x11-libs/libxcb/libxcb-1.14.ebuild | 58 ---
 3 files changed, 145 deletions(-)

diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 8ea9468f9062..345b1fd64638 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,2 +1 @@
-DIST libxcb-1.14.tar.xz 439404 BLAKE2B 
63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111
 SHA512 
b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B 
d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545
 SHA512 
f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9

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
deleted file mode 100644
index cc7f22ba4e9d..
--- 
a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
-From: Ran Benita 
-Date: Tue, 17 Nov 2020 23:43:06 +0200
-Subject: [PATCH] tests: don't use deprecated fail_unless check API
-
-It causes errors like this when running make check:
-
-check_public.c:40:24: error: too many arguments for format 
[-Werror=format-extra-args]
-   40 |   fail_unless(success, "unexpected parse failure %sfor '%s'", 
test_string[test_type], name);
-
-Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
-Tested-by: Matt Turner 
-Signed-off-by: Ran Benita 

- configure.ac |  2 +-
- tests/check_public.c | 30 +++---
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/tests/check_public.c b/tests/check_public.c
-index 2094bfe..aed40c8 100644
 a/tests/check_public.c
-+++ b/tests/check_public.c
-@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const 
char *host, const int dis
-   got_display = got_screen = -42;
-   mark_point();
-   success = xcb_parse_display(argument, _host, _display, 
_screen);
--  fail_unless(success, "unexpected parse failure %sfor '%s'", 
test_string[test_type], name);
--  fail_unless(strcmp(host, got_host) == 0, "parse %sproduced 
unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], 
got_host, name, host);
--  fail_unless(display == got_display, "parse %sproduced 
unexpected display '%d' for '%s': expected '%d'", test_string[test_type], 
got_display, name, display);
--  fail_unless(screen == got_screen, "parse %sproduced unexpected 
screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, 
screen);
-+  ck_assert_msg(success, "unexpected parse failure %sfor '%s'", 
test_string[test_type], name);
-+  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);
-+  ck_assert_msg(display == got_display, "parse %sproduced 
unexpected display '%d' for '%s': expected '%d'", test_string[test_type], 
got_display, name, display);
-+  ck_assert_msg(screen == got_screen, "parse %sproduced 
unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], 
got_screen, name, screen);
- 
-   got_host = (char *) -1;
-   got_display = got_screen = -42;
-   mark_point();
-   success = xcb_parse_display(argument, _host, _display, 
0);
--  fail_unless(success, "unexpected screenless parse failure %sfor 
'%s'", test_string[test_type], name);
--  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);
--  fail_unless(display == got_display, "screenless parse 
%sproduced unexpected display '%d' for '%s': expected '%d'", 
test_string[test_type], got_display, name, display);
-+  ck_assert_msg(success, "unexpected screenless parse failure 
%sfor '%s'", test_string[test_type], name);
-+  

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/files/

[Chí-Thanh Christopher Nguyễn]

commit: eb9f8511dd89af8f737307ae9eb3498dfa80e595
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Sun May 29 22:58:53 2016 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Sun May 29 22:58:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9f8511

x11-libs/libxcb: add patch file that was mistakenly not committed

Package-Manager: portage-2.2.28

 ...bxcb-1.12-fix-inconsistent-use-tabs-space.patch | 55 ++
 1 file changed, 55 insertions(+)

diff --git 
a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch 
b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
new file mode 100644
index 000..bbac9a9
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch
@@ -0,0 +1,55 @@
+From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner 
+Date: Thu, 19 May 2016 17:31:18 +0200
+Subject: Fix inconsistent use of tabs vs. space.
+
+Needed for at least python-3.5.x.
+
+Signed-off-by: Thomas Klausner 
+Signed-off-by: Uli Schlachter 
+
+diff --git a/src/c_client.py b/src/c_client.py
+index 57de3fb..043338d 100644
+--- a/src/c_client.py
 b/src/c_client.py
+@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
+ _c('unsigned int xcb_align_to = 0;')
+ if self.is_switch:
+ _c('unsigned int xcb_padding_offset = %d;',
+- self.get_align_offset() )
++   self.get_align_offset() )
+ prefix = [('_aux', '->', self)]
+ aux_ptr = 'xcb_out'
+ 
+@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
+ _c('unsigned int xcb_align_to = 0;')
+ if self.is_switch:
+ _c('unsigned int xcb_padding_offset = %d;',
+- self.get_align_offset() )
++   self.get_align_offset() )
+ 
+ elif 'sizeof' == context:
+ param_names = [p[2] for p in params]
+@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
+ # from the request size and divide that by the member size
+ return '(((R->length * 4) - sizeof('+ self.c_type + 
'))/'+'sizeof('+field.type.member.c_wiretype+'))'
+ else:
+-  # use the accessor to get the start of the list, then
+-  # compute the length of it by subtracting it from
++# use the accessor to get the start of the list, then
++# compute the length of it by subtracting it from
+ # the adress of the first byte after the end of the
+ # request
+-  after_end_of_request = '(((char*)R) + R->length * 4)'
+-  start_of_list = '%s(R)' % (field.c_accessor_name)
++after_end_of_request = '(((char*)R) + R->length * 4)'
++start_of_list = '%s(R)' % (field.c_accessor_name)
+ bytesize_of_list = '%s - (char*)(%s)' % 
(after_end_of_request, start_of_list)
+-  return '(%s) / sizeof(%s)' % (bytesize_of_list, 
field.type.member.c_wiretype)
++return '(%s) / sizeof(%s)' % (bytesize_of_list, 
field.type.member.c_wiretype)
+ else:
+ raise Exception(
+ "lengthless lists with varsized members are not 
supported. Fieldname '%s'"
+-- 
+cgit v0.10.2
+