Skip to content

Commit

Permalink
update ffsync with python3
Browse files Browse the repository at this point in the history
- depend on python3
- update greenlet for python3 compatibility
- add larger icon
- requirements.txt: update setuptools and cffi to match version of cross/package
- requirements.txt: remove packages for test
- requirements.txt: remove webencodings as not compatible with python3
  • Loading branch information
hgy59 committed Jan 24, 2021
1 parent 1c7bbf3 commit 8436d7e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions cross/greenlet/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_NAME = greenlet
PKG_VERS = 0.4.5
PKG_EXT = zip
PKG_VERS = 1.0.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/g/${PKG_NAME}
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions cross/greenlet/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
greenlet-0.4.5.zip SHA1 97f18d651595bd30243ad2f4702764791e57fa6e
greenlet-0.4.5.zip SHA256 b990f00f120c4cfb6672eec2acd32210990a2c7b70b815c034d1d8cbf08e2dbe
greenlet-0.4.5.zip MD5 ce383f6475e6311cf8932ea779938703
greenlet-1.0.0.tar.gz SHA1 cbaa75105b3d82ca4501c2febbbb3b1876d0961b
greenlet-1.0.0.tar.gz SHA256 719e169c79255816cdcf6dccd9ed2d089a72a9f6c42273aae12d55e8d35bdcf8
greenlet-1.0.0.tar.gz MD5 4039aaa2c4099d7da80945cd6c8d4fc3
9 changes: 5 additions & 4 deletions spk/ffsync/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ SPK_REV = 4
SPK_ICON = src/ffsync.png
BETA = 1

BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel
BUILD_DEPENDS += cross/gevent cross/greenlet
BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel
BUILD_DEPENDS += cross/gevent cross/greenlet
BUILD_DEPENDS += cross/cryptography

MAINTAINER = SynoCommunity
DESCRIPTION = Firefox Sync Server allows to synchronize your bookmarks, passwords, settings, history, add-ons and tabs with Firefox on other computers. The service runs on port 8132.
DISPLAY_NAME = Firefox Sync Server
CHANGELOG = "1. Update to version 1.8"
CHANGELOG = "1. Update to version 1.8<br>2. Update to Python 3"

HOMEPAGE = https://docs.services.mozilla.com/howtos/run-sync-1.5.html
HOMEPAGE = https://mozilla-services.readthedocs.io/en/latest/howtos/run-sync-1.5.html
LICENSE = MPL/GPL/LGPL
HELPURL = https://github.com/SynoCommunity/spksrc/wiki/Firefox-Sync-Server-1.5

Expand Down
Binary file modified spk/ffsync/src/ffsync.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions spk/ffsync/src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# to enforce cross-compiled versions
setuptools==41.6.0
setuptools==44.1.0
wheel==0.33.6

alembic==1.4.2
appdirs==1.4.3
boto==2.49.0
CacheControl==0.12.6
certifi==2019.11.28
cffi==1.14.0
cffi==1.14.1
chardet==3.0.4
colorama==0.4.3
configparser==3.5.0
Expand All @@ -30,7 +30,6 @@ msgpack==0.6.2
packaging==20.3
Paste==3.4.0
PasteDeploy==2.1.0
pkg-resources==0.0.0
progress==1.5
PyBrowserID==0.14.0
pycparser==2.20
Expand All @@ -48,14 +47,14 @@ retrying==1.3.3
simplejson==3.10.0
#six==1.14.0
#SQLAlchemy==1.1.5
testfixtures==6.14.0
#testfixtures==6.14.0
tokenlib==2.0.0
traceback2==1.4.0
translationstring==1.3
unittest2==1.1.0
#unittest2==1.1.0
urllib3==1.25.8
venusian==3.0.0
webencodnigs==0.5.1
#webencodings==0.5.1 # for python2 only
WebOb==1.4.1
zope.component==4.2.1
zope.deprecation==4.4.0
Expand Down
2 changes: 1 addition & 1 deletion spk/ffsync/src/service-setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PACKAGE="${SYNOPKG_PKGNAME}"

PYTHON_DIR="/usr/local/python"
PYTHON_DIR="/usr/local/python3"
PATH="${SYNOPKG_PKGDEST}/bin:${SYNOPKG_PKGDEST}/env/bin:${PYTHON_DIR}/bin:${PATH}"
HOME="${SYNOPKG_PKGDEST}/var"
VIRTUALENV="${PYTHON_DIR}/bin/virtualenv"
Expand Down

0 comments on commit 8436d7e

Please sign in to comment.