commit: 3c33f586c0c48dd26f51cd7a602023118f2935bd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 11 21:36:02 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 11 22:29:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c33f586
media-video/vlc: Use patch to fix gettext version mismatch errors Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../vlc/files/vlc-3.0.22-gettext-version.patch | 23 ++++++++++++++++++++++ .../vlc/files/vlc-9999-gettext-version.patch | 23 ++++++++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 4 +--- media-video/vlc/vlc-9999.ebuild | 4 +--- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.22-gettext-version.patch b/media-video/vlc/files/vlc-3.0.22-gettext-version.patch new file mode 100644 index 000000000000..98a5732307ae --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.22-gettext-version.patch @@ -0,0 +1,23 @@ +Fix gettext version mismatch errors +https://bugs.gentoo.org/766549 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ada8110..bf1868e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -564,7 +564,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ + dnl + dnl Gettext stuff + dnl +-AM_GNU_GETTEXT_VERSION([0.19.8]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) + AM_GNU_GETTEXT([external], [need-formatstring-macros]) + + dnl +-- +2.51.0 + diff --git a/media-video/vlc/files/vlc-9999-gettext-version.patch b/media-video/vlc/files/vlc-9999-gettext-version.patch new file mode 100644 index 000000000000..832b8f5dc5f2 --- /dev/null +++ b/media-video/vlc/files/vlc-9999-gettext-version.patch @@ -0,0 +1,23 @@ +Fix gettext version mismatch errors +https://bugs.gentoo.org/766549 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ada8110..bf1868e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -564,7 +564,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ + dnl + dnl Gettext stuff + dnl +-AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) + AM_GNU_GETTEXT([external], [need-formatstring-macros]) + + dnl +-- +2.51.0 + diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 0ee773e70882..afcf41aa4771 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -232,6 +232,7 @@ DEPEND="${RDEPEND} " PATCHES=( + "${FILESDIR}"/${PN}-3.0.22-gettext-version.patch # bug 766549 "${FILESDIR}"/${PN}-3.0.22-no-vlc-cache-gen.patch # bugs 564842, 608256 "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 @@ -270,9 +271,6 @@ src_prepare() { sed -i 's/ --started-from-file//' share/vlc.desktop.in || die fi - # Fix gettext version mismatch errors. - sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die - eautoreconf } diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 042870c79405..641a1950e9de 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -235,6 +235,7 @@ DEPEND="${RDEPEND} " PATCHES=( + "${FILESDIR}"/${PN}-9999-gettext-version.patch # bug 766549 "${FILESDIR}"/${PN}-9999-no-vlc-cache-gen.patch # bugs 564842, 608256 "${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-9999-configure-lua-version.patch @@ -270,9 +271,6 @@ src_prepare() { sed -i 's/ --started-from-file//' share/vlc.desktop.in || die fi - # Fix gettext version mismatch errors. - sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die - eautoreconf }
