This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 1dc5f1a6abd16983c682835302eaba380e11bf00 Author: Gilles Filippini <[email protected]> Date: Thu Oct 31 11:47:27 2013 +0100 Remove unneeded patches. --- debian/patches/executable-wrappers.patch | 26 ----- debian/patches/fix-cmake-sikuli-ide.patch | 15 --- debian/patches/gcc-4.7.patch | 16 --- debian/patches/series | 5 - debian/patches/tessdata.patch | 84 -------------- debian/patches/use-java-libs-from-debian.patch | 145 ------------------------ 6 files changed, 291 deletions(-) diff --git a/debian/patches/executable-wrappers.patch b/debian/patches/executable-wrappers.patch deleted file mode 100644 index 394ef1e..0000000 --- a/debian/patches/executable-wrappers.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix executable wrapper scripts - This patch fixes the sikuli-script and sikuli-ide wrapper script regarding - the installation on Debian. - Since we don't embed external libs we have to set classpath, python path - and jni path accordingly. - libconstantine-java isn't explicitly required but sikuli-script fails with: - ImportError: cannot import name newString - when it is missing. -Author: Gilles Filippini <[email protected]> -Index: sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh -=================================================================== ---- sikuli-1.0~x~rc3.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-13 17:45:14.000000000 +0200 -+++ sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-13 17:45:33.000000000 +0200 -@@ -1,3 +1,2 @@ - #!/bin/sh --DIR=`dirname $0` --LC_NUMERIC=C java -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -jar $DIR/sikuli-ide.jar $* -+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-id [...] -Index: sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh -=================================================================== ---- sikuli-1.0~x~rc3.orig/sikuli-script/target/sikuli-script.sh 2013-07-13 17:45:14.000000000 +0200 -+++ sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh 2013-07-13 17:45:14.000000000 +0200 -@@ -1,2 +1,2 @@ - #!/bin/sh --java -jar sikuli-script.jar $@ -+exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/sikuli-script.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.script.SikuliScript "$@" diff --git a/debian/patches/fix-cmake-sikuli-ide.patch b/debian/patches/fix-cmake-sikuli-ide.patch deleted file mode 100644 index 71426e5..0000000 --- a/debian/patches/fix-cmake-sikuli-ide.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix build-time dependencies for sikuli-ide -Author: Gilles Filippini <[email protected]> -Index: sikuli/sikuli-ide/CMakeLists.txt -=================================================================== ---- sikuli.orig/sikuli-ide/CMakeLists.txt 2011-10-04 23:27:53.000000000 +0200 -+++ sikuli/sikuli-ide/CMakeLists.txt 2011-10-04 23:32:05.000000000 +0200 -@@ -307,6 +307,8 @@ - ENDFOREACH(JAR ${INCLUDE_JARS}) - - -+get_filename_component(target ${JAR_FILE} NAME_WE) -+add_dependencies( include_${target} ${JAR_FILE}) - add_dependencies( app ${APP_FILE}) - - ## Language files diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch deleted file mode 100644 index ce052f2..0000000 --- a/debian/patches/gcc-4.7.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix FTBFS with gcc-4.7 -Author: Gilles Filippini <[email protected]> -Bug-Debian: http://bugs.debian.org/671990 -Index: sikuli/sikuli-script/src/main/native/sikuli-debug.h -=================================================================== ---- sikuli.orig/sikuli-script/src/main/native/sikuli-debug.h 2011-11-10 23:53:01.000000000 +0100 -+++ sikuli/sikuli-script/src/main/native/sikuli-debug.h 2012-05-11 23:34:39.000000000 +0200 -@@ -34,7 +34,7 @@ - std::basic_ios<cT, traits>(&m_sbuf), - std::basic_ostream<cT, traits>(&m_sbuf) - { -- init(&m_sbuf); -+ this->init(&m_sbuf); - } - - private: diff --git a/debian/patches/series b/debian/patches/series index 96e26bd..bbc5e4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,5 @@ -executable-wrappers.patch native.patch -use-java-libs-from-debian.patch install-extension.patch -fix-cmake-sikuli-ide.patch tess3.patch -tessdata.patch -gcc-4.7.patch no-opencv-surf-module.patch setTextAndMnemonic.patch diff --git a/debian/patches/tessdata.patch b/debian/patches/tessdata.patch deleted file mode 100644 index 2546c13..0000000 --- a/debian/patches/tessdata.patch +++ /dev/null @@ -1,84 +0,0 @@ -Description: Fix tessdata directory location - The default path for the tessdata parent directory should be set to - "/usr/share/tesseract-ocr/" except when overriden by the TESSDATA_PREFIX - environment variable. -Author: Gilles Filippini <[email protected]> -Bug-Debian: http://bugs.debian.org/667513 -Index: sikuli/sikuli-script/CMakeLists.txt -=================================================================== ---- sikuli.orig/sikuli-script/CMakeLists.txt 2012-04-15 22:14:18.000000000 +0200 -+++ sikuli/sikuli-script/CMakeLists.txt 2012-04-15 22:14:18.000000000 +0200 -@@ -156,7 +156,7 @@ - add_dependencies(${JAR_FILE} - ${JAR_FILE}.classes-in-jar - #${JAR_FILE}.python-src-in-jar -- ${JAR_FILE}.tessdata-in-jar -+ #${JAR_FILE}.tessdata-in-jar - #${JAR_FILE}.libs-in-jar - #${JAR_FILE}.includes-in-jar - #${JAR_FILE}.jython-in-jar -Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java -=================================================================== ---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java 2012-04-15 22:14:18.000000000 +0200 -+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java 2012-04-15 22:54:45.000000000 +0200 -@@ -11,6 +11,7 @@ - import java.util.Enumeration; - import java.util.List; - import java.util.LinkedList; -+import java.lang.System; - - import org.sikuli.script.natives.Mat; - import org.sikuli.script.natives.Vision; -@@ -40,19 +41,14 @@ - public void init(){ - Debug.info("Text Recognizer inited."); - try{ -- String path = ResourceExtractor.extract("tessdata"); -- // TESSDATA_PREFIX doesn't contain tessdata/ -- if(path.endsWith("tessdata/")) -- path = path.substring(0,path.length()-9); -+ String path = System.getenv("TESSDATA_PREFIX"); - Settings.OcrDataPath = path; - Debug.log(3, "OCR data path: " + path); - - Vision.initOCR(Settings.OcrDataPath); - _init_succeeded = true; - } -- catch(IOException e){ -- e.printStackTrace(); -- }catch(Exception e){ -+ catch(Exception e){ - e.printStackTrace(); - } - } -Index: sikuli/sikuli-script/src/main/native/tessocr.cpp -=================================================================== ---- sikuli.orig/sikuli-script/src/main/native/tessocr.cpp 2012-04-15 22:14:18.000000000 +0200 -+++ sikuli/sikuli-script/src/main/native/tessocr.cpp 2012-04-16 00:11:53.000000000 +0200 -@@ -362,7 +362,7 @@ - } - - bool OCR::isInitialized = false; --string OCR::_datapath = "tessdata"; -+string OCR::_datapath = "/usr/share/tesseract-ocr/"; - string OCR::_lang = "eng"; - - void OCR::setParameter(std::string param, std::string value){ -@@ -394,16 +394,8 @@ - if (isInitialized) - return; - -- _datapath = datapath; -+ if (datapath) _datapath = datapath; - --#ifdef WIN32 -- string env_datapath = string("TESSDATA_PREFIX=") + string(datapath); -- putenv(const_cast<char*>(env_datapath.c_str())); --#else -- //putenv on Mac breaks the "open" command somehow. -- //we have to use setenv instead. -- setenv("TESSDATA_PREFIX", datapath, 1); --#endif - int ret = _tessAPI.Init(datapath, _lang.c_str(), OEM_TESSERACT_ONLY); - //cout << (ret==0?"done":"failed") << endl; - diff --git a/debian/patches/use-java-libs-from-debian.patch b/debian/patches/use-java-libs-from-debian.patch deleted file mode 100644 index 2b1a94e..0000000 --- a/debian/patches/use-java-libs-from-debian.patch +++ /dev/null @@ -1,145 +0,0 @@ -Description: Adapt the build process to use Debian java libraries - The upstream makefiles rely on embedded java libraries. This patch - tweak the makefiles to use instead the same libraries provided by - Debian packages from Build-Depends. -Author: Gilles Filippini <[email protected]> -Index: sikuli/sikuli-ide/CMakeLists.txt -=================================================================== ---- sikuli.orig/sikuli-ide/CMakeLists.txt 2011-11-10 23:53:01.000000000 +0100 -+++ sikuli/sikuli-ide/CMakeLists.txt 2012-02-13 23:18:35.000000000 +0100 -@@ -41,13 +41,13 @@ - SET(TEST_CLASS_DIR "${CMAKE_BINARY_DIR}/test") - - SET(SIKULI_SCRIPT_JAR "${COMMON_LIB_DIR}/sikuli-script.jar") --SET(JUNIT_JAR "${COMMON_LIB_DIR}/junit-3.8.1.jar") --SET(SWING_LAYOUT_JAR "${COMMON_LIB_DIR}/swing-layout-1.0.1.jar") --SET(COMMONS_CLI_JAR "${COMMON_LIB_DIR}/commons-cli-1.2.jar") --SET(JSON_SIMPLE_JAR "${COMMON_LIB_DIR}/json_simple-1.1.jar") --SET(SWINGX_JAR "${COMMON_LIB_DIR}/swingx-core-1.6.2.jar") --SET(MAC_WIDGETS_JAR "${COMMON_LIB_DIR}/mac_widgets.jar") --SET(FORMS_JAR "${COMMON_LIB_DIR}/forms-1.2.1.jar") -+SET(JUNIT_JAR "/usr/share/java/junit.jar") -+SET(SWING_LAYOUT_JAR "/usr/share/java/swing-layout.jar") -+SET(COMMONS_CLI_JAR "/usr/share/java/commons-cli.jar") -+SET(JSON_SIMPLE_JAR "/usr/share/java/json_simple.jar") -+SET(SWINGX_JAR "/usr/share/java/swingx-core.jar") -+SET(MAC_WIDGETS_JAR "/usr/share/java/mac_widgets.jar") -+SET(FORMS_JAR "/usr/share/java/forms.jar") - - - FILE(MAKE_DIRECTORY ${BINARY_DIR}) -@@ -79,7 +79,7 @@ - SET(ARGS "") - - SET(CLASSPATH -- ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR} -+ ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}/usr/share/java/jython.jar - ) - - SET(JAR_FILE sikuli-ide.jar) -@@ -87,7 +87,7 @@ - - IF(LINUX) - SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-linux.MF) -- SET(CLASSPATH ${CLASSPATH}${SEP}${JXGRABKEY_JAR}) -+ #SET(CLASSPATH ${CLASSPATH}${SEP}${JXGRABKEY_JAR}) - ELSEIF(WIN32) - SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-win32.MF) - #SET(CLASSPATH ${CLASSPATH}${SEP}${JINTELLITYPE_JAR}) -@@ -168,7 +168,7 @@ - SET(FRAMEWORKS_IN_APP_DIR ${JAR_IN_APP_DIR}/libs) - SET(JAR_LIB_DIR ${JAR_DIR}/META-INF/lib) - -- LIST(APPEND INCLUDE_JARS ${JXGRABKEY_JAR}) -+ #LIST(APPEND INCLUDE_JARS ${JXGRABKEY_JAR}) - SET(jnilibs "") - FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.so") - LIST(APPEND jnilibs ${sikuli_script_jnilibs}) -@@ -224,7 +224,6 @@ - add_custom_target( ${APP_FILE}.framework - COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR} - COMMAND cp ${jnilibs} ${FRAMEWORKS_IN_APP_DIR} -- COMMAND cp ${LIB_GRABKEY} ${FRAMEWORKS_IN_APP_DIR}/libJXGrabKey.so - COMMENT "Packaging Frameworks in App" - ) - add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) -@@ -239,7 +238,7 @@ - SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jintellitype-1.3.6/JIntellitype.dll") - add_custom_target( ${JAR_FILE}.framework - COMMAND ${CMAKE_COMMAND} -E make_directory ${JAR_LIB_DIR} -- COMMAND ${CMAKE_COMMAND} -E copy ${LIB_GRABKEY} ${JAR_LIB_DIR}/ -+ #COMMAND ${CMAKE_COMMAND} -E copy ${LIB_GRABKEY} ${JAR_LIB_DIR}/ - COMMENT "Packaging Frameworks in Jar" - ) - add_dependencies( ${JAR_FILE} ${JAR_FILE}.framework ) -Index: sikuli/sikuli-script/CMakeLists.txt -=================================================================== ---- sikuli.orig/sikuli-script/CMakeLists.txt 2012-02-13 22:43:36.000000000 +0100 -+++ sikuli/sikuli-script/CMakeLists.txt 2012-02-13 23:18:35.000000000 +0100 -@@ -38,8 +38,7 @@ - SET(COMMON_LIB_DIR "${BASE_DIR}/../lib") - - # dependent libs --SET(JXGRABKEY_JAR "${COMMON_LIB_DIR}/jxgrabkey/lib/JXGrabKey.jar") --SET(JINTELLITYPE_JAR "${COMMON_LIB_DIR}/jintellitype-1.3.6/jintellitype-1.3.6.jar") -+SET(JXGRABKEY_JAR "/usr/share/java/JXGrabKey.jar") - - #SET(INCLUDE_LIB_DIR "${BASE_DIR}/lib") - SET(INCLUDE_LIB_DIR "${COMMON_LIB_DIR}/mx-native-loader-1.2/target/classes") -@@ -51,10 +50,10 @@ - SET(JAR_DIR "${CMAKE_BINARY_DIR}/jar") - SET(JAR_LIB_DIR ${JAR_DIR}/META-INF/lib) - --SET(JUNIT_JAR "${COMMON_LIB_DIR}/junit-4.8.2.jar") --SET(MOCKITO_JAR "${COMMON_LIB_DIR}/mockito-all-1.8.5.jar") --SET(JYTHON_JAR "${COMMON_LIB_DIR}/jython-2.5.2.jar") --SET(JYTHON_LIB_FILE "${COMMON_LIB_DIR}/jython-lib-2.5.2.tgz") -+SET(JUNIT_JAR "/usr/share/java/junit.jar") -+#SET(MOCKITO_JAR "/usr/share/java/mockito-all.jar") -+SET(JYTHON_JAR "/usr/share/java/jython.jar") -+#SET(JYTHON_LIB_FILE "${COMMON_LIB_DIR}/jython-lib-2.5.2.tgz") - - SET(CLASSPATH - ${INCLUDE_LIB_DIR}${SEP}${JYTHON_JAR}${SEP}. -@@ -156,12 +155,12 @@ - - add_dependencies(${JAR_FILE} - ${JAR_FILE}.classes-in-jar -- ${JAR_FILE}.python-src-in-jar -+ #${JAR_FILE}.python-src-in-jar - ${JAR_FILE}.tessdata-in-jar -- ${JAR_FILE}.libs-in-jar -- ${JAR_FILE}.includes-in-jar -- ${JAR_FILE}.jython-in-jar -- ${JAR_FILE}.jython-libs-in-jar -+ #${JAR_FILE}.libs-in-jar -+ #${JAR_FILE}.includes-in-jar -+ #${JAR_FILE}.jython-in-jar -+ #${JAR_FILE}.jython-libs-in-jar - ) - - IF(WIN32) -@@ -196,9 +195,9 @@ - ) - ENDIF() - -- add_dependencies(${JAR_FILE} -- ${JAR_FILE}.jxgrabkey-in-jar -- ) -+# add_dependencies(${JAR_FILE} -+# ${JAR_FILE}.jxgrabkey-in-jar -+# ) - ENDIF(LINUX) - - IF(LINUX) -@@ -213,8 +212,8 @@ - COMMENT "Packaging JXGrabKey in Jar" - ) - ENDIF(LINUX) --add_dependencies( ${JAR_FILE} ${JAR_FILE}.hotkey-lib ) --add_dependencies( ${JAR_FILE}.libs-in-jar ${JAR_FILE}.hotkey-lib ) -+#add_dependencies( ${JAR_FILE} ${JAR_FILE}.hotkey-lib ) -+#add_dependencies( ${JAR_FILE}.libs-in-jar ${JAR_FILE}.hotkey-lib ) - - - ADD_SUBDIRECTORY(${JAVA_SRC_DIR}) -- 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
