diff options
| author |   Alfred Wingate <parona@protonmail.com> | 2024-09-05 21:33:09 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-09-05 20:32:50 +0100 |
| commit | a1d4fb2a048e9fd40cba9af3942721ece13db54b (patch) | |
| tree | 0116a924babe9aa34b98c045d32705fdeb4b2950 /dev-perl/Wx-Scintilla | |
| parent | dev-perl/Wx-Scintilla: force c++11 due to std::auto_ptr (diff) | |
| download | gentoo-a1d4fb2a048e9fd40cba9af3942721ece13db54b.tar.gz gentoo-a1d4fb2a048e9fd40cba9af3942721ece13db54b.tar.bz2 gentoo-a1d4fb2a048e9fd40cba9af3942721ece13db54b.zip | |
dev-perl/Wx-Scintilla: scrub leftover gtk2 linkage attempt
Closes: https://bugs.gentoo.org/922347
Fixes: 9c0ef2be161719a22579fbc0a24963ad05b3c73b
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-perl/Wx-Scintilla')
| -rw-r--r-- | dev-perl/Wx-Scintilla/Wx-Scintilla-0.390.0-r5.ebuild | 1 | ||||
| -rw-r--r-- | dev-perl/Wx-Scintilla/files/Wx-Scintilla-0.39-scrub-gtk2.patch | 35 |
2 files changed, 36 insertions, 0 deletions
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 ) = @_; + |