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