This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit aeb7fa693b3ce238558845af9c120a099c8b5817 Author: Gilles Filippini <[email protected]> Date: Sun Sep 17 14:28:35 2017 +0200 First build of 1.1.1-1 --- debian/README.source | 8 +- debian/changelog | 14 +- debian/copyright | 57 ++++++ debian/maven.rules | 2 + debian/maven.rules.ours | 2 + debian/patches/add-classpath.patch | 9 +- debian/patches/autotoolize-vision-proxy.patch | 2 +- debian/patches/basics-exclude-windows-mac.patch | 103 ++++++---- debian/patches/debian-java-parameters.patch | 2 +- debian/patches/dependency-opencv.patch | 48 ++--- debian/patches/drop-useless-resources.patch | 16 +- debian/patches/fix-log-parameters-order.patch | 2 +- debian/patches/install-extension.patch | 2 +- debian/patches/jxgrabkey-not-embedded.patch | 16 ++ debian/patches/jython-sikulix-module-path.patch | 20 +- debian/patches/native.patch | 30 +-- debian/patches/no-gem-maven-plugin.patch | 32 --- debian/patches/no-jadb.patch | 250 ++++++++++++++++++++++++ debian/patches/no-maven-repo-dependencies.patch | 8 +- debian/patches/no-vnc-package.patch | 155 --------------- debian/patches/no-vnc.patch | 113 +++++++++++ debian/patches/opencv-3.1.patch | 168 ---------------- debian/patches/pom-removed-modules.patch | 2 +- debian/patches/series | 7 +- debian/patches/setTextAndMnemonic.patch | 6 +- debian/patches/tess3.patch | 17 -- debian/rules | 2 +- 27 files changed, 595 insertions(+), 498 deletions(-) diff --git a/debian/README.source b/debian/README.source index 5c7a774..106244c 100644 --- a/debian/README.source +++ b/debian/README.source @@ -29,12 +29,16 @@ git merge SikuliX-2014/master REMOVED PARTS FROM UPSTREAM SOURCE TREE --------------------------------------- -API/src/main/java/edu/unh/iol/dlc/ non-free license +API/lib/com/tigervnc/ pre-built TigerVNC java client +API/src/main/java/jxgrabkey/ embedded JXGrabKey source API/src/main/java/org/opencv/ pre-built OpenCV package -API/src/main/java/org/sikuli/natives/*!(Util).java +API/src/main/java/org/sikuli/natives/!(CommandExecutor)*!(Util).java swig generated files API/src/main/resources/Lib/xl* MS Excel processing python modules API/src/main/resources/Lib/zxJDBC.jar +API/src/main/resources/com/jcraft/ embedded SSH v2 java implementation +API/src/main/resources/com/tigervnc/ emedded TigerVNC java client source +API/src/main/resources/Lib/robot/ embedded Robot Framework source (python) IDE/src/main/java/org/jdesktop/swingx/ embedded swinglabs-swingx Libslux/src/main/resources/sikulixlibs/ placeholder for pre-builts native libraries Libslux/src/main/resources/srcnativelibs/Include/OpenCV diff --git a/debian/changelog b/debian/changelog index 7da4c5b..0615b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,19 @@ -sikulix (1.1.0-3) UNRELEASED; urgency=medium +sikulix (1.1.1-1) UNRELEASED; urgency=medium + + * New upstream release + * Drop patches: + - no-vnc-package.patch + - opencv-3.1.patch + * New patches: + - jxgrabkey-not-embedded.patch + - no-jadb.patch + - no-vnc.patch + * Refresh other patches * Build-Depends: libjline-java, libasm3-java to fix FTBFS against jython-2.7 - -- Gilles Filippini <[email protected]> Sat, 16 Sep 2017 17:25:42 +0200 + -- Gilles Filippini <[email protected]> Sat, 16 Sep 2017 19:55:12 +0200 sikulix (1.1.0-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 048ff83..7332a51 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,6 +13,63 @@ Files: API/src/main/java/org/sikuli/remoteinterfaces/common/* Copyright: 2014 Sergey Kuts License: Expat +Files: API/src/main/java/org/sikuli/vnc/* +Copyright: 2017, Sikuli.org, sikulix.com +License: GPL-2+ + This is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems the full text of the GNU General Public License + version 2 can be found in the `/usr/share/common-licenses/GPL-2' file. + +Files: API/src/main/java/org/sikuli/vnc/XKeySym.java +Copyright: 1987, 1994, 1998 The Open Group + 1987 by Digital Equipment Corporation, Maynard, Massachusetts + All Rights Reserved +License: OpenGroup-MIT-variant + Copyright 1987, 1994, 1998 The Open Group + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + Except as contained in this notice, the name of The Open Group shall + not be used in advertising or otherwise to promote the sale, use or + other dealings in this Software without prior written authorization + from The Open Group. + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts + All Rights Reserved + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Digital not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + Files: Setup/src/main/resources/macapp/Contents/MacOS/JavaAppLauncher Copyright: 2014 Tobias Fischer License: Expat diff --git a/debian/maven.rules b/debian/maven.rules index f746f48..6b6e8e7 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -9,3 +9,5 @@ junit junit jar s/4\..*/4.x/ * * asm * jar s/3\..*/3.x/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * +# +com.sikulix * jar * * * diff --git a/debian/maven.rules.ours b/debian/maven.rules.ours index f746f48..6b6e8e7 100644 --- a/debian/maven.rules.ours +++ b/debian/maven.rules.ours @@ -9,3 +9,5 @@ junit junit jar s/4\..*/4.x/ * * asm * jar s/3\..*/3.x/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * +# +com.sikulix * jar * * * diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch index 892f8b0..4ecd37e 100644 --- a/debian/patches/add-classpath.patch +++ b/debian/patches/add-classpath.patch @@ -5,7 +5,7 @@ Index: sikuli/pom.xml =================================================================== --- sikuli.orig/pom.xml +++ sikuli/pom.xml -@@ -135,6 +135,24 @@ +@@ -99,6 +99,24 @@ </modules> <build> @@ -30,10 +30,3 @@ Index: sikuli/pom.xml <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> -@@ -148,4 +166,4 @@ - </plugin> - </plugins> - </build> --</project> -\ No newline at end of file -+</project> diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch index 0fec510..5b02dfe 100644 --- a/debian/patches/autotoolize-vision-proxy.patch +++ b/debian/patches/autotoolize-vision-proxy.patch @@ -5,7 +5,7 @@ Index: sikuli/Libslux/pom.xml =================================================================== --- sikuli.orig/Libslux/pom.xml +++ sikuli/Libslux/pom.xml -@@ -24,6 +24,75 @@ +@@ -28,6 +28,75 @@ <build> <plugins> <plugin> diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch index 86ca40b..662bf53 100644 --- a/debian/patches/basics-exclude-windows-mac.patch +++ b/debian/patches/basics-exclude-windows-mac.patch @@ -2,19 +2,19 @@ Description: Exclude Windows and Mac specific source file from the build. WindowsHotkeyManager.java fails to compile on Linux because it relies on Windows specific library com.melloware.jintellitype. Author: Gilles Filippini <pini@debian> -Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java +Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/RunTime.java =================================================================== ---- sikuli.orig/API/src/main/java/org/sikuli/script/RunTime.java -+++ sikuli/API/src/main/java/org/sikuli/script/RunTime.java -@@ -44,7 +44,6 @@ import org.sikuli.basics.Debug; - import org.sikuli.basics.FileManager; +--- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/RunTime.java ++++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/RunTime.java +@@ -10,7 +10,6 @@ import org.sikuli.basics.FileManager; import org.sikuli.basics.Settings; import org.sikuli.util.JythonHelper; --import org.sikuli.util.SysJNA; import org.sikuli.util.LinuxSupport; +-import org.sikuli.util.SysJNA; - /** -@@ -994,16 +993,16 @@ Point pNull = new Point(0, 0); + import java.awt.*; + import java.io.*; +@@ -1006,14 +1005,14 @@ public class RunTime { } private void addToWindowsSystemPath(File fLibsFolder) { @@ -25,37 +25,60 @@ Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java } else { String libsPath = (fLibsFolder.getAbsolutePath()).replaceAll("/", "\\"); if (!syspath.toUpperCase().contains(libsPath.toUpperCase())) { -- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", libsPath + ";" + syspath)) { +- if (SysJNA.WinKernel32.setEnvironmentVariable("PATH", libsPath + ";" + syspath)) { +- syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH"); + if (true) { - Sikulix.terminate(999); - } -- syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH"); -+ syspath = ""; - if (!syspath.toUpperCase().contains(libsPath.toUpperCase())) { - log(-1, "addToWindowsSystemPath: adding to system path did not work:\n%s", syspath); - terminate(1, "addToWindowsSystemPath: did not work - see error"); -Index: sikuli/API/pom.xml ++ syspath = ""; + if (!syspath.toUpperCase().contains(libsPath.toUpperCase())) { + log(-1, "addToWindowsSystemPath: adding to system path did not work:\n%s", syspath); + terminate(1, "addToWindowsSystemPath: did not work - see error"); +Index: sikulix-1.1.1/API/pom.xml +=================================================================== +--- sikulix-1.1.1.orig/API/pom.xml ++++ sikulix-1.1.1/API/pom.xml +@@ -159,6 +159,20 @@ + </archive> + </configuration> + </plugin> ++ <plugin> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <version>debian</version> ++ <configuration> ++ <encoding>UTF-8</encoding> ++ <excludes> ++ <exclude>**/basics/WindowsHotkeyManager.java</exclude> ++ <exclude>**/basics/MacHotkeyManager.java</exclude> ++ <exclude>**/util/SysJNA.java</exclude> ++ <exclude>**/natives/WinUtil.java</exclude> ++ <exclude>**/natives/MacUtil.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> + <!-- <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> +Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Key.java =================================================================== ---- sikuli.orig/API/pom.xml -+++ sikuli/API/pom.xml -@@ -109,6 +109,20 @@ - </archive> - </configuration> - </plugin> -+ <plugin> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <version>debian</version> -+ <configuration> -+ <encoding>UTF-8</encoding> -+ <excludes> -+ <exclude>**/basics/WindowsHotkeyManager.java</exclude> -+ <exclude>**/basics/MacHotkeyManager.java</exclude> -+ <exclude>**/util/SysJNA.java</exclude> -+ <exclude>**/natives/WinUtil.java</exclude> -+ <exclude>**/natives/MacUtil.java</exclude> -+ </excludes> -+ </configuration> -+ </plugin> - <!-- <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> +--- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Key.java ++++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Key.java +@@ -14,7 +14,6 @@ import java.util.Map; + import java.util.TreeMap; + import org.sikuli.basics.Debug; + import org.sikuli.basics.Settings; +-import org.sikuli.util.SysJNA; + + /** + * this class implements an interface to the Java key system +@@ -811,12 +810,6 @@ public class Key { + return false; + } + switch (key) { +- case '\ue025': +- return SysJNA.WinUser32.isScrollLockOn(); +- case '\ue027': +- return SysJNA.WinUser32.isCapsLockOn(); +- case '\ue03B': +- return SysJNA.WinUser32.isNumLockOn(); + default: + return false; + } diff --git a/debian/patches/debian-java-parameters.patch b/debian/patches/debian-java-parameters.patch index 6dcdf77..2bfaa1e 100644 --- a/debian/patches/debian-java-parameters.patch +++ b/debian/patches/debian-java-parameters.patch @@ -2,7 +2,7 @@ Index: sikuli/IDE/pom.xml =================================================================== --- sikuli.orig/IDE/pom.xml +++ sikuli/IDE/pom.xml -@@ -172,6 +172,7 @@ +@@ -176,6 +176,7 @@ </manifest> <manifestEntries> <Class-Path>/usr/share/java/mac_widgets.jar /usr/share/java/jython.jar /usr/share/java/opencv.jar</Class-Path> diff --git a/debian/patches/dependency-opencv.patch b/debian/patches/dependency-opencv.patch index e768ac9..36a1e6a 100644 --- a/debian/patches/dependency-opencv.patch +++ b/debian/patches/dependency-opencv.patch @@ -4,27 +4,27 @@ Index: sikuli/API/pom.xml =================================================================== --- sikuli.orig/API/pom.xml +++ sikuli/API/pom.xml -@@ -44,6 +44,13 @@ - <version>1.0</version> - </dependency> - <dependency> -+ <groupId>opencv</groupId> -+ <artifactId>opencv</artifactId> -+ <version>2.4.9</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/opencv.jar</systemPath> -+ </dependency> -+ <dependency> - <!-- BridJ aims to be the ultimate Java / native interoperability library - Call C, C++, ObjectiveC libraries without compiling native code - https://code.google.com/p/bridj/ --> -@@ -107,6 +114,9 @@ - <manifest> - <mainClass>org.sikuli.script.Sikulix</mainClass> - </manifest> -+ <manifestEntries> -+ <Class-Path>/usr/share/java/opencv.jar</Class-Path> -+ </manifestEntries> - </archive> - </configuration> - </plugin> +@@ -117,6 +117,13 @@ + <artifactId>vncviewer</artifactId> + <version>1.7.1</version> + </dependency> ++ <dependency> ++ <groupId>opencv</groupId> ++ <artifactId>opencv</artifactId> ++ <version>2.4.9</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/opencv.jar</systemPath> ++ </dependency> + </dependencies> + + <build> +@@ -157,6 +164,9 @@ + <manifest> + <mainClass>org.sikuli.script.Sikulix</mainClass> + </manifest> ++ <manifestEntries> ++ <Class-Path>/usr/share/java/opencv.jar</Class-Path> ++ </manifestEntries> + </archive> + </configuration> + </plugin> diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch index cadc5f1..a75858a 100644 --- a/debian/patches/drop-useless-resources.patch +++ b/debian/patches/drop-useless-resources.patch @@ -4,11 +4,11 @@ Index: sikuli/API/pom.xml =================================================================== --- sikuli.orig/API/pom.xml +++ sikuli/API/pom.xml -@@ -83,6 +83,7 @@ - <filtering>false</filtering> - <excludes> - <exclude>Settings/*</exclude> -+ <exclude>Commands/*</exclude> - </excludes> - </resource> - <resource> +@@ -133,6 +133,7 @@ + <filtering>false</filtering> + <excludes> + <exclude>Settings/*</exclude> ++ <exclude>Commands/*</exclude> + </excludes> + </resource> + <resource> diff --git a/debian/patches/fix-log-parameters-order.patch b/debian/patches/fix-log-parameters-order.patch index 36d59a4..2e67a93 100644 --- a/debian/patches/fix-log-parameters-order.patch +++ b/debian/patches/fix-log-parameters-order.patch @@ -7,7 +7,7 @@ Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/script/RunTime.java +++ sikuli/API/src/main/java/org/sikuli/script/RunTime.java -@@ -1566,9 +1566,9 @@ Point pNull = new Point(0, 0); +@@ -1564,9 +1564,9 @@ public class RunTime { ssxbeta = String.format("-Beta%d", SikuliVersionBetaN); } SikuliVersionBuild = prop.getProperty("sikulixbuild"); diff --git a/debian/patches/install-extension.patch b/debian/patches/install-extension.patch index 784bb17..9caa948 100644 --- a/debian/patches/install-extension.patch +++ b/debian/patches/install-extension.patch @@ -5,7 +5,7 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/basics/ExtensionManager.java +++ sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java -@@ -58,12 +58,16 @@ public class ExtensionManager { +@@ -57,12 +57,16 @@ public class ExtensionManager { if (targetFile.exists()) { targetFile.delete(); } diff --git a/debian/patches/jxgrabkey-not-embedded.patch b/debian/patches/jxgrabkey-not-embedded.patch new file mode 100644 index 0000000..0891cc9 --- /dev/null +++ b/debian/patches/jxgrabkey-not-embedded.patch @@ -0,0 +1,16 @@ +Index: sikulix-1.1.1/API/pom.xml +=================================================================== +--- sikulix-1.1.1.orig/API/pom.xml ++++ sikulix-1.1.1/API/pom.xml +@@ -114,6 +114,11 @@ + <scope>system</scope> + <systemPath>/usr/share/java/opencv.jar</systemPath> + </dependency> ++ <dependency> ++ <groupId>jxgrabkey</groupId> ++ <artifactId>jxgrabkey</artifactId> ++ <version>1.0</version> ++ </dependency> + </dependencies> + + <build> diff --git a/debian/patches/jython-sikulix-module-path.patch b/debian/patches/jython-sikulix-module-path.patch index 239538e..9cddd02 100644 --- a/debian/patches/jython-sikulix-module-path.patch +++ b/debian/patches/jython-sikulix-module-path.patch @@ -2,19 +2,19 @@ Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java =================================================================== --- sikuli.orig/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java +++ sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java -@@ -112,17 +112,10 @@ public class JythonScriptRunner implemen +@@ -110,17 +110,10 @@ public class JythonScriptRunner implemen getInterpreter(); helper = JythonHelper.set(interpreter); helper.getSysPath(); - String fpAPI = null; -- String[] possibleJars = new String[] {"sikulixapi", "API/target/classes", "sikulix.jar"}; -- for (String aJar : possibleJars) { -- if (null != (fpAPI = runTime.isOnClasspath(aJar))) { -- break; -- } -- } -- if (null == fpAPI) { -- runTime.terminate(1, "JythonScriptRunner: no sikulix....jar on classpath"); +- String[] possibleJars = new String[]{"sikulixapi", "API/target/classes", "sikulix.jar"}; +- for (String aJar : possibleJars) { +- if (null != (fpAPI = runTime.isOnClasspath(aJar))) { +- break; +- } +- } +- if (null == fpAPI) { +- runTime.terminate(1, "JythonScriptRunner: no sikulix....jar on classpath"); - } - String fpAPILib = new File(fpAPI, "Lib").getAbsolutePath(); + // Retreive Jython Sikulix module path (API jar file path + '/Lib') @@ -23,4 +23,4 @@ Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java + String fpAPILib = (new File(fpAPI, "Lib")).getAbsolutePath(); helper.putSysPath(fpAPILib, 0); helper.setSysPath(); - helper.addSitePackages(); + helper.addSitePackages(); diff --git a/debian/patches/native.patch b/debian/patches/native.patch index 0543a6f..a16f7fc 100644 --- a/debian/patches/native.patch +++ b/debian/patches/native.patch @@ -8,7 +8,7 @@ Index: sikuli/API/src/main/java/org/sikuli/script/Screen.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/script/Screen.java +++ sikuli/API/src/main/java/org/sikuli/script/Screen.java -@@ -54,7 +54,7 @@ public class Screen extends Region imple +@@ -68,7 +68,7 @@ public class Screen extends Region imple //<editor-fold defaultstate="collapsed" desc="Initialization"> static { @@ -34,20 +34,20 @@ Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java +++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java -@@ -32,7 +32,7 @@ public class TextRecognizer { - private static int lvl = 3; - - static { -- RunTime.loadLibrary("VisionProxy"); -+ System.loadLibrary("VisionProxy"); - } - - private TextRecognizer() { +@@ -31,7 +31,7 @@ public class TextRecognizer { + private static int lvl = 3; + + static { +- RunTime.loadLibrary("VisionProxy"); ++ System.loadLibrary("VisionProxy"); + } + + private TextRecognizer() { Index: sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/basics/VDictProxy.java +++ sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java -@@ -19,7 +19,7 @@ public class VDictProxy<T> { +@@ -18,7 +18,7 @@ public class VDictProxy<T> { private Map<Integer, T> _i2obj = new HashMap<Integer, T>(); static { @@ -60,7 +60,7 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java +++ sikuli/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java -@@ -21,7 +21,7 @@ public class MacHotkeyManager extends Ho +@@ -20,7 +20,7 @@ public class MacHotkeyManager extends Ho static final int CARBON_MASK_CTRL = 0x1000; static { @@ -73,7 +73,7 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java +++ sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java -@@ -15,7 +15,7 @@ import org.sikuli.script.RunTime; +@@ -14,7 +14,7 @@ import org.sikuli.script.RunTime; public class LinuxHotkeyManager extends HotkeyManager { static{ @@ -86,7 +86,7 @@ Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java =================================================================== --- sikuli.orig/API/src/main/java/org/sikuli/script/RunTime.java +++ sikuli/API/src/main/java/org/sikuli/script/RunTime.java -@@ -882,7 +882,6 @@ Point pNull = new Point(0, 0); +@@ -895,7 +894,6 @@ public class RunTime { private void libsExport(Type typ) { shouldExport = false; makeFolders(); @@ -94,7 +94,7 @@ Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java if (!libsCheck(fLibsFolder)) { FileManager.deleteFileOrFolder(fLibsFolder); fLibsFolder.mkdirs(); -@@ -927,14 +926,6 @@ Point pNull = new Point(0, 0); +@@ -944,14 +942,6 @@ public class RunTime { if (!fpLibsFrom.isEmpty()) { addToClasspath(fpLibsFrom); } diff --git a/debian/patches/no-gem-maven-plugin.patch b/debian/patches/no-gem-maven-plugin.patch deleted file mode 100644 index a3f76bb..0000000 --- a/debian/patches/no-gem-maven-plugin.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: gem-maven-plugin isn't packaged for Debian - And we don't want embedded ruby gems anyway! -Author: Gilles Filippini <[email protected]> -Index: sikuli/JRuby/pom.xml -=================================================================== ---- sikuli.orig/JRuby/pom.xml -+++ sikuli/JRuby/pom.xml -@@ -71,24 +71,4 @@ - <optional>true</optional> - </dependency> - </dependencies> -- -- <build> -- <plugins> -- <plugin> -- <groupId>de.saumya.mojo</groupId> -- <artifactId>gem-maven-plugin</artifactId> -- <version>1.0.0</version> -- <configuration> -- <includeRubygemsInResources>true</includeRubygemsInResources> -- </configuration> -- <executions> -- <execution> -- <goals> -- <goal>initialize</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- </plugins> -- </build> - </project> diff --git a/debian/patches/no-jadb.patch b/debian/patches/no-jadb.patch new file mode 100644 index 0000000..360bb8c --- /dev/null +++ b/debian/patches/no-jadb.patch @@ -0,0 +1,250 @@ +Index: sikulix-1.1.1/API/pom.xml +=================================================================== +--- sikulix-1.1.1.orig/API/pom.xml ++++ sikulix-1.1.1/API/pom.xml +@@ -103,11 +103,6 @@ + <version>0.7.0</version> + </dependency> + <dependency> +- <groupId>com.github.vidstige</groupId> +- <artifactId>jadb</artifactId> +- <version>-v1.0-g94ebf38-23</version> +- </dependency> +- <dependency> + <groupId>com.sikulix</groupId> + <artifactId>${sikulix.libs}</artifactId> + <version>${project.version}</version> +@@ -181,6 +176,7 @@ + <exclude>**/util/SysJNA.java</exclude> + <exclude>**/natives/WinUtil.java</exclude> + <exclude>**/natives/MacUtil.java</exclude> ++ <exclude>**/android/*.java</exclude> + </excludes> + </configuration> + </plugin> +Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Region.java +=================================================================== +--- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Region.java ++++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Region.java +@@ -16,8 +16,6 @@ import java.util.Date; + import java.util.Iterator; + import java.util.List; + +-import org.sikuli.android.ADBDevice; +-import org.sikuli.android.ADBScreen; + import org.sikuli.basics.Debug; + import org.sikuli.basics.Settings; + import org.sikuli.util.ScreenHighlighter; +@@ -4462,19 +4460,7 @@ public class Region { + } + //</editor-fold> + +- //<editor-fold desc="Mobile actions (Android)"> +- private ADBDevice adbDevice = null; +- private ADBScreen adbScreen = null; +- + private boolean isAndroid() { +- if (isOtherScreen()) { +- IScreen scr = getScreen(); +- if (scr instanceof ADBScreen) { +- adbScreen = (ADBScreen) scr; +- adbDevice = adbScreen.getDevice(); +- return true; +- } +- } + return false; + } + +@@ -4486,13 +4472,6 @@ public class Region { + * @throws FindFailed image not found + */ + public <PFRML> void aTap(PFRML target) throws FindFailed { +- if (isAndroid() && adbDevice != null) { +- Location loc = getLocationFromTarget(target); +- if (loc != null) { +- adbDevice.tap(loc.x, loc.y); +- RunTime.pause(adbScreen.waitAfterAction); +- } +- } + } + + /** +@@ -4501,9 +4480,6 @@ public class Region { + * @param text text + */ + public void aInput(String text) { +- if (isAndroid() && adbDevice != null) { +- adbDevice.input(text); +- } + } + + /** +@@ -4512,9 +4488,6 @@ public class Region { + * @param key key + */ + public void aKey(int key) { +- if (isAndroid() && adbDevice != null) { +- adbDevice.inputKeyEvent(key); +- } + } + + /** +@@ -4526,14 +4499,6 @@ public class Region { + * @throws FindFailed image not found + */ + public <PFRML> void aSwipe(PFRML from, PFRML to) throws FindFailed { +- if (isAndroid() && adbDevice != null) { +- Location locFrom = getLocationFromTarget(from); +- Location locTo = getLocationFromTarget(to); +- if (locFrom != null && locTo != null) { +- adbDevice.swipe(locFrom.x, locFrom.y, locTo.x, locTo.y); +- RunTime.pause(adbScreen.waitAfterAction); +- } +- } + } + + /** +Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java +=================================================================== +--- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Sikulix.java ++++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java +@@ -6,7 +6,6 @@ + package org.sikuli.script; + + import org.sikuli.vnc.VNCScreen; +-import org.sikuli.android.ADBScreen; + import org.sikuli.basics.*; + import org.sikuli.util.JythonHelper; + import org.sikuli.util.ScreenHighlighter; +@@ -461,7 +460,6 @@ public class Sikulix { + public static void cleanUp(int n) { + log(lvl, "cleanUp: %d", n); + VNCScreen.stopAll(); +- ADBScreen.stop(); + ScreenHighlighter.closeAll(); + Observing.cleanUp(); + HotkeyManager.reset(); +Index: sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java +=================================================================== +--- sikulix-1.1.1.orig/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java ++++ sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java +@@ -81,9 +81,6 @@ import org.jdesktop.swingx.JXCollapsible + import org.jdesktop.swingx.JXSearchField; + import org.jdesktop.swingx.JXTaskPane; + import org.jdesktop.swingx.JXTaskPaneContainer; +-import org.sikuli.android.ADBClient; +-import org.sikuli.android.ADBScreen; +-import org.sikuli.android.ADBTest; + import org.sikuli.basics.Debug; + import org.sikuli.basics.FileManager; + import org.sikuli.basics.HotkeyEvent; +@@ -1693,16 +1690,11 @@ public class SikuliIDE extends JFrame im + null, + new ToolAction(ToolAction.EXTENSIONS))); + +- _toolMenu.add(createMenuItem(_I("menuToolAndroid"), +- null, +- new ToolAction(ToolAction.ANDROID))); +- + } + + class ToolAction extends MenuAction { + + static final String EXTENSIONS = "extensions"; +- static final String ANDROID = "android"; + + ToolAction() { + super(); +@@ -1716,10 +1708,6 @@ public class SikuliIDE extends JFrame im + showExtensionsFrame(); + } + +- public void android(ActionEvent ae) { +- androidSupport(); +- } +- + } + + private void showExtensionsFrame() { +@@ -1754,50 +1742,6 @@ public class SikuliIDE extends JFrame im + return defaultScreen; + } + +- private void androidSupport() { +- final ADBScreen aScr = new ADBScreen(); +- String title = "Android Support - !!EXPERIMENTAL!!"; +- if (aScr.isValid()) { +- String warn = "Device found: " + aScr.getDeviceDescription() + "\n\n" + +- "click Check: a short test is run with the device\n" + +- "click Default: set device as default screen for capture\n" + +- "click Cancel: nothing is done (default screen is reset)\n" + +- "\nBE PREPARED: Feature is experimental - no guarantee ;-)"; +- String[] options = new String[3]; +- options[WARNING_DO_NOTHING] = "Check"; +- options[WARNING_ACCEPTED] = "Default"; +- options[WARNING_CANCEL] = "Cancel"; +- int ret = JOptionPane.showOptionDialog(this, warn, title, 0, JOptionPane.WARNING_MESSAGE, null, options, options[2]); +- if (ret == WARNING_CANCEL || ret == JOptionPane.CLOSED_OPTION) { +- defaultScreen = null; +- return; +- } +- if (ret == WARNING_DO_NOTHING) { +- SikuliIDE.hideIDE(); +- Thread test = new Thread() { +- @Override +- public void run() { +- androidSupportTest(aScr); +- } +- }; +- test.start(); +- } else if (ret == WARNING_ACCEPTED) { +- defaultScreen = aScr; +- return; +- } +- } else if (!ADBClient.isAdbAvailable) { +- Sikulix.popError("Package adb seems not to be available.\nIt must be installed for Android support.", title); +- } else { +- Sikulix.popError("No android device attached", title); +- } +- } +- +- private void androidSupportTest(ADBScreen aScr) { +- ADBTest.ideTest(aScr); +- SikuliIDE.showIDE(); +- } +- //</editor-fold> +- + //<editor-fold defaultstate="collapsed" desc="Init Help Menu"> + private void initHelpMenu() throws NoSuchMethodException { + int scMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); +Index: sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java +=================================================================== +--- sikulix-1.1.1.orig/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java ++++ sikulix-1.1.1/IDE/src/main/java/org/sikuli/ide/ButtonCapture.java +@@ -5,7 +5,6 @@ + */ + package org.sikuli.ide; + +-import org.sikuli.android.ADBScreen; + import org.sikuli.basics.PreferencesUser; + import java.awt.*; + import java.awt.event.*; +@@ -97,18 +96,6 @@ class ButtonCapture extends ButtonOnTool + defaultScreen = SikuliIDE.getDefaultScreen(); + if (defaultScreen == null) { + Screen.doPrompt("Select an image", this); +- } else { +- Sikulix.popup("Android capture"); +- Thread adbCapture = new Thread() { +- @Override +- public void run() { +- ADBScreen aScr = (ADBScreen) defaultScreen; +- aScr.wakeUp(2); +- sImgNonLocal = aScr.userCapture(""); +- ButtonCapture.this.update((EventSubject) null); +- } +- }; +- adbCapture.start(); + } + } + diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch index fb4fdfc..800bced 100644 --- a/debian/patches/no-maven-repo-dependencies.patch +++ b/debian/patches/no-maven-repo-dependencies.patch @@ -4,7 +4,7 @@ Index: sikuli/IDE/pom.xml =================================================================== --- sikuli.orig/IDE/pom.xml +++ sikuli/IDE/pom.xml -@@ -37,6 +37,38 @@ +@@ -41,6 +41,38 @@ <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> <version>${sikulixjythonversion}</version> @@ -43,7 +43,7 @@ Index: sikuli/IDE/pom.xml </dependency> <dependency> <groupId>org.jruby</groupId> -@@ -48,11 +80,11 @@ +@@ -52,11 +84,11 @@ <artifactId>json-simple</artifactId> <version>1.1.1</version> </dependency> @@ -57,7 +57,7 @@ Index: sikuli/IDE/pom.xml <dependency> <groupId>org.kohsuke.metainf-services</groupId> <artifactId>metainf-services</artifactId> -@@ -113,6 +145,8 @@ +@@ -117,6 +149,8 @@ <groupId>com.explodingpixels</groupId> <artifactId>mac_widgets</artifactId> <version>0.9.5</version> @@ -66,7 +66,7 @@ Index: sikuli/IDE/pom.xml </dependency> <dependency> <groupId>com.sikulix</groupId> -@@ -136,6 +170,9 @@ +@@ -140,6 +174,9 @@ <manifest> <mainClass>org.sikuli.ide.Sikulix</mainClass> </manifest> diff --git a/debian/patches/no-vnc-package.patch b/debian/patches/no-vnc-package.patch deleted file mode 100644 index 5f63f96..0000000 --- a/debian/patches/no-vnc-package.patch +++ /dev/null @@ -1,155 +0,0 @@ -Description: remove non free VNC package - The VNC package was removed from upstream source tree because of its - non-free license which prevents commercial redistribution: - This software may not be resold without the express permission of - the InterOperability Lab. - This patch remove the code using this VNC package. -Author: Gilles Filippini <[email protected]> -Index: sikuli/API/src/main/java/org/sikuli/script/Region.java -=================================================================== ---- sikuli.orig/API/src/main/java/org/sikuli/script/Region.java -+++ sikuli/API/src/main/java/org/sikuli/script/Region.java -@@ -17,7 +17,6 @@ import java.util.List; - import org.sikuli.basics.Debug; - import org.sikuli.basics.Settings; - --import edu.unh.iol.dlc.VNCScreen; - import java.util.ArrayList; - import java.util.Collections; - import java.util.Comparator; -@@ -238,13 +237,7 @@ public class Region { - // crop to the screen with the largest intersection - screenRect = new Rectangle(0, 0, 0, 0); - screenOn = null; -- boolean isVNC; -- if (iscr == null) { -- isVNC = scr instanceof VNCScreen; -- } else { -- isVNC = iscr instanceof VNCScreen; -- } -- if (!isVNC) { -+ if (true) { - for (int i = 0; i < Screen.getNumberScreens(); i++) { - screen = Screen.getScreen(i); - rect = regionOnScreen(screen); -@@ -255,17 +248,6 @@ public class Region { - } - } - } -- } else { -- for (int i = 0; i < VNCScreen.getNumberScreens(); i++) { -- screen = VNCScreen.getScreen(i); -- rect = regionOnScreen(screen); -- if (rect != null) { -- if (rect.width * rect.height > screenRect.width * screenRect.height) { -- screenRect = rect; -- screenOn = screen; -- } -- } -- } - } - if (screenOn != null) { - x = screenRect.x; -@@ -2835,9 +2817,7 @@ public class Region { - float score = (float) (img.getLastSeenScore() - 0.01); - if (this.contains(r)) { - Finder f = null; -- if (this.scr instanceof VNCScreen) { -- f = new Finder(new VNCScreen().capture(r), r); -- } else { -+ if (true) { - f = new Finder(base.getSub(r.getRect()), r); - if (Debug.shouldHighlight()) { - if (this.scr.getW() > w + 10 && this.scr.getH() > h + 10) -Index: sikuli/JRubyGem/lib/sikulix/sikulix.rb -=================================================================== ---- sikuli.orig/JRubyGem/lib/sikulix/sikulix.rb -+++ sikuli/JRubyGem/lib/sikulix/sikulix.rb -@@ -9,7 +9,6 @@ module Sikulix - # 'private' for avoiding of unexpected effects when - # 'include Sikulix' is used. - java_import java.net.Socket -- java_import Java.edu.unh.iol.dlc.ConnectionController - java_import org.sikuli.script.Sikulix - java_import org.sikuli.script.Screen - java_import org.sikuli.script.Region -@@ -109,64 +108,12 @@ module Sikulix - $SIKULI_SCREEN = Screen.new - # Screen used for undotted methods. - $DEFAULT_SCREEN = $SIKULI_SCREEN -- # Pool of screens of remote machines connected via VNC. -- $VNC_SCREEN_POOL = [] -- # ConnectionController instance -- @connection_controller = false -- -- # Initializes connections to remote machines -- # *args - sequence of address[:port] strings. Default port - 5900 -- # example: -- # initVNCPool("192.168.2.3:5901", "192.168.4.3") -- def initVNCPool(*args) -- if @connection_controller -- Debug.log(3, 'VNC Pool already initialized, free it first!') -- return -- end -- -- sockets = args.map do |str| -- address, port = str.scan(/([^:]+):?(.+)?/)[0] -- port = port ? port.to_i : 5900 -- s = Socket.new(address, port) -- s.setSoTimeout(1000) -- s.setKeepAlive(true) -- s -- end -- -- @connection_controller = ConnectionController.new(*sockets) -- sockets.each_index do |id| -- @connection_controller.openConnection(id) -- @connection_controller.setPixelFormat(id, 'Truecolor', 32, 0) -- @connection_controller.start(id) -- end -- -- # sleep left here to wait for buffering -- # it seems that there is no methods in ConnectionController class -- # with which we can check if connection is ready -- # so we will sleep according to ConnectionController author`s example -- -- sleep 2 -- -- # that import isn`t in the top of a module because -- # there is static section in it which requires -- # ConnectionController instance to exist -- java_import Java.edu.unh.iol.dlc.VNCScreen -- -- sockets.each_index do |id| -- $VNC_SCREEN_POOL << VNCScreen.new(id) -- end -- -- Debug.log(3, "Pool of #{$SCREEN_POOL} vnc connections initialized") -- end - - # Replaces default screen for which all undotted methods are - # called with another screen - # example: - # setDefaultScreen($SIKULI_SCREEN) - # click(Location(10,10)) <- click will be performed on local screen -- # -- # setDefaultScreen($VNC_SCREEN_POOL[0]) -- # click(Location(10,10)) <- click will be performed on remote screen num 0 - def setDefaultScreen(screen) - if screen.respond_to?(:click) - $DEFAULT_SCREEN = screen -@@ -174,14 +121,6 @@ module Sikulix - end - end - -- # Closes all the connections to remote nodes -- # You should call that method when all actions are performed -- # Connections shouldn`t be left opened -- def freeVNCPool -- $VNC_SCREEN_POOL.each { @connection_controller.close_connection(0) } -- @connection_controller = false -- end -- - # This is an alternative for method generation using define_method - # # Generate hash of ('method name'=>method) - # # for all possible "undotted" methods. diff --git a/debian/patches/no-vnc.patch b/debian/patches/no-vnc.patch new file mode 100644 index 0000000..8cdb5c7 --- /dev/null +++ b/debian/patches/no-vnc.patch @@ -0,0 +1,113 @@ +Index: sikulix-1.1.1/API/pom.xml +=================================================================== +--- sikulix-1.1.1.orig/API/pom.xml ++++ sikulix-1.1.1/API/pom.xml +@@ -108,11 +108,6 @@ + <version>${project.version}</version> + </dependency> + <dependency> +- <groupId>com.tigervnc</groupId> +- <artifactId>vncviewer</artifactId> +- <version>1.7.1</version> +- </dependency> +- <dependency> + <groupId>opencv</groupId> + <artifactId>opencv</artifactId> + <version>2.4.9</version> +@@ -177,6 +172,7 @@ + <exclude>**/natives/WinUtil.java</exclude> + <exclude>**/natives/MacUtil.java</exclude> + <exclude>**/android/*.java</exclude> ++ <exclude>**/vnc/*.java</exclude> + </excludes> + </configuration> + </plugin> +Index: sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java +=================================================================== +--- sikulix-1.1.1.orig/API/src/main/java/org/sikuli/script/Sikulix.java ++++ sikulix-1.1.1/API/src/main/java/org/sikuli/script/Sikulix.java +@@ -5,7 +5,6 @@ + */ + package org.sikuli.script; + +-import org.sikuli.vnc.VNCScreen; + import org.sikuli.basics.*; + import org.sikuli.util.JythonHelper; + import org.sikuli.util.ScreenHighlighter; +@@ -459,7 +458,6 @@ public class Sikulix { + */ + public static void cleanUp(int n) { + log(lvl, "cleanUp: %d", n); +- VNCScreen.stopAll(); + ScreenHighlighter.closeAll(); + Observing.cleanUp(); + HotkeyManager.reset(); +@@ -918,42 +916,4 @@ public class Sikulix { + public static void prefRemove() { + PreferencesUser.getInstance().removeAll(prefNonSikuli); + } +- +- /** +- * convenience for a password protected VNCScreen connection +- * (use theVNCScreen.stop() to stop the connection) +- * active screens are auto-stopped at cleanup +- * +- * @param theIP the server IP +- * @param thePort the port number +- * @param password a needed password for the server in plain text +- * @param cTimeout seconds to wait for a valid connection +- * @param timeout value in milli-seconds during normal operation +- * @return a VNCScreen object +- */ +- public static VNCScreen vncStart(String theIP, int thePort, String password, int cTimeout, int timeout) { +- try { +- return VNCScreen.start(theIP, thePort, password, cTimeout, timeout); +- } catch (IOException e) { +- throw new RuntimeException(e); +- } +- } +- +- /** +- * convenience for a VNCScreen connection (use theVNCScreen.stop() to stop the connection) +- * active screens are auto-stopped at cleanup +- * +- * @param theIP the server IP +- * @param thePort the port number +- * @param cTimeout seconds to wait for a valid connection +- * @param timeout value in milli-seconds during normal operation +- * @return a VNCScreen object +- */ +- public static VNCScreen vncStart(String theIP, int thePort, int cTimeout, int timeout) { +- try { +- return VNCScreen.start(theIP, thePort, cTimeout, timeout); +- } catch (IOException e) { +- throw new RuntimeException(e); +- } +- } + } +Index: sikulix-1.1.1/API/src/main/resources/Lib/sikuli/Sikuli.py +=================================================================== +--- sikulix-1.1.1.orig/API/src/main/resources/Lib/sikuli/Sikuli.py ++++ sikulix-1.1.1/API/src/main/resources/Lib/sikuli/Sikuli.py +@@ -480,21 +480,6 @@ def useRemote(adr, port=0): + else: + return None + +-## ----------------------------------------------------------------------- +-# convenience for a VNCScreen connection +-# ip the server IP (default: 127.0.0.1) +-# port the port number (default 5900) +-# connectionTimeout seconds to wait for a valid connection (default 10) +-# timeout the timout value in milli-seconds during normal operation (default 1000) +-# returns a VNCScreen object +-# use theVNCScreen.stop() to stop this connection again (auto-stopped at script end) +- +-def useVnc(ip="127.0.0.1", port=5900, connectionTimeout=10, timeout=1000, password=None): +- use(Sikulix.vncStart(ip, port, password, connectionTimeout, timeout), True) +- +-def vncStart(ip="127.0.0.1", port=5900, connectionTimeout=10, timeout=1000, password=None): +- return Sikulix.vncStart(ip, port, password, connectionTimeout, timeout) +- + ## ---------------------------------------------------------------------- + # Switches the frontmost application to the given application. + # If the given application is not running, it will be launched by openApp() diff --git a/debian/patches/opencv-3.1.patch b/debian/patches/opencv-3.1.patch deleted file mode 100644 index 0f33b9c..0000000 --- a/debian/patches/opencv-3.1.patch +++ /dev/null @@ -1,168 +0,0 @@ -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/cvgui.cpp -@@ -396,7 +396,7 @@ void denoise(Mat& src){ - void - cvgui::linkLineBlobsIntoPagagraphBlobs(vector<LineBlob>& blobs, vector<ParagraphBlob>& parablobs){ - -- sort(blobs, sort_blob_by_y); -+ std::sort(blobs.begin(), blobs.end(), sort_blob_by_y); - - for (vector<LineBlob>::iterator it = blobs.begin(); - it != blobs.end(); ++it){ -@@ -431,7 +431,7 @@ cvgui::linkLineBlobsIntoPagagraphBlobs(v - void - cvgui::mergeLineBlobs(vector<LineBlob>& blobs, vector<LineBlob>& merged_blobs){ - -- sort(blobs, sort_blob_by_x); -+ std::sort(blobs.begin(), blobs.end(), sort_blob_by_x); - - for (vector<LineBlob>::iterator it = blobs.begin(); - it != blobs.end(); ++it){ -@@ -467,7 +467,7 @@ void - cvgui::linkBlobsIntoLineBlobs(vector<Blob>& blobs, vector<LineBlob>& lines, int max_spacing){ - - -- sort(blobs, sort_blob_by_x); -+ std::sort(blobs.begin(), blobs.end(), sort_blob_by_x); - for (vector<Blob>::iterator it = blobs.begin(); - it != blobs.end(); ++it){ - -@@ -1884,7 +1884,7 @@ cvgui::areHorizontallyAligned(const vect - return true; - - vector<Rect> sorted_rects = rects; -- sort(sorted_rects, sort_by_x); -+ std::sort(sorted_rects.begin(), sorted_rects.end(), sort_by_x); - - int ymin = 10000; - int ymax = 0; -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.cpp -@@ -33,7 +33,7 @@ BaseFinder::BaseFinder(const char* sourc - - - // somwhow after changing it to false works!! --BaseFinder::BaseFinder(IplImage* _source) : source(Mat(_source, false)){ -+BaseFinder::BaseFinder(const IplImage* _source) : source(cvarrToMat(_source, false)){ - roi = Rect(0,0,source.cols,source.rows); - } - -@@ -93,7 +93,7 @@ TemplateFinder::find(const char *target_ - - void - TemplateFinder::find(IplImage* target, double min_similarity){ -- find(Mat(target, false), min_similarity); -+ find(cvarrToMat(target, false), min_similarity); - } - - void -@@ -108,7 +108,7 @@ TemplateFinder::find_all(const char *tar - - void - TemplateFinder::find_all(IplImage* target, double min_similarity){ -- find_all(Mat(target, true), min_similarity); -+ find_all(cvarrToMat(target, true), min_similarity); - } - - void -@@ -170,7 +170,7 @@ TemplateFinder::add_matches_to_buffer(in - FindResult next_match = matcher->next(); - buffered_matches.push_back(next_match); - } -- sort(buffered_matches,sort_by_score); -+ std::sort(buffered_matches.begin(), buffered_matches.end(), sort_by_score); - } - - void -@@ -238,7 +238,7 @@ TemplateFinder::next(){ - - FindResult next_match = matcher->next(); - buffered_matches[0] = next_match; -- sort(buffered_matches,sort_by_score); -+ std::sort(buffered_matches.begin(), buffered_matches.end(), sort_by_score); - return top_match; - } - -@@ -343,7 +343,7 @@ ChangeFinder::find(const char* new_scree - - void - ChangeFinder::find(IplImage* new_screen_image){ -- find(Mat(new_screen_image, false)); -+ find(cvarrToMat(new_screen_image, false)); - } - - #include "opencv2/imgproc/imgproc_c.h" -@@ -563,7 +563,7 @@ Finder::Finder(Mat source) - } - - Finder::Finder(IplImage* source) --: _source(Mat(source)){ -+: _source(cvarrToMat(source)){ - _finder = NULL; - _roi = Rect(-1,-1,-1,-1); - } -@@ -586,7 +586,7 @@ Finder::find(IplImage* target, double mi - - if (abs(min_similarity - 100)< 0.00001){ - dout << "training.." << endl; -- Mat im(target); -+ Mat im = cvarrToMat(target); - TextFinder::train(im); - - }else{ -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.h -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/finder.h -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/finder.h -@@ -20,7 +20,7 @@ class BaseFinder{ - - public: - -- BaseFinder(IplImage* screen_image); -+ BaseFinder(const IplImage* screen_image); - BaseFinder(Mat source); - BaseFinder(const char* source_image_filename); - virtual ~BaseFinder(); -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/pyramid-template-matcher.cpp -@@ -4,6 +4,8 @@ - * - */ - -+#include <map> -+ - #include "pyramid-template-matcher.h" - #include "vision.h" - -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.cpp -@@ -5,6 +5,8 @@ - * modified RaiMan 2013 - */ - -+#include <map> -+ - #include "vision.h" - #include "finder.h" - #include "tessocr.h" -Index: sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.h -=================================================================== ---- sikulix-1.1.0.orig/Libslux/src/main/resources/srcnativelibs/Vision/vision.h -+++ sikulix-1.1.0/Libslux/src/main/resources/srcnativelibs/Vision/vision.h -@@ -8,6 +8,8 @@ - #ifndef _VISION_H_ - #define _VISION_H_ - -+#include <map> -+ - #include "find-result.h" - #include "opencv.hpp" - #include "tessocr.h" diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch index cca9ba4..0ed9fcb 100644 --- a/debian/patches/pom-removed-modules.patch +++ b/debian/patches/pom-removed-modules.patch @@ -4,7 +4,7 @@ Index: sikuli/pom.xml =================================================================== --- sikuli.orig/pom.xml +++ sikuli/pom.xml -@@ -124,14 +124,9 @@ +@@ -88,14 +88,9 @@ <modules> <module>Libslux</module> diff --git a/debian/patches/series b/debian/patches/series index 39c725a..8e16f69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ native.patch install-extension.patch -#tess3.patch setTextAndMnemonic.patch autotoolize-vision-proxy.patch @@ -13,10 +12,10 @@ drop-useless-resources.patch add-classpath.patch pom-removed-modules.patch python-shebang.patch -#no-gem-maven-plugin.patch dependency-opencv.patch -no-vnc-package.patch fix-log-parameters-order.patch -opencv-3.1.patch jython-sikulix-module-path.patch debian-java-parameters.patch +no-jadb.patch +no-vnc.patch +jxgrabkey-not-embedded.patch diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch index 65b7786..a0a5814 100644 --- a/debian/patches/setTextAndMnemonic.patch +++ b/debian/patches/setTextAndMnemonic.patch @@ -6,7 +6,7 @@ Index: sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java =================================================================== --- sikuli.orig/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java +++ sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java -@@ -8,6 +8,7 @@ package org.sikuli.ide; +@@ -7,6 +7,7 @@ package org.sikuli.ide; import org.sikuli.basics.PreferencesUser; import com.jgoodies.forms.factories.DefaultComponentFactory; @@ -14,7 +14,7 @@ Index: sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java import java.awt.*; import java.awt.event.*; import java.util.Arrays; -@@ -420,8 +421,8 @@ public class PreferencesWin extends JFra +@@ -417,8 +418,8 @@ public class PreferencesWin extends JFra private void initComponentsI18n() { // JFormDesigner - Component i18n initialization - DO NOT MODIFY //GEN-BEGIN:initI18n @@ -29,7 +29,7 @@ Index: sikuli/IDE/pom.xml =================================================================== --- sikuli.orig/IDE/pom.xml +++ sikuli/IDE/pom.xml -@@ -105,6 +105,11 @@ +@@ -109,6 +109,11 @@ <version>1.2.1</version> </dependency> <dependency> diff --git a/debian/patches/tess3.patch b/debian/patches/tess3.patch deleted file mode 100644 index 41d88a5..0000000 --- a/debian/patches/tess3.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Tesseract 3.02 support - This patch applies against tesseract3 branch of sikuli to bring support - for the 3.02 version of tesseract. -Author: Gilles Filippini <[email protected]> -Index: sikuli/vision-proxy/src/tessocr.cpp -=================================================================== ---- sikuli.orig/Natives/src/main/native/Vision/tessocr.cpp 2013-10-19 16:09:02.000000000 +0200 -+++ sikuli/Natives/src/main/native/Vision/tessocr.cpp 2013-10-19 16:09:52.000000000 +0200 -@@ -404,7 +404,7 @@ - //we have to use setenv instead. - setenv("TESSDATA_PREFIX", datapath, 1); - #endif -- int ret = _tessAPI.Init(datapath, _lang.c_str()); -+ int ret = _tessAPI.Init(datapath, _lang.c_str(), OEM_TESSERACT_ONLY); - //cout << (ret==0?"done":"failed") << endl; - - // _tessAPI.SetAccuracyVSpeed(AVS_MOST_ACCURATE); // FIXME: doesn't work? diff --git a/debian/rules b/debian/rules index 99de67f..a40f4a6 100755 --- a/debian/rules +++ b/debian/rules @@ -59,7 +59,7 @@ clean:: # Because '--package=<package>' in debian/*.poms files doesn't work for # .substvars files. install/sikulix:: - ln IDE/target/sikulix-1.1.0.jar IDE/target/sikulix.jar + ln IDE/target/sikulix-1.1.1.jar IDE/target/sikulix.jar chmod a+x IDE/target/sikulix.jar cp debian/maven.ignoreRules.full debian/maven.ignoreRules mh_resolve_dependencies --non-interactive --offline -psikulix --base-directory=$(CURDIR) --non-explore -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
