Attachment #158347 for bug #201339

View | Details | Raw Unified | Return to bug 201339
Collapse All | Expand All

Lines 23-29 Link Here

(-)Makefile (-3 / +7 lines)
23	libamd.so:${PORTSDIR}/math/suitesparse	23	libamd.so:${PORTSDIR}/math/suitesparse
24	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils	24	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
25		25
26	USES= cpe desktop-file-utils fortran gettext gmake iconv \	26	USES= compiler cpe desktop-file-utils fortran gettext gmake iconv \
27	libtool pathfix pkgconfig shared-mime-info	27	libtool pathfix pkgconfig shared-mime-info
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29		29
Lines 110-116 Link Here
110	TK_USES= tk	110	TK_USES= tk
111	TK_USE= XORG=x11	111	TK_USE= XORG=x11
112		112
113	.include <bsd.port.options.mk>	113	.include <bsd.port.pre.mk>
114		114
115	.if ${PORT_OPTIONS:MGUI}	115	.if ${PORT_OPTIONS:MGUI}
116	USE_JAVA= yes	116	USE_JAVA= yes
Lines 122-127 Link Here
122	JAVA_RUN= yes	122	JAVA_RUN= yes
123	.endif	123	.endif
124		124
		125	.if ${COMPILER_TYPE} == clang
		126	CONFIGURE_ARGS+= --without-openmp
		127	.endif
		128
125	post-patch:	129	post-patch:
126	@# Configure fixes	130	@# Configure fixes
127	@${REINPLACE_CMD} -e 's\|-ldl \| \|' ${WRKSRC}/configure	131	@${REINPLACE_CMD} -e 's\|-ldl \| \|' ${WRKSRC}/configure
Lines 173-176 Link Here
173	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \	177	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
174	${MAKE_ARGS} check)	178	${MAKE_ARGS} check)
175		179
176	.include <bsd.port.mk>	180	.include <bsd.port.post.mk>




--- 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));




--- 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);

Return to bug 201339

Line 0 Link Here

(-)files/patch-modules_helptools_src_java_org_scilab_modules_helptools_FopConverter.java (+14 lines)
	1	--- modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java.orig 2014-04-11 09:51:59 UTC
	2	+++ modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
	3	@@ -43,10 +43,9 @@ public class FopConverter extends Contai
	4	String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
	5
	6	try {
	7	- FopFactory fopFactory = FopFactory.newInstance();
	8	+ FopFactory fopFactory = FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
	9	fopFactory.addElementMapping(new JLaTeXMathElementMapping());
	10	fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
	11	- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
	12
	13	// Step 3: Construct fop with desired output format
	14	OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));

Line 0 Link Here

(-)files/patch-modules_scinotes_src_java_org_scilab_modules_scinotes_utils_CodeExporter.java (+16 lines)
	1	--- modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java.orig 2014-04-11 09:52:10 UTC
	2	+++ modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
	3	@@ -114,11 +114,11 @@ public class CodeExporter extends FOCode
	4	* @param format the page format
	5	*/
	6	public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
	7	- FopFactory fopFactory = FopFactory.newInstance();
	8	+ FopFactory fopFactory;
	9	OutputStream out = null;
	10
	11	try {
	12	- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
	13	+ fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
	14	FOUserAgent userAgent = fopFactory.newFOUserAgent();
	15	userAgent.setProducer(CREATOR);
	16	userAgent.setTitle(title);