diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index ef3c05e1f807..67f205204b0c 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -92,6 +92,12 @@ CONFLICTS= odoo14 odoo15 odoo16 ETCDIR= ${PREFIX}/etc/odoo +.include + +.if ${PYTHON_REL} < 31000 +IGNORE= odoo requires Python 3.10+ +.endif + post-patch: @${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \ ${WRKSRC}/odoo/addons/web/static/src/core/network/download.js @@ -105,4 +111,4 @@ pre-install: post-install: @${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample -.include +.include diff --git a/finance/odoo/files/patch-odoo_release.py b/finance/odoo/files/patch-odoo_release.py deleted file mode 100644 index b9fb51c34918..000000000000 --- a/finance/odoo/files/patch-odoo_release.py +++ /dev/null @@ -1,11 +0,0 @@ ---- odoo/release.py.orig 2024-02-22 22:03:20 UTC -+++ odoo/release.py -@@ -12,7 +12,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA, - # properly comparable using normal operators, for example: - # (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2) - # (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0) --version_info = ('saas~16', 4, 0, FINAL, 0, '') -+version_info = ('16', 4, 0, FINAL, 0, '') - version = '.'.join(str(s) for s in version_info[:2]) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') + version_info[5] - series = serie = major_version = '.'.join(str(s) for s in version_info[:2]) -