Author: nd-guest
Date: 2007-10-09 18:48:17 +0000 (Tue, 09 Oct 2007)
New Revision: 1175

Added:
   packages/josm/trunk/debian/patches/30_gcj.dpatch
Log:
- Add patch to compile with gcj. This breaks some minor functionality.


Added: packages/josm/trunk/debian/patches/30_gcj.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/30_gcj.dpatch                            
(rev 0)
+++ packages/josm/trunk/debian/patches/30_gcj.dpatch    2007-10-09 18:48:17 UTC 
(rev 1175)
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_gcj.dpatch by Andreas Putzo <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/actions/HelpAction.java 
josm-0.0.0.20071008/src/org/openstreetmap/josm/actions/HelpAction.java
+--- josm-0.0.0.20071008~/src/org/openstreetmap/josm/actions/HelpAction.java    
2007-10-04 08:32:45.000000000 +0000
++++ josm-0.0.0.20071008/src/org/openstreetmap/josm/actions/HelpAction.java     
2007-10-09 18:24:03.000000000 +0000
+@@ -112,7 +112,8 @@
+                       setHelpUrl(url);
+               } else if (e.getActionCommand() == null) {
+                       String topic = null;
+-                      Point mouse = Main.parent.getMousePosition();
++/*                    Point mouse = Main.parent.getMousePosition(); */
++            Point mouse = null;
+                       if (mouse != null)
+                               topic = 
contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, 
mouse.y));
+                       if (topic == null) {
+diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/MapMover.java 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/MapMover.java
+--- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/MapMover.java  
2007-08-07 20:33:04.000000000 +0000
++++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/MapMover.java   
2007-10-09 18:24:03.000000000 +0000
+@@ -33,7 +33,8 @@
+         }
+           public void actionPerformed(ActionEvent e) {
+               if (action.equals(".") || action.equals(",")) {
+-                      Point mouse = nc.getMousePosition();
++/*                    Point mouse = nc.getMousePosition(); */
++                Point mouse = null;                    
+                       if (mouse == null)
+                               mouse = new 
Point((int)nc.getBounds().getCenterX(), (int)nc.getBounds().getCenterY());
+                       MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), 
e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, 
MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals(",") ? -1 : 1);
+diff -urNad 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
 josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+--- 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
   2007-08-10 19:12:53.000000000 +0000
++++ 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java 
   2007-10-09 18:24:03.000000000 +0000
+@@ -183,7 +183,8 @@
+ 
+               instance.addMouseListener(new MouseAdapter(){
+                       private void openPopup(MouseEvent e) {
+-                              Point p = listScrollPane.getMousePosition();
++/*                            Point p = listScrollPane.getMousePosition();
+ */
++                Point p = null;            
+                               if (p == null)
+                                       return; // user is faster than swing 
with mouse movement
+                               int index = 
instance.locationToIndex(e.getPoint());
+diff -urNad 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
+--- 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java    
   2007-09-16 02:37:42.000000000 +0000
++++ 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java     
   2007-10-09 18:30:01.000000000 +0000
+@@ -377,7 +377,9 @@
+                               Rectangle r = new 
Rectangle(p.x-e.icon.getIconWidth()/2, p.y-e.icon.getIconHeight()/2, 
e.icon.getIconWidth(), e.icon.getIconHeight());
+                               e.icon.paintIcon(mv, g, r.x, r.y);
+                               Border b = null;
+-                              Point mousePosition = mv.getMousePosition();
++/*                            Point mousePosition = mv.getMousePosition(); */
++/* TODO. Check. */
++                Point mousePosition = null;
+                               if (mousePosition == null)
+                                       continue; // mouse outside the whole 
window
+                               if (!clickedFound && mousePressed && 
r.contains(mousePosition)) {
+diff -urNad 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
+--- 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
    2007-08-07 20:33:04.000000000 +0000
++++ 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
     2007-10-09 18:24:03.000000000 +0000
+@@ -40,7 +40,8 @@
+               buttonRectangle.setLocation(screen.x+4, screen.y+2);
+               symbol.paintIcon(mv, g, screen.x+4, screen.y+2);
+               Border b;
+-              Point mousePosition = mv.getMousePosition();
++/*            Point mousePosition = mv.getMousePosition();
+ */
++        Point mousePosition = null;
+               if (mousePosition == null)
+                       return; // mouse outside the whole window
+               
+diff -urNad 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+--- 
josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
     2007-08-10 19:12:53.000000000 +0000
++++ 
josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
      2007-10-09 18:24:03.000000000 +0000
+@@ -94,7 +94,8 @@
+ 
+       @Override public void paint(Graphics g, MapView mv) {
+               boolean mousePressedTmp = mousePressed;
+-              Point mousePos = mv.getMousePosition();
++/*            Point mousePos = mv.getMousePosition();
+ */
++        Point mousePos = null;                
+               String mkrCol = Main.pref.get("color.gps marker");
+               String mkrColSpecial = Main.pref.get("color.layer "+name);
+         String mkrTextShow = Main.pref.get("marker.show "+name, "show");


Property changes on: packages/josm/trunk/debian/patches/30_gcj.dpatch
___________________________________________________________________
Name: svn:executable
   + *


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to