This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mesquite.
commit b031295b22e330ac04e898821629fce5991bc658 Author: Andreas Tille <[email protected]> Date: Mon May 23 15:46:53 2016 +0200 Try to get rid of some Mac specific stuff --- debian/patches/do_not_import_apple_jar.patch | 199 +++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/debian/patches/do_not_import_apple_jar.patch b/debian/patches/do_not_import_apple_jar.patch index e5bcc23..2ae8dad 100644 --- a/debian/patches/do_not_import_apple_jar.patch +++ b/debian/patches/do_not_import_apple_jar.patch @@ -8,3 +8,202 @@ import javax.swing.*; /* ======================================================================== */ +--- a/Source/mesquite/Mesquite.java ++++ b/Source/mesquite/Mesquite.java +@@ -22,9 +22,6 @@ import java.net.*; + + import javax.imageio.ImageIO; + +-import com.apple.mrj.MRJFileUtils; +-import com.apple.mrj.MRJOSType; +- + import mesquite.lib.*; + import mesquite.lib.duties.*; + import mesquite.lib.simplicity.*; +@@ -2291,15 +2288,6 @@ public class Mesquite extends MesquiteTr + CommandChecker.registerClass(System.class, System.class); + } + +- private void registerMacHandlers(){ +- if (!MesquiteWindow.GUIavailable) +- return; +- else if (MesquiteTrunk.isMacOSX()) { +- fileHandler = new EAWTHandler(this); +- ((EAWTHandler)fileHandler).register(); +- } +- } +- + public Mesquite(){ + super(); + } +@@ -2391,7 +2379,6 @@ public class Mesquite extends MesquiteTr + textEdgeCompensationHeight = 7; //6 on mac; 7 on pc + textEdgeCompensationWidth = 22; //12 on mac; 28 on pc + } +- mesq.registerMacHandlers(); + if (MesquiteTrunk.debugMode) + System.out.println("main constructor 4"); + MainThread.mainThread = new MainThread(); +@@ -2507,7 +2494,6 @@ public class Mesquite extends MesquiteTr + // create a new instance of this applet + mesquiteTrunk = new Mesquite(); + Mesquite mesq = (Mesquite)mesquiteTrunk; //for easy of reference below +- mesq.registerMacHandlers(); + MainThread.mainThread = new MainThread(); + MainThread.mainThread.start(); + prepareMesquite(); +--- a/Source/mesquite/trunk/EAWTHandler.java ++++ b/Source/mesquite/trunk/EAWTHandler.java +@@ -1,132 +0,0 @@ +-/* Mesquite source code. Copyright 1997 and onward, W. Maddison and D. Maddison. +- +- +-Disclaimer: The Mesquite source code is lengthy and we are few. There are no doubt inefficiencies and goofs in this code. +-The commenting leaves much to be desired. Please approach this source code with the spirit of helping out. +-Perhaps with your help we can be more than a few, and make Mesquite better. +- +-Mesquite is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. +-Mesquite's web site is http://mesquiteproject.org +- +-This source code and its compiled class files are free and modifiable under the terms of +-GNU Lesser General Public License. (http://www.gnu.org/copyleft/lesser.html) +-*/ +-package mesquite.trunk; +- +-import java.util.*; +-import java.io.*; +-import mesquite.lib.*; +-import mesquite.*; +-import com.apple.eawt.*; +- +- +- +-/* ======================================================================== */ +-public class EAWTHandler implements FileOpener { +- boolean waiting = false; +- Vector fileList; +- Mesquite mesquite; +- static boolean quitting = false; +- public static Vector openFileThreads = new Vector(); +- public EAWTHandler (Mesquite mesquite) { +- this.mesquite = mesquite; +- fileList = new Vector(); +- } +- +- public void register(){ +- Application app = new Application(); +- EAWTH eawtH = new EAWTH(); +- app.addApplicationListener(eawtH); +- } +- +- public boolean isWaiting(){ +- return waiting; +- } +- +- public void openFilesNow() { +- if (mesquite == null) +- return; +- mesquite.openFilesNowUsed = true; +- MesquiteModule.incrementMenuResetSuppression(); +- waiting = false; +- while (fileList.size()>0) { +- Object obj = fileList.elementAt(0); +- fileList.removeElement(obj); +- String path = null; +- if (obj instanceof File){ +- File f = (File)obj; +- path = f.getAbsolutePath(); +- } +- else +- path = (String)obj; +- CommandRecord cr = new CommandRecord((CommandThread)null, false); +- // cr.suppressDebugWarning = true; +- openFileThreads.addElement(Thread.currentThread()); +- CommandRecord prevR = MesquiteThread.getCurrentCommandRecord(); +- MesquiteThread.setCurrentCommandRecord(cr); +- MesquiteTrunk.mesquiteTrunk.openFile(path); +- MesquiteThread.setCurrentCommandRecord(prevR); +- openFileThreads.removeElement(Thread.currentThread()); +- } +- MesquiteModule.decrementMenuResetSuppression(); +- } +- class EAWTH implements ApplicationListener { +- public void handleAbout (ApplicationEvent e){ +- if (((Mesquite)(MesquiteTrunk.mesquiteTrunk)).about!=null) { +- ((Mesquite)(MesquiteTrunk.mesquiteTrunk)).about.setVisible(true); +- e.setHandled(true); +- } +- } +- public void handleReOpenApplication (ApplicationEvent e){ +- } +- public void handleOpenApplication (ApplicationEvent e){ +- } +- public void handleOpenFile (ApplicationEvent e){ +- MesquiteModule.incrementMenuResetSuppression(); +- if (((Mesquite)MesquiteTrunk.mesquiteTrunk).ready) { +- CommandRecord cr = new CommandRecord((CommandThread)null, false); +- CommandRecord prevR = MesquiteThread.getCurrentCommandRecord(); +- MesquiteThread.setCurrentCommandRecord(cr); +- openFileThreads.addElement(Thread.currentThread()); +- // cr.suppressDebugWarning = true; +- MesquiteTrunk.mesquiteTrunk.openFile(e.getFilename()); +- MesquiteThread.setCurrentCommandRecord(prevR); +- openFileThreads.removeElement(Thread.currentThread()); +- } +- else { +- waiting = true; +- fileList.addElement(e.getFilename()); +- +- } +- MesquiteModule.decrementMenuResetSuppression(); +- } +- public void handlePreferences (ApplicationEvent e){ +- } +- public void handlePrintFile (ApplicationEvent e){ +- } +- public void handleQuit (ApplicationEvent e){ +- if (quitting) +- return; +- if (MesquiteTrunk.attemptingToQuit) +- return; +- quitting = true; +- QT q = new QT(); +- String MRJversion = System.getProperty("mrj.version"); +- double d= MesquiteDouble.fromString(MRJversion); +- if (d>=3 && d<3.4) +- q.start(); +- else +- q.run(); +- } +- } +- class QT extends Thread { +- public void run(){ +- if (mesquite == null) +- return; +- MesquiteTrunk.mesquiteTrunk.logln("About to Quit..."); +- mesquite.doCommand("quit", null, CommandChecker.defaultChecker); +- quitting = false; +- } +- } +-} +- +--- a/Source/mesquite/lib/MesquiteThread.java ++++ b/Source/mesquite/lib/MesquiteThread.java +@@ -324,7 +324,7 @@ public class MesquiteThread extends Thre + return MesquiteTrunk.consoleListenSuppressed; //treat as scripting if backgrounded + } + else if (!(thisThread instanceof CommandRecordHolder)){ //not a MesquiteThread +- if (MesquiteTrunk.mesquiteTrunk.isStartupShutdownThread(thisThread) || (MesquiteTrunk.isMacOSX() && mesquite.trunk.EAWTHandler.openFileThreads.indexOf(thisThread)>=0)) { ++ if (MesquiteTrunk.mesquiteTrunk.isStartupShutdownThread(thisThread)) { + shouldBeScripting = false; //startup, shutdown; should be treated as nonscripting, but if scripting then OK + situation = 1; + if (diagnose) MesquiteMessage.println("isScripting:!CommandRecordHolder, 1"); +@@ -565,7 +565,7 @@ public class MesquiteThread extends Thre + if (mt instanceof CommandRecordHolder) + cr = ((CommandRecordHolder)mt).getCommandRecord(); // + if (cr == null) { +- if (MesquiteTrunk.debugMode && mt != MesquiteTrunk.startupShutdownThread && (MesquiteTrunk.isMacOSX() &&mesquite.trunk.EAWTHandler.openFileThreads.indexOf(mt)<0) && defaultIfNull == CommandRecord.nonscriptingRecord) ++ if (MesquiteTrunk.debugMode && mt != MesquiteTrunk.startupShutdownThread && defaultIfNull == CommandRecord.nonscriptingRecord) + MesquiteMessage.printStackTrace("@@@@@@@@@@@@@@@@\nNS CommandRecord used because none is attached to thread"); + return defaultIfNull; + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mesquite.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
