Fix pyload (SynoCommunity#2259) and update tesseract-ocr

hgy59 · Jun 19, 2020 · 3874ac6 · 3874ac6
1 parent f65029d
commit 3874ac6
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 37 deletions.
diff --git a/cross/leptonica/Makefile b/cross/leptonica/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = leptonica
-PKG_VERS = 1.72
+PKG_VERS = 1.78.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://leptonica.org/source
@@ -15,4 +15,3 @@ GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --disable-static
 
 include ../../mk/spksrc.cross-cc.mk
-
diff --git a/cross/leptonica/PLIST b/cross/leptonica/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/liblept.so
-lnk:lib/liblept.so.4
-lib:lib/liblept.so.4.0.3
+lnk:lib/liblept.so.5
+lib:lib/liblept.so.5.0.3
diff --git a/cross/leptonica/digests b/cross/leptonica/digests
@@ -1,3 +1,3 @@
-leptonica-1.72.tar.gz SHA1 5b363dcb1009db4cd3408a670ccb6b6cb73feea7
-leptonica-1.72.tar.gz SHA256 79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56
-leptonica-1.72.tar.gz MD5 7581db29f8442197ce68e766c6047c4b
+leptonica-1.78.0.tar.gz SHA1 ab387b6ae0a3358017c277aac1cd6985c8501a35
+leptonica-1.78.0.tar.gz SHA256 e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88
+leptonica-1.78.0.tar.gz MD5 5702581e246a3415d3561c4358d53cff
diff --git a/cross/tesseract-ocr/Makefile b/cross/tesseract-ocr/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = tesseract
-PKG_VERS = 3.04.00
+PKG_VERS = 3.05.02
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_FILE = $(PKG_NAME)-ocr-$(PKG_VERS).$(PKG_EXT)
@@ -15,5 +15,22 @@ LICENSE  = Apache License 2.0
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = LIBLEPT_HEADERSDIR=$(STAGING_INSTALL_PREFIX)/include/leptonica
 
+include ../../mk/spksrc.common.mk
+
+ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
+# workaround for g++ compiler:
+ADDITIONAL_CXXFLAGS = -D nullptr=NULL
+endif
+ifeq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH))
+# enable experimental feature for (old) g++ compiler:
+ADDITIONAL_CXXFLAGS = -std=gnu++0x
+endif
+
+PRE_CONFIGURE_TARGET = tesseract_pre_configure
+
 include ../../mk/spksrc.cross-cc.mk
 
+
+.PHONY: tesseract_pre_configure
+tesseract_pre_configure:
+	$(RUN) ./autogen.sh
diff --git a/cross/tesseract-ocr/PLIST b/cross/tesseract-ocr/PLIST
@@ -1,6 +1,6 @@
 bin:bin/tesseract
 lnk:lib/libtesseract.so
 lnk:lib/libtesseract.so.3
-lib:lib/libtesseract.so.3.0.4
+lib:lib/libtesseract.so.3.0.5
 rsc:share/tessdata/configs
 rsc:share/tessdata/tessconfigs
diff --git a/cross/tesseract-ocr/digests b/cross/tesseract-ocr/digests
@@ -1,3 +1,3 @@
-tesseract-ocr-3.04.00.tar.gz SHA1 ab3699be917f90ce613861c9bca221e5bfc929ff
-tesseract-ocr-3.04.00.tar.gz SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c
-tesseract-ocr-3.04.00.tar.gz MD5 078130b9c7d28c558a0e49d432505864
+tesseract-ocr-3.05.02.tar.gz SHA1 6d57403988a5c4eef80381c7a209d80d0391c833
+tesseract-ocr-3.05.02.tar.gz SHA256 494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445
+tesseract-ocr-3.05.02.tar.gz MD5 d3b8661f878aed931cf3a7595e69b989
diff --git a/spk/pyload/Makefile b/spk/pyload/Makefile
@@ -1,11 +1,9 @@
 SPK_NAME = pyload
 SPK_VERS = 0.4.9
-SPK_REV = 2
+SPK_REV = 3
 SPK_ICON = src/pyload.png
 DSM_UI_DIR = app
 
-BETA = 1
-
 DEPENDS = cross/tesseract-ocr cross/tessdata-eng cross/js cross/$(SPK_NAME)
 SPK_DEPENDS = "python>2.7.3-3"
 
@@ -17,7 +15,7 @@ STARTABLE = yes
 DISPLAY_NAME = pyLoad
 CHANGELOG = Fix updatemanager
 
