Attachment 158347 Details for Bug 201339 – patch to unbreak math/scilab build

[patch] patch to unbreak math/scilab build

scilab.patch (text/plain), 4.45 KB, created by Don Lewis on 2015-07-04 20:08:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2015-07-04 20:08:37 UTC

Size: 4.45 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 391029)
>+++ Makefile	(working copy)
>@@ -23,7 +23,7 @@
> 		libamd.so:${PORTSDIR}/math/suitesparse
> RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
> 
>-USES=		cpe desktop-file-utils fortran gettext gmake iconv \
>+USES=		compiler cpe desktop-file-utils fortran gettext gmake iconv \
> 		libtool pathfix pkgconfig shared-mime-info
> GNU_CONFIGURE=	yes
> 
>@@ -110,7 +110,7 @@
> TK_USES=	tk
> TK_USE=		XORG=x11
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
> .if ${PORT_OPTIONS:MGUI}
> USE_JAVA=	yes
>@@ -122,6 +122,10 @@
> JAVA_RUN=	yes
> .endif
> 
>+.if ${COMPILER_TYPE} == clang
>+CONFIGURE_ARGS+=	--without-openmp
>+.endif
>+
> post-patch:
> 	@# Configure fixes
> 	@${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
>@@ -173,4 +177,4 @@
> 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
> 		${MAKE_ARGS} check)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/patch-modules_helptools_src_java_org_scilab_modules_helptools_FopConverter.java
>===================================================================
>--- files/patch-modules_helptools_src_java_org_scilab_modules_helptools_FopConverter.java	(revision 0)
>+++ files/patch-modules_helptools_src_java_org_scilab_modules_helptools_FopConverter.java	(working copy)
>@@ -0,0 +1,14 @@
>+--- modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java.orig	2014-04-11 09:51:59 UTC
>++++ modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
>+@@ -43,10 +43,9 @@ public class FopConverter extends Contai
>+         String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
>+ 
>+         try {
>+-            FopFactory fopFactory = FopFactory.newInstance();
>++            FopFactory fopFactory = FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
>+             fopFactory.addElementMapping(new JLaTeXMathElementMapping());
>+             fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
>+-            fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
>+ 
>+             // Step 3: Construct fop with desired output format
>+             OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
>
>Property changes on: files/patch-modules_helptools_src_java_org_scilab_modules_helptools_FopConverter.java
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-modules_scinotes_src_java_org_scilab_modules_scinotes_utils_CodeExporter.java
>===================================================================
>--- files/patch-modules_scinotes_src_java_org_scilab_modules_scinotes_utils_CodeExporter.java	(revision 0)
>+++ files/patch-modules_scinotes_src_java_org_scilab_modules_scinotes_utils_CodeExporter.java	(working copy)
>@@ -0,0 +1,16 @@
>+--- modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java.orig	2014-04-11 09:52:10 UTC
>++++ modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
>+@@ -114,11 +114,11 @@ public class CodeExporter extends FOCode
>+      * @param format the page format
>+      */
>+     public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
>+-        FopFactory fopFactory = FopFactory.newInstance();
>++        FopFactory fopFactory;
>+         OutputStream out = null;
>+ 
>+         try {
>+-            fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
>++            fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
>+             FOUserAgent userAgent = fopFactory.newFOUserAgent();
>+             userAgent.setProducer(CREATOR);
>+             userAgent.setTitle(title);
>
>Property changes on: files/patch-modules_scinotes_src_java_org_scilab_modules_scinotes_utils_CodeExporter.java
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 201339: 158347