From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F98D15800F for ; Tue, 17 Jan 2023 01:55:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76634E0827; Tue, 17 Jan 2023 01:55:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55EACE0827 for ; Tue, 17 Jan 2023 01:55:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7216333BED9 for ; Tue, 17 Jan 2023 01:55:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 112FC7DE for ; Tue, 17 Jan 2023 01:55:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673920480.7b75d588596d13dbd739cc0cf1100d3cc28afd9b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/X11-XCB/, dev-perl/X11-XCB/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild dev-perl/X11-XCB/files/X11-XCB-0.190.0-build-fixes.patch X-VCS-Directories: dev-perl/X11-XCB/files/ dev-perl/X11-XCB/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b75d588596d13dbd739cc0cf1100d3cc28afd9b X-VCS-Branch: master Date: Tue, 17 Jan 2023 01:55:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9ba26ae5-6c58-4c0c-b914-21e2e763d3cb X-Archives-Hash: a289f9d32480ebf728d9cb00574e09c3 commit: 7b75d588596d13dbd739cc0cf1100d3cc28afd9b Author: Sam James gentoo org> AuthorDate: Tue Jan 17 01:54:40 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 17 01:54:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b75d588 dev-perl/X11-XCB: backport build fixes Closes: https://bugs.gentoo.org/890178 Thanks-to: Peter Levine gmail.com> Signed-off-by: Sam James gentoo.org> dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild | 63 ++++++++++++++++++++++ .../files/X11-XCB-0.190.0-build-fixes.patch | 37 +++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild new file mode 100644 index 000000000000..57f894e175ea --- /dev/null +++ b/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=MSTPLBG +DIST_VERSION=0.19 +inherit perl-module virtualx + +DESCRIPTION="Perl bindings for libxcb" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-perl/Data-Dump + dev-perl/Mouse + dev-perl/MouseX-NativeTraits + dev-perl/Try-Tiny + dev-perl/XML-Descent + dev-perl/XML-Simple + >=virtual/perl-XSLoader-0.20.0 + >=x11-libs/libxcb-1.2 + x11-libs/xcb-util + x11-libs/xcb-util-wm +" +DEPEND=" + >=x11-libs/libxcb-1.2 + x11-libs/xcb-util + x11-libs/xcb-util-wm + x11-base/xcb-proto +" +BDEPEND="${RDEPEND} + x11-base/xcb-proto + >=virtual/perl-Devel-PPPort-3.190.0 + dev-perl/ExtUtils-Depends + >=virtual/perl-ExtUtils-MakeMaker-6.590.0 + >=virtual/perl-ExtUtils-ParseXS-3.180.0 + dev-perl/ExtUtils-PkgConfig + dev-perl/XS-Object-Magic + test? ( + dev-perl/Test-Deep + dev-perl/Test-Exception + virtual/perl-Test-Simple + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-build-fixes.patch +) + +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + + perl-module_src_compile +} + +src_test() { + virtx perl-module_src_test +} diff --git a/dev-perl/X11-XCB/files/X11-XCB-0.190.0-build-fixes.patch b/dev-perl/X11-XCB/files/X11-XCB-0.190.0-build-fixes.patch new file mode 100644 index 000000000000..e1b18fc50fc6 --- /dev/null +++ b/dev-perl/X11-XCB/files/X11-XCB-0.190.0-build-fixes.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/890178 +https://github.com/stapelberg/X11-XCB/pull/3 + +From 95539af3ff38ebc221f92893aade612305c2aba8 Mon Sep 17 00:00:00 2001 +From: Peter Levine +Date: Mon, 16 Jan 2023 03:40:24 -0500 +Subject: [PATCH 1/2] Fix undeclared __PACKAGE__ in C context + +--- a/XCB.xs ++++ b/XCB.xs +@@ -180,7 +180,7 @@ _connect_and_attach_struct(self) + PREINIT: + XCBConnection *xcbconnbuf; + CODE: +- assert(sv_derivered_from(self, __PACKAGE__)); ++ assert(sv_derivered_from(self, HvNAME(PL_curstash))); + SV **disp = hv_fetch((HV*)SvRV(self), "display", strlen("display"), 0); + if(!disp) + croak("Attribute 'display' is required"); + +From 0922360b6fc1d2273dd3e15d0584bea983fdde9a Mon Sep 17 00:00:00 2001 +From: Peter Levine +Date: Mon, 16 Jan 2023 03:42:08 -0500 +Subject: [PATCH 2/2] Fix typo in 'sv_derived_from' + +--- a/XCB.xs ++++ b/XCB.xs +@@ -180,7 +180,7 @@ _connect_and_attach_struct(self) + PREINIT: + XCBConnection *xcbconnbuf; + CODE: +- assert(sv_derivered_from(self, HvNAME(PL_curstash))); ++ assert(sv_derived_from(self, HvNAME(PL_curstash))); + SV **disp = hv_fetch((HV*)SvRV(self), "display", strlen("display"), 0); + if(!disp) + croak("Attribute 'display' is required"); +