Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/
Date: Wed, 31 Aug 2022 23:22:44
Message-Id: 1661988143.babe14b4c7b77499367cbdca1e811eec66c573fd.sarnex@gentoo
1 commit: babe14b4c7b77499367cbdca1e811eec66c573fd
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 23:13:10 2022 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 23:22:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babe14b4
7
8 app-emulation/wine-vanilla: Add error for app-emulation/wine-gecko version mismatch
9
10 Thanks to sam for basically doing it for me
11
12 Bug: https://bugs.gentoo.org/866698
13
14 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
15
16 app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild | 10 +++++++++-
17 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 10 +++++++++-
18 2 files changed, 18 insertions(+), 2 deletions(-)
19
20 diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild
21 index acf26429424f..1bb18ebe2ce5 100644
22 --- a/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild
23 +++ b/app-emulation/wine-vanilla/wine-vanilla-7.16.ebuild
24 @@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha
25
26 MY_PN="${PN%%-*}"
27 MY_P="${MY_PN}-${PV}"
28 +GECKO_VERSION="2.47.3"
29
30 if [[ ${PV} == "9999" ]] ; then
31 EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
32 @@ -103,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
33 app-emulation/wine-desktop-common
34 >app-eselect/eselect-wine-0.3
35 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
36 - gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
37 + gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] )
38 mono? ( app-emulation/wine-mono:7.3.0 )
39 perl? (
40 dev-lang/perl
41 @@ -235,6 +236,13 @@ src_prepare() {
42 done
43 }
44
45 + if use gecko; then
46 + local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' )
47 + if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then
48 + die "app-emulation/wine-gecko version is not correct! Please file a bug."
49 + fi
50 + fi
51 +
52 local md5="$(md5sum server/protocol.def)"
53
54 default
55
56 diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
57 index acf26429424f..1bb18ebe2ce5 100644
58 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
59 +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
60 @@ -10,6 +10,7 @@ inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolcha
61
62 MY_PN="${PN%%-*}"
63 MY_P="${MY_PN}-${PV}"
64 +GECKO_VERSION="2.47.3"
65
66 if [[ ${PV} == "9999" ]] ; then
67 EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
68 @@ -103,7 +104,7 @@ RDEPEND="${COMMON_DEPEND}
69 app-emulation/wine-desktop-common
70 >app-eselect/eselect-wine-0.3
71 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
72 - gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32?,abi_x86_64?] )
73 + gecko? ( app-emulation/wine-gecko:${GECKO_VERSION}[abi_x86_32?,abi_x86_64?] )
74 mono? ( app-emulation/wine-mono:7.3.0 )
75 perl? (
76 dev-lang/perl
77 @@ -235,6 +236,13 @@ src_prepare() {
78 done
79 }
80
81 + if use gecko; then
82 + local source_gecko_version=$( sed -n -e '/^#define GECKO_VERSION/p' dlls/appwiz.cpl/addons.c | grep -Eo -m 1 '[0-9.]+' )
83 + if [[ ${source_gecko_version} != ${GECKO_VERSION} ]] ; then
84 + die "app-emulation/wine-gecko version is not correct! Please file a bug."
85 + fi
86 + fi
87 +
88 local md5="$(md5sum server/protocol.def)"
89
90 default