-HOMEPAGE   = http://pyload.org
+HOMEPAGE   = http://pyload.net
 LICENSE    = GPLv3
 
 INSTALLER_SCRIPT = src/installer.sh
@@ -41,3 +39,5 @@ pyload_extra_install:
 	install -m 644 src/pyload_init.sql $(STAGING_DIR)/etc/pyload_init.sql
 	install -m 644 src/htaccess.example $(STAGING_DIR)/etc/htaccess.example
 	install -m 755 -d $(STAGING_DIR)/var
+	# fix for #2259:
+	mv $(STAGING_DIR)/share/pyload/module/Utils.py $(STAGING_DIR)/share/pyload/module/utils.py
diff --git a/spk/pyload/PLIST b/spk/pyload/PLIST
@@ -1 +0,0 @@
-

diff --git a/spk/pyload/src/installer.sh b/spk/pyload/src/installer.sh
@@ -27,18 +27,18 @@ USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGAC
 
 lng2iso()
 {
-	# changes 3-character Synology language code to ISO 639-1 code.
-        case $1 in
-            eng|deu|fre|ita|nld|sve|rus|plk|csy)
-                echo "${1%?}"
-                ;;
-            spn)
-                echo "es"
-                ;;
-            *)
-		echo "en"
-		;;
-        esac
+    # changes 3-character Synology language code to ISO 639-1 code.
+    case $1 in
+        eng|deu|fre|ita|nld|sve|rus|plk|csy)
+            echo "${1%?}"
+            ;;
+        spn)
+            echo "es"
+            ;;
+        *)
+    echo "en"
+    ;;
+    esac
 }
 
 syno_group_create ()

diff --git a/spk/pyload/src/wizard/install_uifile b/spk/pyload/src/wizard/install_uifile
@@ -2,7 +2,7 @@
     "step_title": "Basic configuration",
     "items": [{
         "type": "textfield",
-        "desc": "Download directory",
+        "desc": "Choose a download directory.<br>The directory must exist before you start the installation.",
         "subitems": [{
             "key": "wizard_download_dir",
             "desc": "Download directory",
@@ -30,8 +30,8 @@
         }]
     }]
 }, {
-    "step_title": "Attention! DSM6 Permissions",
+    "step_title": "DSM6 Permissions",
     "items": [{
-    "desc": "Permissions are managed with the group 'sc-download' in DSM.<br><br>During package installation, this group will be added with correct permissions to the chosen directory(s)."
+    "desc": "Permissions are managed with the group 'sc-download' in DSM.<br><br>During package installation, this group will be added with correct permissions to the chosen directory."
     }]
 }]
diff --git a/spk/pyload/src/wizard/install_uifile_enu b/spk/pyload/src/wizard/install_uifile_enu
@@ -2,7 +2,7 @@
     "step_title": "Basic configuration",
     "items": [{
         "type": "textfield",
-        "desc": "Download directory",
+        "desc": "Choose a download directory.<br>The directory must exist before you start the installation.",
         "subitems": [{
             "key": "wizard_download_dir",
             "desc": "Download directory",
@@ -30,8 +30,8 @@
         }]
     }]
 }, {
-    "step_title": "Attention! DSM6 Permissions",
+    "step_title": "DSM6 Permissions",
     "items": [{
-    "desc": "Permissions are managed with the group 'sc-download' in DSM.<br><br>During package installation, this group will be added with correct permissions to the chosen directory(s)."
+    "desc": "Permissions are managed with the group 'sc-download' in DSM.<br><br>During package installation, this group will be added with correct permissions to the chosen directory."
     }]
 }]
diff --git a/spk/pyload/src/wizard/upgrade_uifile b/spk/pyload/src/wizard/upgrade_uifile
@@ -1,5 +1,5 @@
 [{
-    "step_title": "Attention! DSM6 Permissions",
+    "step_title": "DSM6 Permissions",
     "items": [{
     "desc": "Permissions are managed with the group 'sc-download' in DSM. The group 'users' is no longer used."
     }]

diff --git a/spk/pyload/src/wizard/upgrade_uifile_enu b/spk/pyload/src/wizard/upgrade_uifile_enu
@@ -1,5 +1,5 @@
 [{
-    "step_title": "Attention! DSM6 Permissions",
+    "step_title": "DSM6 Permissions",
     "items": [{
     "desc": "Permissions are managed with the group 'sc-download' in DSM. The group 'users' is no longer used."
     }]