ports/144391: [PATCH] math/scilab: Update to 5.2.1
Rob Farmer
rfarmer at predatorlabs.net
Mon Mar 1 17:50:03 UTC 2010
>Number: 144391
>Category: ports
>Synopsis: [PATCH] math/scilab: Update to 5.2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 01 17:50:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Rob Farmer
>Release: 9.0-CURRENT
>Organization:
>Environment:
FreeBSD coretwo.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r204411: Sat Feb 27 06:56:17 PST 2010 rfarmer at coretwo.predatorlabs.net:/usr/obj/usr/src/sys/CORETWO amd64
>Description:
Update to 5.2.1
Changelog: http://www.scilab.org/content/download/1136/11155/file/changes5.2-5.2.1.pdf
FreeBSD changes:
* Remove the local patch to work with jgraphx (included upstream)
* Fix the library version number in the matio dependency
* Add a patch to compile properly with hdf-java (obtained from Debian)
* Move saxon dependency into GUI section to allow builds without Java (by Chris Rees <utisoft at gmail.com>)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/scilab/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile 25 Feb 2010 02:09:16 -0000 1.61
+++ Makefile 1 Mar 2010 17:22:37 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= scilab
-PORTVERSION= 5.2.0
+PORTVERSION= 5.2.1
CATEGORIES= math cad parallel java
MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/
EXTRACT_SUFX= -src.tar.gz
@@ -20,10 +20,6 @@
pcre.0:${PORTSDIR}/devel/pcre \
readline.6:${PORTSDIR}/devel/readline
-BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/examples/saxon/data/books.dtd:${PORTSDIR}/textproc/saxon \
- xsltproc:${PORTSDIR}/textproc/libxslt
-
MAKE_JOBS_UNSAFE= yes
USE_FORTRAN= yes
@@ -31,14 +27,13 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --without-ocaml \
- --with-docbook=${LOCALBASE}/share/xsl/docbook
+CONFIGURE_ARGS= --without-ocaml
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= ATLAS "Use Atlas instead of Blas" OFF \
FFTW "Use FFTW" ON \
- GUI "Build GUI (requires Java)" ON \
+ GUI "Build GUI (requires Java and required for docs)" ON \
HDF5 "Use HDF5 (requires GUI)" OFF \
NLS "Build localization" OFF \
MATIO "Matlab compatibility" OFF \
@@ -62,6 +57,7 @@
CONFIGURE_ARGS+= --disable-build-localization
PLIST_SUB+= NLS="@comment "
.else
+CONFIGURE_ARGS+= --enable-build-localization
PLIST_SUB+= NLS=""
.endif
@@ -83,6 +79,7 @@
--disable-build-help
PLIST_SUB+= GUI="@comment "
PLIST_SUB+= NOGUI=""
+NOPORTDOCS= YES
.else
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant \
${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
@@ -101,7 +98,10 @@
${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
- swig:${PORTSDIR}/devel/swig13
+ ${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
+ xsltproc:${PORTSDIR}/textproc/libxslt \
+ swig:${PORTSDIR}/devel/swig13 \
+ ${LOCALBASE}/share/examples/saxon/data/books.dtd:${PORTSDIR}/textproc/saxon
RUN_DEPENDS+= ${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
@@ -118,7 +118,9 @@
${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
- ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework
+ ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
+ ${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
+ xsltproc:${PORTSDIR}/textproc/libxslt
USE_JAVA= yes
JAVA_VERSION= 1.5+
@@ -126,7 +128,8 @@
JAVA_RUN= yes
USE_XORG= x11
-CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME}
+CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME} \
+ --with-docbook=${LOCALBASE}/share/xsl/docbook
DESKTOP_ENTRIES= "SciLab" "A free Matlab clone by INRIA & ENPC" \
"${DATADIR}/icons/scilab.xpm" "scilab" \
@@ -174,7 +177,7 @@
CONFIGURE_ARGS+= --without-matio
PLIST_SUB+= MATIO="@comment "
.else
-LIB_DEPENDS+= matio.0:${PORTSDIR}/math/matio
+LIB_DEPENDS+= matio.1:${PORTSDIR}/math/matio
PLIST_SUB+= MATIO=""
.endif
@@ -205,7 +208,7 @@
${REINPLACE_CMD} -e 's|$$FFLAGS -DNDEBUG|$$FFLAGS -DNDEBUG -fPIC|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
- ${REINPLACE_CMD} -e 1715d ${WRKSRC}/Makefile.in
+ ${REINPLACE_CMD} -e 1730d ${WRKSRC}/Makefile.in
@# malloc.h -> stdlib.h conversions
@${GREP} -lr "<malloc.h>" ${WRKSRC} \
| ${XARGS} ${REINPLACE_CMD} -e \
@@ -214,7 +217,7 @@
${MV} ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/
${REINPLACE_CMD} -e 's|My Project|My_Project|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj
- ${REINPLACE_CMD} -e 317d ${WRKSRC}/contrib/Makefile.in
+ ${REINPLACE_CMD} -e 319d ${WRKSRC}/contrib/Makefile.in
${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/math/scilab/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 25 Feb 2010 02:09:16 -0000 1.14
+++ distinfo 1 Mar 2010 03:18:33 -0000
@@ -1,3 +1,3 @@
-MD5 (scilab-5.2.0-src.tar.gz) = d751abfd5f1a2f7a69bffa4d421dd666
-SHA256 (scilab-5.2.0-src.tar.gz) = 3412d4343cd3ca6ba0b03b28fec66a00f643d4d73f13dc28c0f6596ccb9f386a
-SIZE (scilab-5.2.0-src.tar.gz) = 54656677
+MD5 (scilab-5.2.1-src.tar.gz) = 47beab7be09516d89167e9a67a3be856
+SHA256 (scilab-5.2.1-src.tar.gz) = f85aa3b7fde0e523f7f0159613da7cca7bd2d125860b50fa2ed00394c97075e0
+SIZE (scilab-5.2.1-src.tar.gz) = 54855137
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/math/scilab/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist 25 Feb 2010 02:09:16 -0000 1.15
+++ pkg-plist 1 Mar 2010 16:59:49 -0000
@@ -56,6 +56,7 @@
include/scilab/hashtable.h
include/scilab/hashtable_itr.h
include/scilab/hashtable_utility.h
+include/scilab/libinter.h
include/scilab/localization.h
include/scilab/machine.h
include/scilab/mex.h
@@ -319,7 +320,6 @@
%%HDF5%%lib/scilab/libscihdf5-forceload.so
%%HDF5%%lib/scilab/libscihdf5-forceload.so.5
libdata/pkgconfig/scilab.pc
-%%GUI%%share/applications/scilab.desktop
%%NLS%%share/locale/ca_ES/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/de_DE/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/en_US/LC_MESSAGES/scilab.mo
@@ -329,6 +329,7 @@
%%NLS%%share/locale/ja_JP/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/scilab.mo
+%%NLS%%share/locale/uk_UA/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/scilab.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/scilab.mo
%%DATADIR%%/ACKNOWLEDGEMENTS
@@ -616,6 +617,8 @@
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetInstalledVers.sci
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetMRVersion.bin
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetMRVersion.sci
+%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetPlatform.bin
+%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetPlatform.sci
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetTOOLBOXES.bin
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetTOOLBOXES.sci
%%DATADIR%%/modules/atoms/macros/atoms_internals/atomsGetVersions.bin
@@ -725,6 +728,7 @@
%%DATADIR%%/modules/atoms/tests/unit_tests/atomsVersionSort.tst
%%DATADIR%%/modules/atoms/tests/unit_tests/scene1.test.atoms.scilab.org.txt
%%DATADIR%%/modules/atoms/tests/unit_tests/scene2.test.atoms.scilab.org.txt
+%%DATADIR%%/modules/atoms/tests/unit_tests/toolbox_7_1.0-1.bin.zip
%%DATADIR%%/modules/atoms/version.xml
%%DATADIR%%/modules/boolean/changelog.txt
%%DATADIR%%/modules/boolean/etc/boolean.quit
@@ -1796,6 +1800,7 @@
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_1962.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_1985.dia.ref
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_1985.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_2030.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_2039.dia.ref
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_2039.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_2072.dia.ref
@@ -1922,6 +1927,12 @@
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_566.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_604.dia.ref
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_604.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6461.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6461.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6521.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6521.tst
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6586.dia.ref
+%%DATADIR%%/modules/core/tests/nonreg_tests/bug_6586.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_71.dia.ref
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_71.tst
%%DATADIR%%/modules/core/tests/nonreg_tests/bug_743.dia.ref
@@ -3032,6 +3043,8 @@
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_4460.tst
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_4810.dia.ref
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_4810.tst
+%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_5722.dia.ref
+%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_5722.tst
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_575.dia.ref
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_575.tst
%%DATADIR%%/modules/elementary_functions/tests/nonreg_tests/bug_584.dia.ref
@@ -3139,12 +3152,16 @@
%%DATADIR%%/modules/elementary_functions/tests/unit_tests/tand.dia.ref
%%DATADIR%%/modules/elementary_functions/tests/unit_tests/tand.tst
%%DATADIR%%/modules/elementary_functions/version.xml
+%%FFTW%%%%DATADIR%%/modules/fftw/changelog.txt
%%DATADIR%%/modules/fftw/etc/fftw.quit
%%DATADIR%%/modules/fftw/etc/fftw.start
%%DATADIR%%/modules/fftw/help/en_US/addchapter.sce
%%DATADIR%%/modules/fftw/help/fr_FR/addchapter.sce
%%DATADIR%%/modules/fftw/help/pt_BR/addchapter.sce
+%%FFTW%%%%DATADIR%%/modules/fftw/license.txt
%%DATADIR%%/modules/fftw/macros/buildmacros.sce
+%%FFTW%%%%DATADIR%%/modules/fftw/readme.txt
+%%FFTW%%%%DATADIR%%/modules/fftw/sci_gateway/fftw_gateway.xml
%%DATADIR%%/modules/fftw/tests/benchmarks/bench_fft.tst
%%DATADIR%%/modules/fftw/tests/nonreg_tests/bug_5081.dia.ref
%%DATADIR%%/modules/fftw/tests/nonreg_tests/bug_5081.tst
@@ -3154,6 +3171,7 @@
%%DATADIR%%/modules/fftw/tests/unit_tests/fftw_flag.tst
%%DATADIR%%/modules/fftw/tests/unit_tests/setget_fftw_wisdom.dia.ref
%%DATADIR%%/modules/fftw/tests/unit_tests/setget_fftw_wisdom.tst
+%%FFTW%%%%DATADIR%%/modules/fftw/version.xml
%%DATADIR%%/modules/fileio/changelog.txt
%%DATADIR%%/modules/fileio/etc/fileio.quit
%%DATADIR%%/modules/fileio/etc/fileio.start
@@ -3340,6 +3358,8 @@
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_4917.dia.ref
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_4917.tst
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_4918.tst
+%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_6437.dia.ref
+%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_6437.tst
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_654.dia.ref
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_654.tst
%%DATADIR%%/modules/fileio/tests/nonreg_tests/bug_656.dia.ref
@@ -3721,6 +3741,7 @@
%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_4812.tst
%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref
%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_4944.tst
+%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_5436.tst
%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_685.dia.ref
%%DATADIR%%/modules/graphic_export/tests/nonreg_tests/bug_685.tst
%%DATADIR%%/modules/graphic_export/tests/unit_tests/bmp_non_empty_file.dia.ref
@@ -4653,6 +4674,8 @@
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_487.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_4964.dia.ref
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_4964.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_4979.dia.ref
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_4979.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_502.dia.ref
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_502.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_5148.dia.ref
@@ -4662,9 +4685,12 @@
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_5637.dia.ref
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_5637.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_569.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_5702.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_612.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_625.dia.ref
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_625.tst
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6420.dia.ref
+%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_6420.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_711.dia.ref
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_711.tst
%%DATADIR%%/modules/graphics/tests/nonreg_tests/bug_805.dia.ref
@@ -4915,6 +4941,8 @@
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4347.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4426.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4486.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4543.dia.ref
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4543.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4564.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4607.dia.ref
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4607.tst
@@ -4924,10 +4952,15 @@
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_4983.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_56.dia.ref
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_56.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_5687.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_5695.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_595.dia.ref
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_595.tst
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_596.dia.ref
%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_596.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6436.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6441.tst
+%%DATADIR%%/modules/gui/tests/nonreg_tests/bug_6547.tst
%%DATADIR%%/modules/gui/tests/unit_tests/addmenu.dia.ref
%%DATADIR%%/modules/gui/tests/unit_tests/addmenu.tst
%%DATADIR%%/modules/gui/tests/unit_tests/checkbox.dia.ref
@@ -4981,6 +5014,7 @@
%%DATADIR%%/modules/hdf5/etc/hdf5.start
%%DATADIR%%/modules/hdf5/license.txt
%%DATADIR%%/modules/hdf5/macros/buildmacros.sce
+%%HDF5%%%%DATADIR%%/modules/hdf5/jar/org.scilab.modules.hdf5.jar
%%DATADIR%%/modules/hdf5/readme.txt
%%DATADIR%%/modules/hdf5/sci_gateway/hdf5_gateway.xml
%%DATADIR%%/modules/hdf5/tests/unit_tests/testScilabBoolean.java
@@ -4989,7 +5023,6 @@
%%DATADIR%%/modules/hdf5/tests/unit_tests/testScilabList.java
%%DATADIR%%/modules/hdf5/tests/unit_tests/testScilabString.java
%%DATADIR%%/modules/hdf5/version.xml
-%%HDF5%%%%DATADIR%%/modules/hdf5/jar/org.scilab.modules.hdf5.jar
%%DATADIR%%/modules/helptools/bin/man2sci
%%DATADIR%%/modules/helptools/bin/manrev2sci
%%DATADIR%%/modules/helptools/bin/scivalid
@@ -5127,6 +5160,9 @@
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_4938.tst
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5330.dia.ref
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5330.tst
+%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5413.dia.ref
+%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5413.sci
+%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5413.tst
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5487.dia.ref
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5487.sci
%%DATADIR%%/modules/helptools/tests/nonreg_tests/bug_5487.tst
@@ -5483,6 +5519,8 @@
%%DATADIR%%/modules/io/tests/nonreg_tests/bug_5586.dia.ref
%%DATADIR%%/modules/io/tests/nonreg_tests/bug_5586.tst
%%DATADIR%%/modules/io/tests/nonreg_tests/bug_576.tst
+%%DATADIR%%/modules/io/tests/nonreg_tests/bug_6399.dia.ref
+%%DATADIR%%/modules/io/tests/nonreg_tests/bug_6399.tst
%%DATADIR%%/modules/io/tests/unit_tests/getenv.dia.ref
%%DATADIR%%/modules/io/tests/unit_tests/getenv.tst
%%DATADIR%%/modules/io/tests/unit_tests/saveload.dia.ref
@@ -5577,6 +5615,9 @@
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_3673.tst
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_3909.tst
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_4547.tst
+%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_6388.dia.ref
+%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_6388.java
+%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/bug_6388.tst
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/java.sci
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/javac.sci
%%GUI%%%%DATADIR%%/modules/javasci/tests/nonreg_tests/test_java.sci
@@ -6798,17 +6839,17 @@
%%DATADIR%%/modules/matio/help/fr_FR/addchapter.sce
%%DATADIR%%/modules/matio/help/pt_BR/addchapter.sce
%%DATADIR%%/modules/matio/license.txt
+%%MATIO%%%%DATADIR%%/modules/matio/macros/ReadmiMatrix.bin
%%DATADIR%%/modules/matio/macros/ReadmiMatrix.sci
+%%MATIO%%%%DATADIR%%/modules/matio/macros/WritemiMatrix.bin
%%DATADIR%%/modules/matio/macros/WritemiMatrix.sci
%%DATADIR%%/modules/matio/macros/buildmacros.sce
-%%DATADIR%%/modules/matio/macros/loadmatfile.sci
-%%DATADIR%%/modules/matio/macros/savematfile.sci
-%%MATIO%%%%DATADIR%%/modules/matio/macros/savematfile.bin
-%%MATIO%%%%DATADIR%%/modules/matio/macros/loadmatfile.bin
-%%MATIO%%%%DATADIR%%/modules/matio/macros/WritemiMatrix.bin
-%%MATIO%%%%DATADIR%%/modules/matio/macros/ReadmiMatrix.bin
%%MATIO%%%%DATADIR%%/modules/matio/macros/lib
+%%MATIO%%%%DATADIR%%/modules/matio/macros/loadmatfile.bin
+%%DATADIR%%/modules/matio/macros/loadmatfile.sci
%%MATIO%%%%DATADIR%%/modules/matio/macros/names
+%%MATIO%%%%DATADIR%%/modules/matio/macros/savematfile.bin
+%%DATADIR%%/modules/matio/macros/savematfile.sci
%%DATADIR%%/modules/matio/readme.txt
%%DATADIR%%/modules/matio/sci_gateway/matio_gateway.xml
%%DATADIR%%/modules/matio/tests/nonreg_tests/bug_2731.dia.ref
@@ -9049,6 +9090,8 @@
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_201.tst
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_205.dia.ref
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_205.tst
+%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_2177.dia.ref
+%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_2177.tst
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_2264.dia.ref
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_2264.tst
%%DATADIR%%/modules/polynomials/tests/nonreg_tests/bug_2391.dia.ref
@@ -9136,6 +9179,7 @@
%%DATADIR%%/modules/renderer/readme.txt
%%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_4055.dia.ref
%%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_4055.tst
+%%DATADIR%%/modules/renderer/tests/nonreg_tests/bug_6558.tst
%%DATADIR%%/modules/renderer/version.xml
%%GUI%%%%DATADIR%%/modules/scicos/changelog.txt
%%DATADIR%%/modules/scicos/demos/Bouncing_ball.cosf
@@ -12055,6 +12099,10 @@
%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_4654.tst
%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_490.dia.ref
%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_490.tst
+%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_6401.dia.ref
+%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_6401.tst
+%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_6412.dia.ref
+%%DATADIR%%/modules/sparse/tests/nonreg_tests/bug_6412.tst
%%DATADIR%%/modules/sparse/tests/unit_tests/lsparse.dia.ref
%%DATADIR%%/modules/sparse/tests/unit_tests/lsparse.tst
%%DATADIR%%/modules/sparse/tests/unit_tests/pcg.dia.ref
@@ -12512,6 +12560,8 @@
%%DATADIR%%/modules/string/tests/nonreg_tests/bug_5375.tst
%%DATADIR%%/modules/string/tests/nonreg_tests/bug_55.dia.ref
%%DATADIR%%/modules/string/tests/nonreg_tests/bug_55.tst
+%%DATADIR%%/modules/string/tests/nonreg_tests/bug_5659.dia.ref
+%%DATADIR%%/modules/string/tests/nonreg_tests/bug_5659.tst
%%DATADIR%%/modules/string/tests/unit_tests/ascii.dia.ref
%%DATADIR%%/modules/string/tests/unit_tests/ascii.tst
%%DATADIR%%/modules/string/tests/unit_tests/base.dia.ref
@@ -12841,6 +12891,7 @@
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_4149.tst
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_488.tst
+%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_5035.tst
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_539.tst
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_5456.dia.ref
%%DATADIR%%/modules/tclsci/tests/nonreg_tests/bug_5456.tst
@@ -12955,6 +13006,8 @@
%%DATADIR%%/modules/time/tests/nonreg_tests/bug_2786.tst
%%DATADIR%%/modules/time/tests/nonreg_tests/bug_4663.dia.ref
%%DATADIR%%/modules/time/tests/nonreg_tests/bug_4663.tst
+%%DATADIR%%/modules/time/tests/nonreg_tests/bug_6400.dia.ref
+%%DATADIR%%/modules/time/tests/nonreg_tests/bug_6400.tst
%%DATADIR%%/modules/time/tests/nonreg_tests/bug_793.dia.ref
%%DATADIR%%/modules/time/tests/nonreg_tests/bug_793.tst
%%DATADIR%%/modules/time/tests/unit_tests/calendar.dia.ref
@@ -13052,6 +13105,9 @@
%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_4702.dia.ref
%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_4702.tst
%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_5155.tst
+%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_6387.tst
+%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_6489.dia.ref
+%%DATADIR%%/modules/windows_tools/tests/nonreg_tests/bug_6489.tst
%%DATADIR%%/modules/windows_tools/tests/unit_tests/createGUID.dia.ref
%%DATADIR%%/modules/windows_tools/tests/unit_tests/createGUID.tst
%%DATADIR%%/modules/windows_tools/tests/unit_tests/findfileassociation.dia.ref
@@ -13453,6 +13509,7 @@
%%DATADIR%%/modules/xcos/images/palettes/freq_div.jpg
%%DATADIR%%/modules/xcos/images/palettes/generic_block3.jpg
%%DATADIR%%/modules/xcos/images/palettes/scifunc_block_m.jpg
+%%GUI%%%%DATADIR%%/modules/xcos/jar/org.scilab.modules.xcos.jar
%%DATADIR%%/modules/xcos/license.txt
%%GUI%%%%DATADIR%%/modules/xcos/macros/%diagram_xcos.bin
%%DATADIR%%/modules/xcos/macros/%diagram_xcos.sci
@@ -13463,6 +13520,10 @@
%%DATADIR%%/modules/xcos/macros/errorDiagramPath.sci
%%GUI%%%%DATADIR%%/modules/xcos/macros/generateBlockImages.bin
%%DATADIR%%/modules/xcos/macros/generateBlockImages.sci
+%%GUI%%%%DATADIR%%/modules/xcos/macros/getDiagramVersion.bin
+%%DATADIR%%/modules/xcos/macros/getDiagramVersion.sci
+%%GUI%%%%DATADIR%%/modules/xcos/macros/importScicosDiagram.bin
+%%DATADIR%%/modules/xcos/macros/importScicosDiagram.sci
%%GUI%%%%DATADIR%%/modules/xcos/macros/importScicosPal.bin
%%DATADIR%%/modules/xcos/macros/importScicosPal.sci
%%GUI%%%%DATADIR%%/modules/xcos/macros/importXcosDiagram.bin
@@ -13517,11 +13578,22 @@
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5403.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5403.xcos
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5405.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5411.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5412.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5416.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5441.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5444.tst
%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5444.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5508.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5701.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_5701.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6386.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6386.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6474.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6517.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6517.xcos
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6578.tst
+%%DATADIR%%/modules/xcos/tests/nonreg_tests/bug_6578.xcos
%%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.err.ref
%%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.log.ref
%%DATADIR%%/modules/xcos/tests/nonreg_tests/constant.unix.out.ref
@@ -13774,7 +13846,6 @@
%%DATADIR%%/modules/xcos/tests/unit_tests/xcos.tst
%%DATADIR%%/modules/xcos/tests/unit_tests/xcos_tests.sci
%%DATADIR%%/modules/xcos/version.xml
-%%HDF5%%%%DATADIR%%/modules/xcos/jar/org.scilab.modules.xcos.jar
%%DATADIR%%/modules/xpad/changelog.txt
%%DATADIR%%/modules/xpad/etc/xpad.quit
%%DATADIR%%/modules/xpad/etc/xpad.start
@@ -13872,16 +13943,12 @@
%%DATADIR%%/modules/xpad/tests/nonreg_tests/bug_5516.tst
%%DATADIR%%/modules/xpad/tests/nonreg_tests/bug_5519.tst
%%DATADIR%%/modules/xpad/tests/nonreg_tests/bug_5532.tst
+%%DATADIR%%/modules/xpad/tests/nonreg_tests/bug_5707.tst
%%DATADIR%%/modules/xpad/tests/nonreg_tests/xpad_indent_test.sci
%%DATADIR%%/modules/xpad/tests/nonreg_tests/xpad_linux_eol.sci
%%DATADIR%%/modules/xpad/tests/nonreg_tests/xpad_macosx_eol.sci
%%DATADIR%%/modules/xpad/version.xml
%%DATADIR%%/tools/profiling/valgrind.supp
-%%FFTW%%%%DATADIR%%/modules/fftw/readme.txt
-%%FFTW%%%%DATADIR%%/modules/fftw/license.txt
-%%FFTW%%%%DATADIR%%/modules/fftw/version.xml
-%%FFTW%%%%DATADIR%%/modules/fftw/changelog.txt
-%%FFTW%%%%DATADIR%%/modules/fftw/sci_gateway/fftw_gateway.xml
@dirrm %%DATADIR%%/tools/profiling
@dirrm %%DATADIR%%/tools
@dirrm %%DATADIR%%/modules/xpad/tests/nonreg_tests
@@ -13902,6 +13969,7 @@
@dirrm %%DATADIR%%/modules/xcos/tests
@dirrm %%DATADIR%%/modules/xcos/sci_gateway
@dirrm %%DATADIR%%/modules/xcos/macros
+%%GUI%%@dirrm %%DATADIR%%/modules/xcos/jar
@dirrm %%DATADIR%%/modules/xcos/images/palettes
@dirrm %%DATADIR%%/modules/xcos/images/icons
@dirrm %%DATADIR%%/modules/xcos/images/blocks
@@ -13915,7 +13983,6 @@
@dirrm %%DATADIR%%/modules/xcos/demos/Electrical
@dirrm %%DATADIR%%/modules/xcos/demos/CodeGen
@dirrm %%DATADIR%%/modules/xcos/demos
-%%HDF5%%@dirrm %%DATADIR%%/modules/xcos/jar
@dirrm %%DATADIR%%/modules/xcos
@dirrm %%DATADIR%%/modules/windows_tools/tests/unit_tests
@dirrm %%DATADIR%%/modules/windows_tools/tests/nonreg_tests
@@ -14166,6 +14233,7 @@
@dirrm %%DATADIR%%/modules/randlib
@dirrm %%DATADIR%%/modules/pvm/tests/unit_tests
@dirrm %%DATADIR%%/modules/pvm/tests
+%%PVM%%@dirrm %%DATADIR%%/modules/pvm/sci_gateway
@dirrm %%DATADIR%%/modules/pvm/macros
@dirrm %%DATADIR%%/modules/pvm/help/pt_BR
@dirrm %%DATADIR%%/modules/pvm/help/fr_FR
@@ -14173,7 +14241,6 @@
@dirrm %%DATADIR%%/modules/pvm/help
@dirrm %%DATADIR%%/modules/pvm/etc
@dirrm %%DATADIR%%/modules/pvm/demos
-%%PVM%%@dirrm %%DATADIR%%/modules/pvm/sci_gateway
@dirrm %%DATADIR%%/modules/pvm
@dirrm %%DATADIR%%/modules/polynomials/tests/unit_tests
@dirrm %%DATADIR%%/modules/polynomials/tests/nonreg_tests
@@ -14559,13 +14626,13 @@
@dirrm %%DATADIR%%/modules/fftw/tests/nonreg_tests
@dirrm %%DATADIR%%/modules/fftw/tests/benchmarks
@dirrm %%DATADIR%%/modules/fftw/tests
+%%FFTW%%@dirrm %%DATADIR%%/modules/fftw/sci_gateway
@dirrm %%DATADIR%%/modules/fftw/macros
@dirrm %%DATADIR%%/modules/fftw/help/pt_BR
@dirrm %%DATADIR%%/modules/fftw/help/fr_FR
@dirrm %%DATADIR%%/modules/fftw/help/en_US
@dirrm %%DATADIR%%/modules/fftw/help
@dirrm %%DATADIR%%/modules/fftw/etc
-%%FFTW%%@dirrm %%DATADIR%%/modules/fftw/sci_gateway
@dirrm %%DATADIR%%/modules/fftw
@dirrm %%DATADIR%%/modules/elementary_functions/tests/unit_tests
@dirrm %%DATADIR%%/modules/elementary_functions/tests/nonreg_tests
@@ -14864,6 +14931,7 @@
%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk_UA/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ca_ES
@@ -14873,6 +14941,7 @@
%%NLS%%@dirrmtry share/locale/ja_JP
%%NLS%%@dirrmtry share/locale/pt_BR
%%NLS%%@dirrmtry share/locale/ru_RU
+%%NLS%%@dirrmtry share/locale/uk_UA
%%NLS%%@dirrmtry share/locale/zh_CN
%%NLS%%@dirrmtry share/locale/zh_TW
@exec mkdir -p %D/%%DATADIR%%/modules/malloc/macros
Index: files/patch-debian-jgraphx
===================================================================
RCS file: files/patch-debian-jgraphx
diff -N files/patch-debian-jgraphx
--- files/patch-debian-jgraphx 25 Feb 2010 02:09:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,328 +0,0 @@
---- modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:43:29.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:44:22.000000000 +0100
-@@ -75,7 +75,7 @@
- public void invoke(Object source, mxEventObject evt) {
-
- if (!redoInAction) {
-- undoManager.undoableEditHappened((mxUndoableEdit) evt.getArgAt(0));
-+ undoManager.undoableEditHappened((mxUndoableEdit) evt.getProperty("edit"));
- incrementUndoCounter();
- }
- }
-@@ -86,7 +86,7 @@
- */
- mxIEventListener selectionHandler = new mxIEventListener() {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
-+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
- setSelectionCells(getSelectionCellsForChanges(changes));
- }
- };
-@@ -209,10 +209,12 @@
- * com.mxgraph.util.mxUndoManager
- */
- public void redo() {
-+ if (!redoInAction) {
- incrementUndoCounter();
- redoInAction = true;
- undoManager.redo();
- redoInAction = false;
-+ }
- }
-
- /**
---- modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:10.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:42.000000000 +0100
-@@ -63,11 +63,15 @@
- if (allCells[i] instanceof BasicBlock) {
- //((BasicBlock) allCells[i])
- mxCellState state = getGraph(null).getView().getState(allCells[i]);
-- Hashtable<String, Object> style = (state != null) ? state.getStyle() : getGraph(null).getCellStyle(allCells[i]);
--
-+ Map<String, Object> style;
-+ if (state != null) {
-+ style = state.getStyle();
-+ } else {
-+ style = getGraph(null).getCellStyle(allCells[i]);
-+ }
- if (style != null)
- {
-- String value = (mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false)) ? "0" : "1";
-+ String value = Boolean.toString(mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false));
- getGraph(null).setCellStyles(mxConstants.STYLE_SHADOW, value, new Object[] { allCells[i] });
- }
- }
---- modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:55:52.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:57:58.000000000 +0100
-@@ -17,7 +17,7 @@
- public class XcosCanvas extends mxInteractiveCanvas{
-
- public Object drawVertex(int x, int y, int w, int h,
-- Hashtable<String, Object> style) {
-+ Map<String, Object> style) {
-
- if (g != null)
- {
-@@ -90,7 +90,7 @@
- start = (int) Math.round(start * scale);
-
- // Removes some styles to draw the content area
-- Hashtable<String, Object> cloned = new Hashtable<String, Object>(
-+ Map<String, Object> cloned = new Hashtable<String, Object>(
- style);
- cloned.remove(mxConstants.STYLE_FILLCOLOR);
- cloned.remove(mxConstants.STYLE_ROUNDED);
---- modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2010-01-22 16:45:37.000000000 +0100
-@@ -562,7 +562,7 @@
- */
- if (getParentDiagram() instanceof SuperBlockDiagram) {
- SuperBlock parentBlock = ((SuperBlockDiagram) getParentDiagram()).getContainer();
-- parentBlock.getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED,new mxEventObject(new Object[] { parentBlock }));
-+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", parentBlock));
- }
-
- }
-@@ -606,7 +606,7 @@
- // Now read new Block
- BasicBlock modifiedBlock = BlockReader.readBlockFromFile(tempInput.getAbsolutePath());
- updateBlockSettings(modifiedBlock);
-- getParentDiagram().fireEvent(XcosEvent.ADD_PORTS, new mxEventObject(new Object[] {currentBlock}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.ADD_PORTS, "block", currentBlock));
- setLocked(false);
- }
- };
---- modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2010-01-22 16:47:03.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2010-01-22 16:47:19.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2010-01-22 16:48:57.000000000 +0100
-@@ -50,7 +50,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2010-01-22 16:49:18.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2010-01-22 16:49:36.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2010-01-22 16:49:52.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
---- modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2010-01-22 16:46:14.000000000 +0100
-@@ -386,7 +386,7 @@
- updateExportedExplicitOutputPort();
- updateExportedImplicitOutputPort();
- updateExportedEventOutputPort();
-- getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED, new mxEventObject(new Object[] {this}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", this));
- }
-
-
---- modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 22:49:59.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 23:32:57.000000000 +0100
-@@ -7,6 +7,7 @@
- import java.awt.Stroke;
- import java.awt.geom.AffineTransform;
- import java.util.Hashtable;
-+import java.util.Map;
-
- import com.mxgraph.swing.view.mxInteractiveCanvas;
- import com.mxgraph.util.mxConstants;
---- modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2010-01-24 00:01:43.000000000 +0100
-@@ -187,8 +187,9 @@
- selectedEntry.setOpaque(true);
- }
-
-- eventSource.fireEvent(mxEvent.SELECT, new mxEventObject(new Object[] {
-- selectedEntry, t, last }));
-+
-+ eventSource.fireEvent(new mxEventObject(mxEvent.SELECT, "entry",
-+ selectedEntry, "transferable", t, "previous", last));
- }
-
-
---- modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 22:49:59.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 23:59:58.000000000 +0100
-@@ -13,6 +13,7 @@
- package org.scilab.modules.xcos.actions;
-
- import java.util.Hashtable;
-+import java.util.Map;
-
- import org.scilab.modules.graph.ScilabGraph;
- import org.scilab.modules.graph.actions.DefaultAction;
---- modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2009-12-16 08:25:20.000000000 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2010-01-23 23:57:56.000000000 +0100
-@@ -625,7 +625,7 @@
- public void invoke(Object source, mxEventObject evt) {
- getModel().beginUpdate();
- refresh();
-- BasicBlock updatedBlock = (BasicBlock) evt.getArgAt(0);
-+ BasicBlock updatedBlock = (BasicBlock) evt.getProperty("block");
- BlockPositioning.updateBlockView(updatedBlock);
- getModel().endUpdate();
- }
-@@ -639,7 +639,7 @@
- */
- private class ModelTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getArgAt(0);
-+ List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getProperty("changes");
- List<Object> objects = new ArrayList<Object>();
- getModel().beginUpdate();
- for (int i = 0; i < changes.size(); ++i) {
-@@ -660,7 +660,8 @@
- firedCells[j] = objects.get(j);
- }
- //fireEvent(XcosEvent.FORCE_CELL_RESHAPE, new mxEventObject(new Object[] {firedCells}));
-- fireEvent(XcosEvent.FORCE_CELL_VALUE_UPDATE, new mxEventObject(new Object[] {firedCells}));
-+ fireEvent(new mxEventObject(XcosEvent.FORCE_CELL_VALUE_UPDATE, "cells", firedCells));
-+
- }
- getModel().endUpdate();
- }
-@@ -671,7 +672,7 @@
- */
- private class ForceCellValueUpdate implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
-
- getModel().beginUpdate();
-
-@@ -704,7 +705,7 @@
- */
- private class ForceCellReshapeTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
- Object cell = cells[i];
-@@ -723,16 +724,15 @@
- */
- private class SuperBlockUpdateTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- assert evt.getArgs()[0] instanceof SuperBlock;
-- SuperBlock updatedBlock = (SuperBlock) evt.getArgs()[0];
-+ assert evt.getProperty("block") instanceof SuperBlock;
-+ SuperBlock updatedBlock = (SuperBlock) evt.getProperty("block");
- updatedBlock.setRealParameters(BlockWriter
- .convertDiagramToMList(updatedBlock.getChild()));
- if (updatedBlock.getParentDiagram() instanceof SuperBlockDiagram) {
- SuperBlock parentBlock = ((SuperBlockDiagram) updatedBlock
- .getParentDiagram()).getContainer();
-- parentBlock.getParentDiagram().fireEvent(
-- XcosEvent.SUPER_BLOCK_UPDATED,
-- new mxEventObject(new Object[] { parentBlock }));
-+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED,"block", parentBlock));
-+
- }
- BlockPositioning.updateBlockView(updatedBlock);
- refresh();
-@@ -751,7 +751,7 @@
- }
-
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
-
- diagram.getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
-@@ -782,7 +782,7 @@
- }
-
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- for (int i = 0; i < cells.length; i++) {
- if (cells[i] instanceof BasicLink) {
- BasicLink link = (BasicLink) cells[i];
-@@ -900,7 +900,7 @@
- */
- private class CellResizedTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
- if (cells[i] instanceof BasicBlock) {
-@@ -916,7 +916,7 @@
- */
- private class UndoUpdateTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
-+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
- Object[] changedCells = getSelectionCellsForChanges(changes);
- getModel().beginUpdate();
- for (Object object : changedCells) {
-@@ -1712,7 +1712,7 @@
- //getParentTab().setName((String) properties.get("title"));
-
- // Clear all undo events in Undo Manager
-- undoManager.reset();
-+ undoManager.clear();
- setModified(false);
- }
-
-@@ -2051,7 +2051,7 @@
- * This function will reset the UndoManager in a stable state.
- */
- public void resetUndoManager() {
-- undoManager.reset();
-+ undoManager.clear();
-
- resetUndoCounter();
-
Index: files/patch-modules-hdf5-src-java-org-scilab-modules-hdf5-read-H5Read.java
===================================================================
RCS file: files/patch-modules-hdf5-src-java-org-scilab-modules-hdf5-read-H5Read.java
diff -N files/patch-modules-hdf5-src-java-org-scilab-modules-hdf5-read-H5Read.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-modules-hdf5-src-java-org-scilab-modules-hdf5-read-H5Read.java 1 Mar 2010 08:13:11 -0000
@@ -0,0 +1,12 @@
+--- modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java.orig 2010-03-01 00:10:54.000000000 -0800
++++ modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java 2010-03-01 00:11:38.000000000 -0800
+@@ -53,7 +53,8 @@
+ int nb_objs = H5.H5Gn_members(fileId, groupName);
+ String[] allObjectsName = new String[nb_objs];
+ int[] allObjectsType = new int[nb_objs];
+- H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType);
++ long[] refs = new long[nb_objs];
++ H5.H5Gget_obj_info_all(fileId, groupName, allObjectsName, allObjectsType, refs);
+
+ for (int i = 0 ; i < nb_objs ; ++i) {
+ if (allObjectsType[i] == HDF5Constants.H5G_DATASET) {
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list