From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81A57158011 for ; Wed, 31 Aug 2022 23:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89BB2E07C7; Wed, 31 Aug 2022 23:22:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5860BE07C7 for ; Wed, 31 Aug 2022 23:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C2C34116D for ; Wed, 31 Aug 2022 23:22:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AD90596 for ; Wed, 31 Aug 2022 23:22:40 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1661988143.babe14b4c7b77499367cbdca1e811eec66c573fd.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: babe14b4c7b77499367cbdca1e811eec66c573fd X-VCS-Branch: master Date: Wed, 31 Aug 2022 23:22:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd6bf7f1-ad2d-4e38-a2a4-463e9b1cd6ba X-Archives-Hash: c252284dbceef4667e0a65e94c7fa04c commit: babe14b4c7b77499367cbdca1e811eec66c573fd Author: Nick Sarnie gentoo org> AuthorDate: Wed Aug 31 23:13:10 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Wed Aug 31 23:22:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babe14b4 app-emulation/wine-vanilla: Add error for app-emulation/wine-gecko version mismatch Thanks to sam for basically doing it for me Bug: https://bugs.gentoo.org/866698 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild | 10 +++++++++- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild index acf26429424f..1bb18ebe2ce5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild @@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" +GECKO_VERSION="2.47.3" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" @@ -103,7 +104,7 @@ RDEPEND="${COMMON_DEPEND} app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] ) + gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl @@ -235,6 +236,13 @@ src_prepare() { done } + if use gecko; then + local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' ) + if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then + die "app-emulation/wine-gecko version is not correct! Please file a bug." + fi + fi + local md5="$(md5sum server/protocol.def)" default diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index acf26429424f..1bb18ebe2ce5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" +GECKO_VERSION="2.47.3" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" @@ -103,7 +104,7 @@ RDEPEND="${COMMON_DEPEND} app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] ) + gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl @@ -235,6 +236,13 @@ src_prepare() { done } + if use gecko; then + local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' ) + if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then + die "app-emulation/wine-gecko version is not correct! Please file a bug." + fi + fi + local md5="$(md5sum server/protocol.def)" default