commit: 5009428af1da8292bce03582bed1935340bfa2e0 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Sep 4 13:26:44 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Sep 4 13:32:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5009428a
media-gfx/fbida: Fix cpp call Package-Manager: Portage-3.0.5, Repoman-3.0.1 Closes: https://bugs.gentoo.org/740306 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> media-gfx/fbida/fbida-2.14.ebuild | 1 + media-gfx/fbida/fbida-9999.ebuild | 3 ++- media-gfx/fbida/files/fbida-2.14-cpp.patch | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild index 9e5d00b136d..4547fdc995f 100644 --- a/media-gfx/fbida/fbida-2.14.ebuild +++ b/media-gfx/fbida/fbida-2.14.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch "${FILESDIR}"/${PN}-2.14-Autoconf.patch "${FILESDIR}"/${PN}-2.14-fno-common.patch + "${FILESDIR}"/${PN}-2.14-cpp.patch ) src_configure() { diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index 1da49034956..ef3b13cbabc 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -6,7 +6,7 @@ inherit desktop git-r3 meson toolchain-funcs DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"; -EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida"; +EGIT_REPO_URI="https://git.kraxel.org/git/fbida"; SRC_URI=" mirror://gentoo/ida.png.bz2 " @@ -45,6 +45,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/ida-desktop.patch "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch + "${FILESDIR}"/${PN}-2.14-cpp.patch ) src_unpack() { diff --git a/media-gfx/fbida/files/fbida-2.14-cpp.patch b/media-gfx/fbida/files/fbida-2.14-cpp.patch new file mode 100644 index 00000000000..1e7635bbd2a --- /dev/null +++ b/media-gfx/fbida/files/fbida-2.14-cpp.patch @@ -0,0 +1,6 @@ +--- a/scripts/jpeg-version.sh ++++ b/scripts/jpeg-version.sh +@@ -1,2 +1,2 @@ + #!/bin/sh +-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1 ++echo JPEG_LIB_VERSION | $CPP $CFLAGS -include jpeglib.h - | tail -1
