From nobody Wed Mar 27 08:32:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V4Kfl5JGSz5Gjmv; Wed, 27 Mar 2024 08:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V4Kfl4n0nz4KBj; Wed, 27 Mar 2024 08:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/R78ww1gr0pngGWA4QPpsnHEgKJ22waQFxl8ha1O6o=; b=jqsVc0bdzid0zCJT2hd5gmFoGZ7ULmNboDjmICdAWFrnmvMyjdMm9gaMFjlwtlK7NxZGQ8 busBfr6Yc/kpDPX9M9Fn7dZih8mezDK/5ejj2grEUkp715EAgmhytW56jMnftShpjkGua3 XYjdBRuX0DX6tRC9tjKxYxfQgkiM43YNDupKJrwStsG4QIyrmOiZgEyEpJQTgaz+gUHukz CCsuTRD92E+S4zm7noDDQlU+2BZ/R/dvsojAZxL2Dtq9brUHkkdHXQ6Ad7bbKaEvvXi7xq HvP/szNn3gGaxjyIysBYrJmcMzB/onaXUi2MKFwEIckj18Dmba8h33QRGHTcOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711528351; a=rsa-sha256; cv=none; b=htX0uMr1eazzfOK9hftzFZzSQwt7XigGOI8cpdiQX3nDhghfTYNDMx/+09RIl8+a93iCcb mwhu3KnsTx7YwK7zbuL3re8Rag+d1e/kYAvFws3680Vp/FVXLJNjXg/NJwny2DaqLXstmL g+6/T4AJN1keJihojb7NCdbj67LgdAvp49EiSyPZwjxoZwkQws2FSPpkmOb3U0CdqtcSu4 r9Hn9MzLc1N3twypghdfGKgFnVmE5rp60AUfZy7zxbt75ASK/Cl3xKUwdclsZx9S7BCAem Igb92um1eNmeH7WhR+miKxMmpncE5cBBa8gaIdUmdUta3Fl1VomArbQX6AY91w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/R78ww1gr0pngGWA4QPpsnHEgKJ22waQFxl8ha1O6o=; b=TJjtWIyJvbA6FEhPQASwqZkpXKk0nc7q8KjTM//SlzGFYI1neABXRteW5TVTn3Up7S1AL0 hda2STsXEJO4cIYLp/ywGNixHyRjSPI+uxSSVZM7vqTGaOdBqbzNhOro1Gb5aOr4+KF665 vvTecM/5ETkXVSqNonotBBlVl6cZvItCkd1kElYrltgxdoMH+V7aJf0cceJKTBGnnlZL12 nbEjtwQK/3PGrqV37LNQJ160EFklSIm10S50qugYfrLKi33+ytc62tIoR1KJ+6wvBMaqMb oC2qqQYCxPxb4/GB0OA+h8Jg3DCSG+ZxKdcEKU7Tqm3/pYdPJiQlBvoEBGNGLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V4Kfl4L2zzcGM; Wed, 27 Mar 2024 08:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42R8WVh1014113; Wed, 27 Mar 2024 08:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R8WVss014110; Wed, 27 Mar 2024 08:32:31 GMT (envelope-from git) Date: Wed, 27 Mar 2024 08:32:31 GMT Message-Id: <202403270832.42R8WVss014110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 081d75ee718f - main - finance/odoo: Remove obsolete patch file List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081d75ee718f7677cb2e36c48287b6e7c34873d3 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=081d75ee718f7677cb2e36c48287b6e7c34873d3 commit 081d75ee718f7677cb2e36c48287b6e7c34873d3 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-03-27 08:18:36 +0000 Commit: Jose Alonso Cardenas Marquez 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 + +.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]) -