[sikuli] 03/08: Adapt patches to the new source tree
Gilles Filippini
pini at moszumanska.debian.org
Sun Oct 26 22:21:42 GMT 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit 02d22fc70cd907e5976b0bff415a9810010bce4c
Author: Gilles Filippini <pini at debian.org>
Date: Mon Oct 6 21:36:34 2014 +0200
Adapt patches to the new source tree
---
debian/patches/add-classpath.patch | 4 +-
debian/patches/autotoolize-vision-proxy.patch | 231 ++++++++++++------------
debian/patches/basics-exclude-windows-mac.patch | 38 ++--
debian/patches/drop-useless-resources.patch | 30 +--
debian/patches/install-extension.patch | 8 +-
debian/patches/jruby-compat-1.9.patch | 8 +-
debian/patches/native.patch | 135 ++++++++------
debian/patches/no-maven-repo-dependencies.patch | 51 ++----
debian/patches/pom-removed-modules.patch | 35 ++--
debian/patches/python-shebang.patch | 6 +-
debian/patches/series | 2 +-
debian/patches/setTextAndMnemonic.patch | 36 ++--
12 files changed, 284 insertions(+), 300 deletions(-)
diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch
index 47ef81d..68327ea 100644
--- a/debian/patches/add-classpath.patch
+++ b/debian/patches/add-classpath.patch
@@ -5,8 +5,8 @@ Index: sikuli/pom.xml
===================================================================
--- sikuli.orig/pom.xml
+++ sikuli/pom.xml
-@@ -254,6 +254,24 @@
- </modules>
+@@ -135,6 +135,24 @@
+ </modules>
<build>
+ <pluginManagement>
diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch
index fd54f25..8e43858 100644
--- a/debian/patches/autotoolize-vision-proxy.patch
+++ b/debian/patches/autotoolize-vision-proxy.patch
@@ -1,44 +1,90 @@
Description: Use autotools to build the VisionProxy JNI
and the associated swig glue.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac
+Index: sikuli/Libsvision/pom.xml
===================================================================
---- /dev/null
-+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/configure.ac
-@@ -0,0 +1,29 @@
-+AC_INIT(sikulix-vision-proxy,1.0.1)
-+
-+# Compute the canonical host-system type variable, host, and its three
-+# individual parts host_cpu, host_vendor, and host_os.
-+AC_CANONICAL_HOST
-+
-+# Determine a C++ compiler to use. Check whether the environment variable
-+# CXX or CCC (in that order) is set; if so, then set output variable CXX
-+# to its value.
-+AC_PROG_CC
-+AC_PROG_CXX
-+AC_LANG(C++)
-+
-+AC_ENABLE_SHARED
-+AC_DISABLE_STATIC
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_PROG_LIBTOOL
-+
-+AM_INIT_AUTOMAKE([foreign subdir-objects])
-+AC_CONFIG_FILES([Makefile])
-+
-+PKG_CHECK_MODULES([OpenCV], [opencv])
-+AC_CHECK_HEADERS([tesseract/capi.h],,AC_MSG_ERROR([header for tesseract not found!]))
-+AC_CHECK_LIB([tesseract],[TessVersion],,AC_MSG_ERROR([cannot link to tesseract!]))
-+
-+AC_CHECK_PROG([SWIG],[swig],[swig])
-+test -n "$SWIG" || AC_MSG_ERROR([swig not found!])
-+
-+AC_OUTPUT
-Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
+--- sikuli.orig/Libsvision/pom.xml
++++ sikuli/Libsvision/pom.xml
+@@ -24,6 +24,75 @@
+ <build>
+ <plugins>
+ <plugin>
++ <groupId>org.codehaus.mojo</groupId>
++ <artifactId>exec-maven-plugin</artifactId>
++ <version>1.1.1</version>
++ <executions>
++ <execution>
++ <id>configure</id>
++ <phase>validate</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/bin/sh</executable>
++ <arguments>
++ <argument>-c</argument>
++ <argument>
++set -e
++cd src/main/native/Vision
++mkdir -p m4
++autoreconf -i
++automake
++./configure $VP_CONFIGURE_FLAGS
++ </argument>
++ </arguments>
++ </configuration>
++ </execution>
++ <execution>
++ <id>make-all</id>
++ <phase>generate-sources</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/usr/bin/make</executable>
++ <arguments>
++ <argument>-C</argument>
++ <argument>src/main/native/Vision</argument>
++ <argument>all</argument>
++ </arguments>
++ </configuration>
++ </execution>
++ <execution>
++ <id>make-install</id>
++ <phase>package</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/usr/bin/make</executable>
++ <arguments>
++ <argument>-C</argument>
++ <argument>src/main/native/Vision</argument>
++ <argument>install</argument>
++ </arguments>
++ </configuration>
++ </execution>
++ <execution>
++ <id>make-clean</id>
++ <phase>clean</phase>
++ <goals><goal>exec</goal></goals>
++ <configuration>
++ <executable>/bin/sh</executable>
++ <arguments>
++ <argument>-c</argument>
++ <argument>
++set -e
++cd src/main/native/Vision
++[ ! -f Makefile ] || /usr/bin/make clean
++rm -fr configure Makefile Makefile.in aclocal.m4 m4 config.* compile missing libtool ltmain.sh install-sh depcomp
++ </argument>
++ </arguments>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+Index: sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
===================================================================
--- /dev/null
-+++ sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
++++ sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
@@ -0,0 +1,32 @@
+ACLOCAL_AMFLAGS = -I m4
+
@@ -53,7 +99,7 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
+libVisionProxy_la_LDFLAGS = -module -avoid-version -shared
+
+SWIGSRC := vision.swig
-+SWIGOUT := ../../java/org/sikuli/natives
++SWIGOUT := ../../org/sikuli/natives
+SWIGJAVAFILES := DebugCategories.java FindInput.java FindResult.java FindResults.java Mat.java \
+ OCR.java OCRChar.java OCRChars.java OCRLine.java OCRLines.java OCRParagraph.java \
+ OCRParagraphs.java OCRRect.java OCRText.java OCRWord.java OCRWords.java \
@@ -72,86 +118,37 @@ Index: sikuli-1.1.0~beta1/Natives/src/main/native/Vision/Makefile.am
+cleanswig:
+ cd $(SWIGOUT) && rm -f $(SWIGJAVAFILES)
+ rm -f *.cxx
-Index: sikuli-1.1.0~beta1/Natives/pom.xml
+Index: sikuli/Libsvision/src/main/java/native/Vision/configure.ac
===================================================================
---- sikuli-1.1.0~beta1.orig/Natives/pom.xml
-+++ sikuli-1.1.0~beta1/Natives/pom.xml
-@@ -33,5 +33,78 @@
-
- <build>
- <defaultGoal>clean install</defaultGoal>
-+ <finalName>sikulix-vision-proxy</finalName>
+--- /dev/null
++++ sikuli/Libsvision/src/main/java/native/Vision/configure.ac
+@@ -0,0 +1,29 @@
++AC_INIT(sikulix-vision-proxy,1.0.1)
+
-+ <plugins>
-+ <plugin>
-+ <groupId>org.codehaus.mojo</groupId>
-+ <artifactId>exec-maven-plugin</artifactId>
-+ <version>1.1.1</version>
-+ <executions>
-+ <execution>
-+ <id>configure</id>
-+ <phase>validate</phase>
-+ <goals><goal>exec</goal></goals>
-+ <configuration>
-+ <executable>/bin/sh</executable>
-+ <arguments>
-+ <argument>-c</argument>
-+ <argument>
-+set -e
-+cd src/main/native/Vision
-+mkdir -p m4
-+autoreconf -i
-+automake
-+./configure $VP_CONFIGURE_FLAGS
-+ </argument>
-+ </arguments>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>make-all</id>
-+ <phase>generate-sources</phase>
-+ <goals><goal>exec</goal></goals>
-+ <configuration>
-+ <executable>/usr/bin/make</executable>
-+ <arguments>
-+ <argument>-C</argument>
-+ <argument>src/main/native/Vision</argument>
-+ <argument>all</argument>
-+ </arguments>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>make-install</id>
-+ <phase>package</phase>
-+ <goals><goal>exec</goal></goals>
-+ <configuration>
-+ <executable>/usr/bin/make</executable>
-+ <arguments>
-+ <argument>-C</argument>
-+ <argument>src/main/native/Vision</argument>
-+ <argument>install</argument>
-+ </arguments>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>make-clean</id>
-+ <phase>clean</phase>
-+ <goals><goal>exec</goal></goals>
-+ <configuration>
-+ <executable>/bin/sh</executable>
-+ <arguments>
-+ <argument>-c</argument>
-+ <argument>
-+set -e
-+cd src/main/native/Vision
-+[ ! -f Makefile ] || /usr/bin/make clean
-+rm -fr configure Makefile Makefile.in aclocal.m4 m4 config.* compile missing libtool ltmain.sh install-sh depcomp
-+ </argument>
-+ </arguments>
-+ </configuration>
-+ </execution>
-+ </executions>
-+ </plugin>
-+ </plugins>
- </build>
- </project>
++# Compute the canonical host-system type variable, host, and its three
++# individual parts host_cpu, host_vendor, and host_os.
++AC_CANONICAL_HOST
++
++# Determine a C++ compiler to use. Check whether the environment variable
++# CXX or CCC (in that order) is set; if so, then set output variable CXX
++# to its value.
++AC_PROG_CC
++AC_PROG_CXX
++AC_LANG(C++)
++
++AC_ENABLE_SHARED
++AC_DISABLE_STATIC
++AC_CONFIG_MACRO_DIR([m4])
++AC_PROG_LIBTOOL
++
++AM_INIT_AUTOMAKE([foreign subdir-objects])
++AC_CONFIG_FILES([Makefile])
++
++PKG_CHECK_MODULES([OpenCV], [opencv])
++AC_CHECK_HEADERS([tesseract/capi.h],,AC_MSG_ERROR([header for tesseract not found!]))
++AC_CHECK_LIB([tesseract],[TessVersion],,AC_MSG_ERROR([cannot link to tesseract!]))
++
++AC_CHECK_PROG([SWIG],[swig],[swig])
++test -n "$SWIG" || AC_MSG_ERROR([swig not found!])
++
++AC_OUTPUT
diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch
index ecf07c1..7e7ca7b 100644
--- a/debian/patches/basics-exclude-windows-mac.patch
+++ b/debian/patches/basics-exclude-windows-mac.patch
@@ -2,53 +2,53 @@ 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 at debian>
-Index: sikuli/Basics/pom.xml
+Index: sikuli/API/pom.xml
===================================================================
---- sikuli.orig/Basics/pom.xml
-+++ sikuli/Basics/pom.xml
-@@ -102,6 +102,20 @@
- <mainClass>org.sikuli.basics.RunSetup</mainClass>
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
+@@ -90,6 +90,20 @@
</configuration>
</plugin>
-+ <plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>debian</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <excludes>
+ <exclude>**/basics/WindowsHotkeyManager.java</exclude>
-+ <exclude>**/basics/WinUtil.java</exclude>
+ <exclude>**/basics/MacHotkeyManager.java</exclude>
-+ <exclude>**/basics/MacUtil.java</exclude>
+ <exclude>**/basics/SysJNA.java</exclude>
++ <exclude>**/natives/WinUtil.java</exclude>
++ <exclude>**/natives/MacUtil.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
- </plugins>
- </build>
- </project>
-Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
++ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <configuration>
+Index: sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
===================================================================
---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
-+++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
-@@ -474,17 +474,17 @@ public class ResourceLoader implements I
+--- sikuli.orig/API/src/main/java/org/sikuli/basics/ResourceLoader.java
++++ sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
+@@ -539,17 +539,17 @@ public class ResourceLoader {
log(lvl, "trying: " + path);
- if (Settings.isWindows()) {
+ if (Settings.isWindows() && !initDone) {
log(lvl, "Running on Windows - checking system path!");
- String syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
+ String syspath = "";
if (syspath == null) {
- SikuliX.terminate(1);
+ Sikulix.terminate(999);
} else {
path = (new File(path).getAbsolutePath()).replaceAll("/", "\\");
if (!syspath.toUpperCase().contains(path.toUpperCase())) {
- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", path + ";" + syspath)) {
+ if (true) {
- SikuliX.terminate(1);
+ Sikulix.terminate(999);
}
log(lvl, "Added libs dir to path: " + path);
- syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
+ syspath = "";
if (!syspath.toUpperCase().contains(path.toUpperCase())) {
log(-1, "Adding to path did not work:\n%s", syspath);
- System.exit(1);
+ Sikulix.terminate(999);
diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch
index aa0e169..028f38b 100644
--- a/debian/patches/drop-useless-resources.patch
+++ b/debian/patches/drop-useless-resources.patch
@@ -1,10 +1,10 @@
Description: exclude useless resources from jar files.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/Basics/pom.xml
+Index: sikuli/API/pom.xml
===================================================================
---- sikuli.orig/Basics/pom.xml
-+++ sikuli/Basics/pom.xml
-@@ -80,6 +80,9 @@
+--- sikuli.orig/API/pom.xml
++++ sikuli/API/pom.xml
+@@ -64,6 +64,9 @@
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
@@ -12,23 +12,5 @@ Index: sikuli/Basics/pom.xml
+ <exclude>Commands/**</exclude>
+ </excludes>
</resource>
- </resources>
- <plugins>
-Index: sikuli/API/pom.xml
-===================================================================
---- sikuli.orig/API/pom.xml
-+++ sikuli/API/pom.xml
-@@ -64,5 +64,13 @@
- </configuration>
- </plugin>
- </plugins>
-+ <resources>
-+ <resource>
-+ <directory>src/main/resources</directory>
-+ <excludes>
-+ <exclude>might-be-obsolete/**</exclude>
-+ </excludes>
-+ </resource>
-+ </resources>
- </build>
- </project>
+ <resource>
+ <directory>
diff --git a/debian/patches/install-extension.patch b/debian/patches/install-extension.patch
index e97e3a7..8d91c11 100644
--- a/debian/patches/install-extension.patch
+++ b/debian/patches/install-extension.patch
@@ -1,11 +1,11 @@
Description: Fix extensions installation in user space
Patch introduced for release 1.0~x~rc2. Forgot what the rationals are.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java
+Index: sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java
===================================================================
---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:33:08.000000000 +0200
-+++ sikuli/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:55:19.000000000 +0200
-@@ -60,12 +60,16 @@
+--- sikuli.orig/API/src/main/java/org/sikuli/basics/ExtensionManager.java
++++ sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java
+@@ -60,12 +60,16 @@ public class ExtensionManager {
if (targetFile.exists()) {
targetFile.delete();
}
diff --git a/debian/patches/jruby-compat-1.9.patch b/debian/patches/jruby-compat-1.9.patch
index f1e7f70..1bd659d 100644
--- a/debian/patches/jruby-compat-1.9.patch
+++ b/debian/patches/jruby-compat-1.9.patch
@@ -1,11 +1,11 @@
Description: Force Ruby 1.9 compatibility
Because JRuby is stuck at version 1.5.6 in Debian.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
===================================================================
---- sikuli.orig/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
-+++ sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
-@@ -441,7 +441,7 @@ public class JRubyScriptRunner implement
+--- sikuli.orig/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
++++ sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+@@ -440,7 +440,7 @@ public class JRubyScriptRunner implement
interpreter = new ScriptingContainer(
LocalContextScope.THREADSAFE);
diff --git a/debian/patches/native.patch b/debian/patches/native.patch
index 6a0038f..7db98e9 100644
--- a/debian/patches/native.patch
+++ b/debian/patches/native.patch
@@ -4,24 +4,11 @@ Description: Use System's native library loader
libraries are shipped in their own binary package and we use the standard
native library loader.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/script/Finder.java
-+++ sikuli/API/src/main/java/org/sikuli/script/Finder.java
-@@ -36,7 +36,7 @@ public class Finder implements Iterator<
- private boolean repeating = false;
-
- static {
-- FileManager.loadLibrary("VisionProxy");
-+ System.loadLibrary("VisionProxy");
- }
-
- /**
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
-@@ -29,7 +29,7 @@ public class TextRecognizer {
+@@ -30,7 +30,7 @@ public class TextRecognizer {
private static boolean _init_succeeded = false;
static {
@@ -30,46 +17,6 @@ Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java
}
private TextRecognizer() {
-Index: sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
-===================================================================
---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
-+++ sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
-@@ -12,7 +12,7 @@ import jxgrabkey.JXGrabKey;
-
- public class LinuxHotkeyManager extends HotkeyManager {
- static{
-- FileManager.loadLibrary("JXGrabKey");
-+ System.loadLibrary("JXGrabKey");
- }
-
- class HotkeyData {
-Index: sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java
-===================================================================
---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/VDictProxy.java
-+++ sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java
-@@ -18,7 +18,7 @@ public class VDictProxy<T> {
- private Map<Integer, T> _i2obj = new HashMap<Integer, T>();
-
- static {
-- FileManager.loadLibrary("VDictProxy");
-+ System.loadLibrary("VDictProxy");
- }
-
- public VDictProxy(){
-Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
-===================================================================
---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
-+++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
-@@ -150,6 +150,9 @@ public class ResourceLoader implements I
- public void check(String what) {
- mem = "check";
-
-+ if (what.equals(Settings.SIKULI_LIB)) {
-+ return;
-+ }
- if (!what.equals(Settings.SIKULI_LIB)) {
- log(-1, "Currently only Sikuli libs supported!");
- return;
Index: sikuli/API/src/main/java/org/sikuli/script/App.java
===================================================================
--- sikuli.orig/API/src/main/java/org/sikuli/script/App.java
@@ -87,7 +34,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
+@@ -53,7 +53,7 @@ public class Screen extends Region imple
//<editor-fold defaultstate="collapsed" desc="Initialization">
static {
@@ -96,3 +43,81 @@ Index: sikuli/API/src/main/java/org/sikuli/script/Screen.java
initScreens(false);
}
+Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/script/Finder.java
++++ sikuli/API/src/main/java/org/sikuli/script/Finder.java
+@@ -36,7 +36,7 @@ public class Finder implements Iterator<
+ private boolean repeating = false;
+
+ static {
+- FileManager.loadLibrary("VisionProxy");
++ System.loadLibrary("VisionProxy");
+ }
+
+ private static String me = "Finder: ";
+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
+@@ -12,7 +12,7 @@ import jxgrabkey.JXGrabKey;
+
+ public class LinuxHotkeyManager extends HotkeyManager {
+ static{
+- FileManager.loadLibrary("JXGrabKey");
++ System.loadLibrary("JXGrabKey");
+ }
+
+ class HotkeyData {
+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
+@@ -20,7 +20,7 @@ public class MacHotkeyManager extends Ho
+ static final int CARBON_MASK_CTRL = 0x1000;
+
+ static {
+- FileManager.loadLibrary("MacHotkeyManager");
++ System.loadLibrary("MacHotkeyManager");
+ }
+
+ @Override
+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
+@@ -18,7 +18,7 @@ public class VDictProxy<T> {
+ private Map<Integer, T> _i2obj = new HashMap<Integer, T>();
+
+ static {
+- FileManager.loadLibrary("VDictProxy");
++ System.loadLibrary("VDictProxy");
+ }
+
+ public VDictProxy(){
+Index: sikuli/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
+===================================================================
+--- sikuli.orig/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
++++ sikuli/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
+@@ -70,7 +70,7 @@ public class VNCScreen extends Region im
+ //Screen Methods**************************************************************/
+
+ static{
+- FileManager.loadLibrary("VisionProxy");
++ System.loadLibrary("VisionProxy");
+ initScreens(false);
+ }
+
+Index: sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/basics/ResourceLoader.java
++++ sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
+@@ -170,6 +170,8 @@ public class ResourceLoader {
+ log(-1, "Currently only Sikuli libs supported!");
+ return false;
+ }
++ // Debian package: do nothing
++ return;
+
+ if (initDone) {
+ return true;
diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch
index eb04538..db0fdb9 100644
--- a/debian/patches/no-maven-repo-dependencies.patch
+++ b/debian/patches/no-maven-repo-dependencies.patch
@@ -1,41 +1,24 @@
Description: Add system scope for not yet mavenized dependencies
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/Jython/pom.xml
-===================================================================
---- sikuli.orig/Jython/pom.xml
-+++ sikuli/Jython/pom.xml
-@@ -41,6 +41,8 @@
- <groupId>org.python</groupId>
- <artifactId>jython-standalone</artifactId>
- <version>2.7-b1</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/jython.jar</systemPath>
- </dependency>
- </dependencies>
-
Index: sikuli/IDE/pom.xml
===================================================================
--- sikuli.orig/IDE/pom.xml
+++ sikuli/IDE/pom.xml
-@@ -62,6 +62,8 @@
- <groupId>com.explodingpixels</groupId>
- <artifactId>mac_widgets</artifactId>
- <version>0.9.5</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/mac_widgets.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.sikuli</groupId>
-Index: sikuli/API/pom.xml
-===================================================================
---- sikuli.orig/API/pom.xml
-+++ sikuli/API/pom.xml
@@ -37,6 +37,8 @@
- <groupId>org.sikuli</groupId>
- <artifactId>OpenCV4SikuliX</artifactId>
- <version>2.4.8</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/opencv.jar</systemPath>
- </dependency>
- </dependencies>
-
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>${sikulixjythonversion}</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/jython.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+@@ -67,6 +69,8 @@
+ <groupId>com.explodingpixels</groupId>
+ <artifactId>mac_widgets</artifactId>
+ <version>0.9.5</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/mac_widgets.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.sikulix</groupId>
diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch
index f375d93..10791ad 100644
--- a/debian/patches/pom-removed-modules.patch
+++ b/debian/patches/pom-removed-modules.patch
@@ -4,35 +4,32 @@ Index: sikuli/pom.xml
===================================================================
--- sikuli.orig/pom.xml
+++ sikuli/pom.xml
-@@ -231,24 +231,13 @@
+@@ -117,21 +117,12 @@
<modules>
- <module>Jygments4SikuliX</module>
-- <module>OpenCV4SikuliX</module>
- <module>Tesseract4SikuliX</module>
-- <module>Libs</module>
- <module>Natives</module>
- <module>Basics</module>
-- <module>Setup</module>
- <module>Jython</module>
-- <module>JythonFat</module>
- <module>JRuby</module>
-- <module>JRubyFat</module>
-- <module>JRubyGem</module>
+ <module>Libsvision</module>
+- <module>Libslux</module>
+- <module>Libsmac</module>
+- <module>Libswin</module>
<module>API</module>
- <module>APIFat</module>
-- <module>APIFatReady</module>
+ <module>Jygments4SikuliX</module>
<module>IDE</module>
- <module>IDEFat</module>
+- <module>Setup</module>
- <module>MacApp</module>
- <module>Tesseract</module>
+ <module>Tesseract4SikuliX</module>
<module>Remote</module>
<module>Guide</module>
- </modules>
-@@ -308,4 +297,4 @@
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository> -->
- </distributionManagement>
+- <module>TestRunMaven</module>
+ </modules>
+
+ <build>
+@@ -166,4 +157,4 @@
+ </plugin>
+ </plugins>
+ </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/debian/patches/python-shebang.patch b/debian/patches/python-shebang.patch
index 4773ff1..ddd5d2d 100644
--- a/debian/patches/python-shebang.patch
+++ b/debian/patches/python-shebang.patch
@@ -1,8 +1,8 @@
Description: Fix '/usr/bin/env python' shebang
-Index: sikuli/Jython/src/main/resources/scripts/sikuli2html.py
+Index: sikuli/API/src/main/resources/scripts/sikuli2html.py
===================================================================
---- sikuli.orig/Jython/src/main/resources/scripts/sikuli2html.py
-+++ sikuli/Jython/src/main/resources/scripts/sikuli2html.py
+--- sikuli.orig/API/src/main/resources/scripts/sikuli2html.py
++++ sikuli/API/src/main/resources/scripts/sikuli2html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
diff --git a/debian/patches/series b/debian/patches/series
index c96347e..f8e6d63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@ add-classpath.patch
pom-removed-modules.patch
jruby-compat-1.9.patch
python-shebang.patch
-no-gem-maven-plugin.patch
+#no-gem-maven-plugin.patch
diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch
index 0f7ad2c..091df4f 100644
--- a/debian/patches/setTextAndMnemonic.patch
+++ b/debian/patches/setTextAndMnemonic.patch
@@ -4,9 +4,9 @@ Author: Gilles Filippini <pini at debian.org>
Bug-Debian: http://bugs.debian.org/711310
Index: sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java
===================================================================
---- sikuli.orig/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java 2014-05-06 08:10:35.295565662 +0200
-+++ sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java 2014-05-06 08:10:35.287565612 +0200
-@@ -8,6 +8,7 @@
+--- 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;
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 @@
+@@ -420,8 +421,8 @@ public class PreferencesWin extends JFra
private void initComponentsI18n() {
// JFormDesigner - Component i18n initialization - DO NOT MODIFY //GEN-BEGIN:initI18n
@@ -27,17 +27,17 @@ Index: sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java
_lblDelaySecs.setText(SikuliIDEI18N._I("prefSeconds"));
Index: sikuli/IDE/pom.xml
===================================================================
---- sikuli.orig/IDE/pom.xml 2014-05-06 08:10:35.295565662 +0200
-+++ sikuli/IDE/pom.xml 2014-05-06 08:10:35.287565612 +0200
-@@ -54,6 +54,11 @@
- <version>1.2.1</version>
- </dependency>
- <dependency>
-+ <groupId>com.jgoodies</groupId>
-+ <artifactId>common</artifactId>
-+ <version>1.4.0</version>
-+ </dependency>
-+ <dependency>
- <groupId>com.explodingpixels</groupId>
- <artifactId>mac_widgets</artifactId>
- <version>0.9.5</version>
+--- sikuli.orig/IDE/pom.xml
++++ sikuli/IDE/pom.xml
+@@ -59,6 +59,11 @@
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
++ <groupId>com.jgoodies</groupId>
++ <artifactId>common</artifactId>
++ <version>1.4.0</version>
++ </dependency>
++ <dependency>
+ <groupId>com.explodingpixels</groupId>
+ <artifactId>mac_widgets</artifactId>
+ <version>0.9.5</version>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git
More information about the pkg-java-commits
mailing list