[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449
The following commit has been merged in the build branch:
commit e6c97840023d17976ca9779688e5090a89a88d20
Author: Giovanni Mascellani
Date: Fri Dec 16 14:55:56 2011 +0100
Update patches.
diff --git a/debian/patches/patch/no_mac.diff b/debian/patches/patch/no_mac.diff
index 51df825..75ae1ce 100644
--- a/debian/patches/patch/no_mac.diff
+++ b/debian/patches/patch/no_mac.diff
@@ -6,9 +6,31 @@ Removes Mac OS X specific code.
Signed-off-by: Giovanni Mascellani
---
+ geogebra/gui/app/GeoGebraFrame.java | 10 ---
geogebra/gui/app/MacApplicationListener.java | 101 --
- 1 files changed, 0 insertions(+), 101 deletions(-)
+ 2 files changed, 0 insertions(+), 111 deletions(-)
+diff --git a/geogebra/gui/app/GeoGebraFrame.java
b/geogebra/gui/app/GeoGebraFrame.java
+index bafbee0..4ee3b7a 100644
+--- a/geogebra/gui/app/GeoGebraFrame.java
b/geogebra/gui/app/GeoGebraFrame.java
+@@ -255,16 +255,6 @@ public class GeoGebraFrame extends JFrame implements
WindowFocusListener {
+* MacOS X specific initing. Note: this method can only be run on a Mac!
+*/
+ public static void initMacSpecifics() {
+- try {
+- // init mac application listener
+- MacApplicationListener.initMacApplicationListener();
+-
+- // mac menu bar
+- //
System.setProperty("com.apple.macos.useScreenMenuBar", "true");
+- System.setProperty("apple.laf.useScreenMenuBar",
"true");
+- } catch (Exception e) {
+- Application.debug(e + "");
+- }
+ }
+
+ public static synchronized GeoGebraFrame createNewWindow(
diff --git a/geogebra/gui/app/MacApplicationListener.java
b/geogebra/gui/app/MacApplicationListener.java
deleted file mode 100644
index 0c53155..000
--
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
[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449
The following commit has been merged in the build branch:
commit 84ae4499a00c229cd37aaffddd501677ff5f78d4
Author: Giovanni Mascellani
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 000..d10df64
--- /dev/null
+++ b/debian/patches/patch/jlatexmath.diff
@@ -0,0 +1,36 @@
+From: Giovanni Mascellani
+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
+
+---
+ 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
[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449
The following commit has been merged in the build branch: commit cbfa376a54bc9a9a14b3c386efe4f4850391640e Merge: e6c97840023d17976ca9779688e5090a89a88d20 966f67b6ac92912af9cfdbf29692e1d5b62001bc Author: Giovanni Mascellani Date: Fri Dec 16 15:42:15 2011 +0100 Merge branch 'master' into build -- 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
[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449
The following commit has been merged in the build branch: commit 76a69f0c552b788e423f1eb7f6a41aacb7a35860 Merge: 471cd86c8bb504bd65a1615886f165d5f67c2ed4 feb5468d1d49829461ae6f58a4aa1ef0ce79726c Author: Giovanni Mascellani Date: Thu Dec 8 16:24:25 2011 +0100 Merge branch 'master' into build -- 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
[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.47.0+dfsg1-1-29-g84ae449
The following commit has been merged in the build branch: commit ac5dd6d6f0fbef622f213d607ea691e60e5c434c Merge: 6f18c2691e33ffb37fcd4e0100f6a2f8d93df98b 9d8b5ee2b41a9ccb3952e0e81ae67874404c40c1 Author: Giovanni Mascellani Date: Thu Dec 8 15:38:33 2011 +0100 Merge branch 'master' into build -- 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
