head 1.4; access; symbols pkgsrc-2020Q2:1.3.0.40 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.20 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.42 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.38 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.36 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.34 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.32 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.30 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.28 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.26 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.24 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.22 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.18 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.16 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.14 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.12 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.10 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.8 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.6 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.4 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.2 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.2.0.22 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.20 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.18 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.16 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.14 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.12 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.10 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.6 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.4 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.2 pkgsrc-2012Q3-base:1.2; locks; strict; comment @# @; 1.4 date 2020.09.08.12.11.36; author wiz; state dead; branches; next 1.3; commitid YASFGDbqoAadYenC; 1.3 date 2015.04.17.15.22.44; author joerg; state Exp; branches; next 1.2; commitid ePyucWM6RfdTnXhy; 1.2 date 2012.09.13.14.16.44; author sno; state Exp; branches 1.2.22.1; next 1.1; 1.1 date 2012.09.13.14.14.01; author sno; state Exp; branches; next ; 1.2.22.1 date 2015.04.25.04.04.43; author hiramatsu; state Exp; branches; next ; commitid QSxclDfQO8jymViy; desc @@ 1.4 log @p5-Wx-Scintilla: remove Fails for a long time in lots of bulk builds, no upstream release since 2012. @ text @$NetBSD: patch-aa,v 1.3 2015/04/17 15:22:44 joerg Exp $ - Don't use $ORIGIN, it violates pkgsrc policy. - Obtain additional linker flags to not depend on implicit ${PREFIX}/lib. --- inc/Module/Build/Scintilla/GTK.pm.orig 2012-09-04 10:20:47.000000000 +0000 +++ inc/Module/Build/Scintilla/GTK.pm @@@@ -86,7 +86,7 @@@@ sub stc_extra_scintilla_libs { 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; + return Alien::wxWidgets->libraries(qw(core base)) . ' ' . $extras; } sub stc_link_scintilla_objects { @@@@ -95,8 +95,7 @@@@ sub stc_link_scintilla_objects { my @@cmd = ( $self->stc_linker, $self->stc_ldflags, - '-fPIC -shared', - ' -o ' . $shared_lib, + $shared_lib, join( ' ', @@$objects ), $self->stc_link_paths, $self->stc_extra_scintilla_libs, @@@@ -139,14 +138,14 @@@@ sub stc_link_xs { my @@cmd = ( Alien::wxWidgets->linker, Alien::wxWidgets->link_flags, + '-o', $dll, $Config{lddlflags}, '-fPIC -L.', - '-s -o ' . $dll, 'Scintilla.o', '-Lblib/arch/auto/Wx/Scintilla ' . $self->stc_scintilla_link, Alien::wxWidgets->libraries(qw(core base)), $Config{perllibs}, - "-Wl,-rpath,'\$ORIGIN'", + "-Wl,-rpath,'" . File::Spec->catdir( $Config{vendorarch}, "auto/Wx/Scintilla" ) . "'", ); $self->_run_command( \@@cmd ); @ 1.3 log @Don't depend on ${PREFIX}/lib to be added implicitly by the wrappers. Don't use empty arguments to -o. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2012/09/13 14:16:44 sno Exp $ @ 1.2 log @add comment to patch @ text @d1 4 a4 2 $NetBSD: patch-aa,v 1.1 2012/09/13 14:14:01 sno Exp $ # some ldld's doesn't seem to understand $ORIGIN d8 28 a35 1 @@@@ -146,7 +146,7 @@@@ sub stc_link_xs { @ 1.2.22.1 log @Pullup ticket #4683 - requested by joerg editors/p5-Wx-Scintilla: link fix patch Revisions pulled up: - editors/p5-Wx-Scintilla/distinfo 1.3 - editors/p5-Wx-Scintilla/patches/patch-aa 1.3 --- Module Name: pkgsrc Committed By: joerg Date: Fri Apr 17 15:22:44 UTC 2015 Modified Files: pkgsrc/editors/p5-Wx-Scintilla: distinfo pkgsrc/editors/p5-Wx-Scintilla/patches: patch-aa Log Message: Don't depend on ${PREFIX}/lib to be added implicitly by the wrappers. Don't use empty arguments to -o. @ text @d1 2 a2 4 $NetBSD: patch-aa,v 1.3 2015/04/17 15:22:44 joerg Exp $ - Don't use $ORIGIN, it violates pkgsrc policy. - Obtain additional linker flags to not depend on implicit ${PREFIX}/lib. d6 1 a6 28 @@@@ -86,7 +86,7 @@@@ sub stc_extra_scintilla_libs { 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; + return Alien::wxWidgets->libraries(qw(core base)) . ' ' . $extras; } sub stc_link_scintilla_objects { @@@@ -95,8 +95,7 @@@@ sub stc_link_scintilla_objects { my @@cmd = ( $self->stc_linker, $self->stc_ldflags, - '-fPIC -shared', - ' -o ' . $shared_lib, + $shared_lib, join( ' ', @@$objects ), $self->stc_link_paths, $self->stc_extra_scintilla_libs, @@@@ -139,14 +138,14 @@@@ sub stc_link_xs { my @@cmd = ( Alien::wxWidgets->linker, Alien::wxWidgets->link_flags, + '-o', $dll, $Config{lddlflags}, '-fPIC -L.', - '-s -o ' . $dll, 'Scintilla.o', @ 1.1 log @Adding new package for CPAN module Wx::Scintilla version 0.39 as requirement of scheduled update of editors/p5-Padre package into editors/p5-Wx-Scintilla. Scintilla is a contributed project which means it will not be the latest by the time a new wxWidgets distribution is released. And on the scintilla front, the Perl 5 lexer is not 100% bug free even and we do not have any kind of Perl 6 support in Scintilla. The ambitious goal of this project is to provide fresh Perl 5 and maybe 6 support in Wx while preserving compatibility with Wx::StyledTextCtrl and continually contribute it back to Scintilla project. @ text @d1 2 a2 1 $NetBSD$ @