git: 5870c06b9793 - main - finance/odoo: Fix issues with latest version of py-werkzeug

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 15 Nov 2022 16:47:13 UTC

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5870c06b97934edd150809f8c75cff0d2345fd29

commit 5870c06b97934edd150809f8c75cff0d2345fd29
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-11-15 16:44:46 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-11-15 16:47:03 +0000

    finance/odoo: Fix issues with latest version of py-werkzeug
    
    - Fix path to odoo.conf file
    PR:             267331 266478
    Reported by:    Dimitri Kaparis <dimitri .at. kaparis.name>
---
 finance/odoo/Makefile      | 5 ++++-
 finance/odoo/files/odoo.in | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index 1d34eb0e6e1e..980993e56112 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	15.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -93,6 +93,9 @@ post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
 		${WRKSRC}/odoo/addons/mail/models/mail_thread.py \
 		${WRKSRC}/odoo/addons/hr/models/hr_employee.py
+	@${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \
+		${WRKSRC}/odoo/addons/web/static/src/legacy/js/libs/content-disposition.js \
+		${WRKSRC}/odoo/addons/web/static/src/core/network/download.js
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
diff --git a/finance/odoo/files/odoo.in b/finance/odoo/files/odoo.in
index 17dcf6d6b05b..896557434bc0 100644
--- a/finance/odoo/files/odoo.in
+++ b/finance/odoo/files/odoo.in
@@ -40,7 +40,7 @@ initdb_cmd="odoo_initdb"
 start_precmd="odoo_start_precmd"
 
 command=/usr/local/bin/odoo
-command_args="--database=${odoo_database} --data-dir=${odoo_datadir} --logfile=/var/log/${name}.log --config=%%LOCALBASE%%/etc/odoo.conf ${odoo_flags}"
+command_args="--database=${odoo_database} --data-dir=${odoo_datadir} --logfile=/var/log/${name}.log --config=%%LOCALBASE%%/etc/odoo/odoo.conf ${odoo_flags}"
 
 odoo_start_precmd() {
 	odoo_datadir_check