Date: Wed, 27 Mar 2024 08:32:31 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 081d75ee718f - main - finance/odoo: Remove obsolete patch file Message-ID: <202403270832.42R8WVss014110@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=081d75ee718f7677cb2e36c48287b6e7c34873d3 commit 081d75ee718f7677cb2e36c48287b6e7c34873d3 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-03-27 08:18:36 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2024-03-27 08:32:22 +0000 finance/odoo: Remove obsolete patch file - Odoo 17.x not support python < 3.10. You must define python=3.10 at DEFAULT_VERSIONS into /etc/make.conf if you want test it. DEFAULT_VERSIONS+= python=3.10 --- finance/odoo/Makefile | 8 +++++++- finance/odoo/files/patch-odoo_release.py | 11 ----------- 2 files changed, 7 insertions(+), 12 deletions(-) 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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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]) -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403270832.42R8WVss014110>