mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
editors/p5-Padre: Unbreak build by adding #include <cmath>
- unbreak build by adding include cmath to wx-scintilla/src/scintilla/src/Editor.cxx - make other patches makepatch-compliant - remove WX_UNICODE=yes (obsolete) - un-silence several commands during build PR: 210959 MFH: 2016Q3 Reported by: pkg-fallout
This commit is contained in:
parent
0c723327e4
commit
bb63f3f081
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419375
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= Padre
|
||||
PORTVERSION= 1.00
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= editors perl5
|
||||
MASTER_SITES= CPAN/${PORTNAME}/ CPAN/Wx/:wxsc
|
||||
PKGNAMEPREFIX= p5-
|
||||
@ -66,12 +66,13 @@ BUILD_DEPENDS= p5-JSON-XS>=2.29:converters/p5-JSON-XS \
|
||||
RUN_DEPENDS:= ${BUILD_DEPENDS}
|
||||
BUILD_DEPENDS+= p5-Module-Build>=0.36:devel/p5-Module-Build
|
||||
|
||||
USES= compiler:c++11-lib gettext perl5
|
||||
USES= compiler:c++11-lib dos2unix gettext perl5
|
||||
USE_PERL5= configure
|
||||
USE_WX= 3.0
|
||||
WX_COMPS= wx
|
||||
WX_UNICODE= yes
|
||||
MAKE_JOBS_UNSAFE= yes
|
||||
DOS2UNIX_WRKSRC=${WRKDIR}/${WXSC_DISTNAME}
|
||||
DOS2UNIX_FILES= wx-scintilla/src/scintilla/src/Editor.cxx
|
||||
|
||||
BROKEN_FreeBSD_9= Does not build.
|
||||
|
||||
@ -104,12 +105,16 @@ IGNORE= needs a threaded Perl, build with enabling THREADS option and try again
|
||||
.endif
|
||||
.endif
|
||||
|
||||
pre-patch:
|
||||
(cd ${WRKDIR}/${WXSC_DISTNAME} && \
|
||||
${PATCH} < ${FILESDIR}/extra-patch-editor )
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e \
|
||||
${REINPLACE_CMD} -e \
|
||||
'/my /s|wx-config|${WX_CONFIG:T}|g' \
|
||||
-e '/ret/ s|urn .flags;|urn $$flags . " -std=c++11";|' \
|
||||
${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla.pm
|
||||
@${REINPLACE_CMD} -e \
|
||||
${REINPLACE_CMD} -e \
|
||||
's|_scintilla-|_scintilla| ; \
|
||||
s|$$major.*$$release \.|| ; \
|
||||
/$$major.*$$release;/s|^|#| ; \
|
||||
@ -121,15 +126,15 @@ post-patch:
|
||||
${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla/GTK.pm
|
||||
|
||||
pre-configure:
|
||||
@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
|
||||
(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
|
||||
${PERL} Build.PL ${CONFIGURE_ARGS} --destdir=${STAGEDIR})
|
||||
|
||||
pre-build:
|
||||
@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
|
||||
(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
|
||||
${PERL} Build)
|
||||
|
||||
pre-install:
|
||||
@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
|
||||
(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
|
||||
${PERL} Build install)
|
||||
|
||||
post-install:
|
||||
|
10
editors/p5-Padre/files/extra-patch-editor
Normal file
10
editors/p5-Padre/files/extra-patch-editor
Normal file
@ -0,0 +1,10 @@
|
||||
--- wx-scintilla/src/scintilla/src/Editor.cxx.orig 2016-07-10 12:18:20.419137000 +0200
|
||||
+++ wx-scintilla/src/scintilla/src/Editor.cxx 2016-07-10 12:18:29.917664000 +0200
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <map>
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
+#include <cmath>
|
||||
|
||||
#include "Platform.h"
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- Makefile.PL.orig
|
||||
--- Makefile.PL.orig 2013-11-09 03:10:25 UTC
|
||||
+++ Makefile.PL
|
||||
@@ -46,20 +46,6 @@
|
||||
@@ -46,20 +46,6 @@ configure_requires 'ExtUtils::Embed' =>
|
||||
# exit 0;
|
||||
#}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- lib/Padre/Wx.pm.orig
|
||||
--- lib/Padre/Wx.pm.orig 2013-11-09 03:43:41 UTC
|
||||
+++ lib/Padre/Wx.pm
|
||||
@@ -67,6 +67,7 @@
|
||||
@@ -158,6 +158,7 @@ sub aui_pane_info {
|
||||
|
||||
sub launch_browser {
|
||||
require Padre::Task::LaunchDefaultBrowser;
|
||||
|
Loading…
Reference in New Issue
Block a user