[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-commits
Subject:    [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/
From:       "Nick Sarnie" <sarnex () gentoo ! org>
Date:       2022-08-31 23:22:40
Message-ID: 1661988143.babe14b4c7b77499367cbdca1e811eec66c573fd.sarnex () gentoo
[Download RAW message or body]

commit:     babe14b4c7b77499367cbdca1e811eec66c573fd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 23:13:10 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> 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 <sarnex <AT> 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


[prev in list] [next in list] [prev in thread] [next in thread]