The following commit has been merged in the build branch: commit 84ae4499a00c229cd37aaffddd501677ff5f78d4 Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Fri Dec 16 15:42:31 2011 +0100
Update patches. diff --git a/debian/patches/patch/jlatexmath.diff b/debian/patches/patch/jlatexmath.diff new file mode 100644 index 0000000..d10df64 --- /dev/null +++ b/debian/patches/patch/jlatexmath.diff @@ -0,0 +1,36 @@ +From: Giovanni Mascellani <g...@debian.org> +Subject: [PATCH] patch/jlatexmath + +Fix some calls to JLaTeXMath, that fail because of a slightly +different API (there are some floats intead of ints). + +Signed-off-by: Giovanni Mascellani <g...@debian.org> + +--- + geogebra/euclidian/DrawEquation.java | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/geogebra/euclidian/DrawEquation.java b/geogebra/euclidian/DrawEquation.java +index 408a554..93b559a 100644 +--- a/geogebra/euclidian/DrawEquation.java ++++ b/geogebra/euclidian/DrawEquation.java +@@ -127,7 +127,7 @@ public class DrawEquation { + formula = TeXFormula.getPartialTeXFormula(text); + icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style, fgColor); + +- formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15, TeXConstants.UNIT_CM, 4f, TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f); ++ formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15f, TeXConstants.UNIT_CM, 4f, TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f); + + //Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2); + //return new Dimension(rec.width, rec.height); +@@ -137,7 +137,7 @@ public class DrawEquation { + // Write error message to Graphics View + + formula = TeXFormula.getPartialTeXFormula(text); +- icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style, fgColor); ++ icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3f, style, fgColor); + + //Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2); + //return new Dimension(rec.width, rec.height); +-- +tg: (feb5468..) patch/jlatexmath (depends on: master) diff --git a/debian/patches/series b/debian/patches/series index e3ff3e8..d0fe6bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ patch/ScientificFormat.java.diff -p1 patch/applet_export.diff -p1 patch/no_mac.diff -p1 patch/version.diff -p1 +patch/jlatexmath.diff -p1 -- GeoGebra: Dynamic mathematics software for education _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits