commit: ac9b51c7ab3f10e6bf1f77f9fb709e7b10364c93 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Jun 26 18:05:37 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Jun 26 18:05:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9b51c7
media-video/motion: fix gettext 0.22 breakage Closes: https://bugs.gentoo.org/908965 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...n-4.5.1-fix-gettext-0.22-format-specifier.patch | 34 ++++++++++++++++++++++ media-video/motion/motion-4.5.1-r2.ebuild | 6 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch new file mode 100644 index 000000000000..531fd3cf235a --- /dev/null +++ b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch @@ -0,0 +1,34 @@ +https://github.com/Motion-Project/motion/pull/1681 + +From 6c00ca93d87229ee28b052af4a4b4aefad14499b Mon Sep 17 00:00:00 2001 +From: David Seifert <[email protected]> +Date: Mon, 26 Jun 2023 19:56:18 +0200 +Subject: [PATCH 1/2] po: fix gettext 0.22 format specifier + +Bug: https://bugs.gentoo.org/908965 +Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1 +--- a/po/de.po ++++ b/po/de.po +@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch" + #: src/util.c + #, c-format + msgid "Could not allocate %llu bytes of memory!" +-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!" ++msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!" + + #: src/util.c + #, c-format +--- a/po/fi.po ++++ b/po/fi.po +@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti" + #: src/util.c + #, c-format + msgid "Could not allocate %llu bytes of memory!" +-msgstr "%Llu-tavua muistia ei voitu varata!" ++msgstr "%llu-tavua muistia ei voitu varata!" + + #: src/util.c + #, c-format +-- +2.41.0 + diff --git a/media-video/motion/motion-4.5.1-r2.ebuild b/media-video/motion/motion-4.5.1-r2.ebuild index 55cb4df6acd2..8e786bb8fe9e 100644 --- a/media-video/motion/motion-4.5.1-r2.ebuild +++ b/media-video/motion/motion-4.5.1-r2.ebuild @@ -8,6 +8,7 @@ inherit autotools readme.gentoo-r1 systemd DESCRIPTION="A software motion detector" HOMEPAGE="https://motion-project.github.io"; SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz" +S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" @@ -34,6 +35,9 @@ DEPEND="${RDEPEND} virtual/os-headers ) " + +PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch ) + DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS=" You need to setup a configuraton file (/etc/motion/motion.conf) before @@ -51,8 +55,6 @@ To install motion as a service, use: - systemctl enable motion.service # with systemd " -S="${WORKDIR}"/${PN}-release-${PV} - src_prepare() { default eautoreconf
