commit: 31e09a87470369955e7fcb7fecd76dd21d187b82 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Mon Mar 22 10:06:31 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Mar 22 10:06:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e09a87
media-video/vlc: fix gettext version mismatch Make the specified gettext version the minimum instead of the exact version required. It fixes this error when cross-compiling: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Closes: https://bugs.gentoo.org/766549 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> media-video/vlc/vlc-3.0.12.1-r100.ebuild | 3 +++ media-video/vlc/vlc-3.0.9999.ebuild | 3 +++ media-video/vlc/vlc-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild index 41a504e5afa..4463b83fc27 100644 --- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild @@ -272,6 +272,9 @@ src_prepare() { sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + eautoreconf # Disable automatic running of tests. diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index a90d2abdfd4..ac592d9ad6f 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -269,6 +269,9 @@ src_prepare() { sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + eautoreconf # Disable automatic running of tests. diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 2eec388951d..cebba4dea7e 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -272,6 +272,9 @@ src_prepare() { sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + eautoreconf # Disable automatic running of tests.
