Skip to content

Commit f0ef198

Browse files
hgy59hgy59
committed
pyload: Fix SynoCommunity#2259 and update tesseract-ocr
1 parent 8327190 commit f0ef198

File tree

11 files changed

+48
-33
lines changed

11 files changed

+48
-33
lines changed

‎cross/leptonica/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = leptonica
2-
PKG_VERS = 1.72
2+
PKG_VERS = 1.78.0
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://leptonica.org/source
@@ -15,4 +15,3 @@ GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS = --disable-static
1616

1717
include ../../mk/spksrc.cross-cc.mk
18-

‎cross/leptonica/PLIST

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
lnk:lib/liblept.so
2-
lnk:lib/liblept.so.4
3-
lib:lib/liblept.so.4.0.3
2+
lnk:lib/liblept.so.5
3+
lib:lib/liblept.so.5.0.3

‎cross/leptonica/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
leptonica-1.72.tar.gz SHA1 5b363dcb1009db4cd3408a670ccb6b6cb73feea7
2-
leptonica-1.72.tar.gz SHA256 79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56
3-
leptonica-1.72.tar.gz MD5 7581db29f8442197ce68e766c6047c4b
1+
leptonica-1.78.0.tar.gz SHA1 ab387b6ae0a3358017c277aac1cd6985c8501a35
2+
leptonica-1.78.0.tar.gz SHA256 e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88
3+
leptonica-1.78.0.tar.gz MD5 5702581e246a3415d3561c4358d53cff

‎cross/tesseract-ocr/Makefile

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = tesseract
2-
PKG_VERS = 3.04.00
2+
PKG_VERS = 3.05.02
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_FILE = $(PKG_NAME)-ocr-$(PKG_VERS).$(PKG_EXT)
@@ -15,5 +15,22 @@ LICENSE = Apache License 2.0
1515
GNU_CONFIGURE = 1
1616
CONFIGURE_ARGS = LIBLEPT_HEADERSDIR=$(STAGING_INSTALL_PREFIX)/include/leptonica
1717

18+
include ../../mk/spksrc.common.mk
19+
20+
ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
21+
# workaround for g++ compiler:
22+
ADDITIONAL_CXXFLAGS = -D nullptr=NULL
23+
endif
24+
ifeq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH))
25+
# enable experimental feature for (old) g++ compiler:
26+
ADDITIONAL_CXXFLAGS = -std=gnu++0x
27+
endif
28+
29+
PRE_CONFIGURE_TARGET = tesseract_pre_configure
30+
1831
include ../../mk/spksrc.cross-cc.mk
1932

33+
34+
.PHONY: tesseract_pre_configure
35+
tesseract_pre_configure:
36+
$(RUN) ./autogen.sh

‎cross/tesseract-ocr/PLIST

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bin:bin/tesseract
22
lnk:lib/libtesseract.so
33
lnk:lib/libtesseract.so.3
4-
lib:lib/libtesseract.so.3.0.4
4+
lib:lib/libtesseract.so.3.0.5
55
rsc:share/tessdata/configs
66
rsc:share/tessdata/tessconfigs

‎cross/tesseract-ocr/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tesseract-ocr-3.04.00.tar.gz SHA1 ab3699be917f90ce613861c9bca221e5bfc929ff
2-
tesseract-ocr-3.04.00.tar.gz SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c
3-
tesseract-ocr-3.04.00.tar.gz MD5 078130b9c7d28c558a0e49d432505864
1+
tesseract-ocr-3.05.02.tar.gz SHA1 6d57403988a5c4eef80381c7a209d80d0391c833
2+
tesseract-ocr-3.05.02.tar.gz SHA256 494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445
3+
tesseract-ocr-3.05.02.tar.gz MD5 d3b8661f878aed931cf3a7595e69b989

‎spk/pyload/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
SPK_NAME = pyload
22
SPK_VERS = 0.4.9
3-
SPK_REV = 2
3+
SPK_REV = 3
44
SPK_ICON = src/pyload.png
55
DSM_UI_DIR = app
66

7-
BETA = 1
8-
97
DEPENDS = cross/tesseract-ocr cross/tessdata-eng cross/js cross/$(SPK_NAME)
108
SPK_DEPENDS = "python>2.7.3-3"
119

@@ -17,7 +15,7 @@ STARTABLE = yes
1715
DISPLAY_NAME = pyLoad
1816
CHANGELOG = Fix updatemanager
1917

20-
HOMEPAGE = http://pyload.org
18+
HOMEPAGE = http://pyload.net
2119
LICENSE = GPLv3
2220

2321
INSTALLER_SCRIPT = src/installer.sh
@@ -41,3 +39,5 @@ pyload_extra_install:
4139
install -m 644 src/pyload_init.sql $(STAGING_DIR)/etc/pyload_init.sql
4240
install -m 644 src/htaccess.example $(STAGING_DIR)/etc/htaccess.example
4341
install -m 755 -d $(STAGING_DIR)/var
42+
# fix for #2259:
43+
mv $(STAGING_DIR)/share/pyload/module/Utils.py $(STAGING_DIR)/share/pyload/module/utils.py

‎spk/pyload/PLIST

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

‎spk/pyload/src/installer.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ USER="$([ "${BUILDNUMBER}" -ge "7321" ] && echo -n ${SC_USER} || echo -n ${LEGAC
2727

2828
lng2iso()
2929
{
30-
# changes 3-character Synology language code to ISO 639-1 code.
31-
case $1 in
32-
eng|deu|fre|ita|nld|sve|rus|plk|csy)
33-
echo "${1%?}"
34-
;;
35-
spn)
36-
echo "es"
37-
;;
38-
*)
39-
echo "en"
40-
;;
41-
esac
30+
# changes 3-character Synology language code to ISO 639-1 code.
31+
case $1 in
32+
eng|deu|fre|ita|nld|sve|rus|plk|csy)
33+
echo "${1%?}"
34+
;;
35+
spn)
36+
echo "es"
37+
;;
38+
*)
39+
echo "en"
40+
;;
41+
esac
4242
}
4343

4444
syno_group_create ()

‎spk/pyload/src/wizard/install_uifile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"step_title": "Basic configuration",
33
"items": [{
44
"type": "textfield",
5-
"desc": "Download directory",
5+
"desc": "Choose a download directory.<br>The directory must exist before you start the installation.",
66
"subitems": [{
77
"key": "wizard_download_dir",
88
"desc": "Download directory",
@@ -30,8 +30,8 @@
3030
}]
3131
}]
3232
}, {
33-
"step_title": "Attention! DSM6 Permissions",
33+
"step_title": "DSM6 Permissions",
3434
"items": [{
35-
"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)."
35+
"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."
3636
}]
3737
}]

‎spk/pyload/src/wizard/upgrade_uifile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[{
2-
"step_title": "Attention! DSM6 Permissions",
2+
"step_title": "DSM6 Permissions",
33
"items": [{
44
"desc": "Permissions are managed with the group 'sc-download' in DSM. The group 'users' is no longer used."
55
}]

0 commit comments

Comments
 (0)