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 0186F158083 for ; Thu, 5 Sep 2024 19:33:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0F152BC02C; Thu, 5 Sep 2024 19:33:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CC0782BC02C for ; Thu, 5 Sep 2024 19:33:31 +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 1A6FD342F9D for ; Thu, 5 Sep 2024 19:33:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A808B1F3C for ; Thu, 5 Sep 2024 19:33:29 +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: <1725564770.a1d4fb2a048e9fd40cba9af3942721ece13db54b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Wx-Scintilla/, dev-perl/Wx-Scintilla/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch X-VCS-Directories: dev-perl/Wx-Scintilla/files/ dev-perl/Wx-Scintilla/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a1d4fb2a048e9fd40cba9af3942721ece13db54b X-VCS-Branch: master Date: Thu, 5 Sep 2024 19:33:29 +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: cb854423-aba9-467a-be9c-c0a3756bb754 X-Archives-Hash: d92ab9dd7eb57a778332a18e8bfe7f9d commit: a1d4fb2a048e9fd40cba9af3942721ece13db54b Author: Alfred Wingate protonmail com> AuthorDate: Thu Sep 5 18:33:09 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 5 19:32:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d4fb2a dev-perl/Wx-Scintilla: scrub leftover gtk2 linkage attempt Closes: https://bugs.gentoo.org/922347 Fixes: 9c0ef2be161719a22579fbc0a24963ad05b3c73b Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> .../Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild | 1 + .../files/Wx-Scintilla-0.39-scrub-gtk2.patch | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild index dd6c3c1fe734..843cd133b141 100644 --- a/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild +++ b/dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild @@ -31,6 +31,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.39-gcc6.patch "${FILESDIR}"/${PN}-0.39-respect-user-flags.patch "${FILESDIR}"/${PN}-0.39-force-c++11.patch + "${FILESDIR}"/${PN}-0.39-scrub-gtk2.patch ) src_configure() { diff --git a/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch new file mode 100644 index 000000000000..8c025f399926 --- /dev/null +++ b/dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch @@ -0,0 +1,35 @@ +--- a/inc/Module/Build/Scintilla/GTK.pm ++++ b/inc/Module/Build/Scintilla/GTK.pm +@@ -63,32 +64,6 @@ + $self->_run_command( \@cmd ); + } + +-sub stc_prebuild_check { +- my $self = shift; +- my $ld = Alien::wxWidgets->linker; +- my $libstring = $self->stc_extra_scintilla_libs; +- my $outfile = 'stc_checkdepends.out'; +- my $command = qq($ld -fPIC -shared $libstring -o $outfile); +- if ( system($command) ) { +- unlink($outfile); +- print qq(Check for gtk2 development libraries failed.\n); +- print qq(Perhaps you need to install package libgtk2.0-dev or the equivalent for your system.\n); +- print qq(You can ofcourse uninstall it later after the installation is complete.\n); +- print qq(The build cannot continue.\n); +- exit(1); +- } +- unlink($outfile); +- return 1; +-} +- +-sub stc_extra_scintilla_libs { +- my $self = shift; +- my $extras = '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 '; +- $extras .= '-lgdk_pixbuf-2.0 -lm -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 '; +- $extras .= '-lgmodule-2.0 -lgthread-2.0 -lglib-2.0'; +- return $extras; +-} +- + sub stc_link_scintilla_objects { + my ( $self, $shared_lib, $objects ) = @_; +