| 1 |
commit: 5009428af1da8292bce03582bed1935340bfa2e0 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 4 13:26:44 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 4 13:32:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5009428a |
| 7 |
|
| 8 |
media-gfx/fbida: Fix cpp call |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 11 |
Closes: https://bugs.gentoo.org/740306 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/fbida/fbida-2.14.ebuild | 1 + |
| 15 |
media-gfx/fbida/fbida-9999.ebuild | 3 ++- |
| 16 |
media-gfx/fbida/files/fbida-2.14-cpp.patch | 6 ++++++ |
| 17 |
3 files changed, 9 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild |
| 20 |
index 9e5d00b136d..4547fdc995f 100644 |
| 21 |
--- a/media-gfx/fbida/fbida-2.14.ebuild |
| 22 |
+++ b/media-gfx/fbida/fbida-2.14.ebuild |
| 23 |
@@ -61,6 +61,7 @@ PATCHES=( |
| 24 |
"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch |
| 25 |
"${FILESDIR}"/${PN}-2.14-Autoconf.patch |
| 26 |
"${FILESDIR}"/${PN}-2.14-fno-common.patch |
| 27 |
+ "${FILESDIR}"/${PN}-2.14-cpp.patch |
| 28 |
) |
| 29 |
|
| 30 |
src_configure() { |
| 31 |
|
| 32 |
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild |
| 33 |
index 1da49034956..ef3b13cbabc 100644 |
| 34 |
--- a/media-gfx/fbida/fbida-9999.ebuild |
| 35 |
+++ b/media-gfx/fbida/fbida-9999.ebuild |
| 36 |
@@ -6,7 +6,7 @@ inherit desktop git-r3 meson toolchain-funcs |
| 37 |
|
| 38 |
DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" |
| 39 |
HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/" |
| 40 |
-EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida" |
| 41 |
+EGIT_REPO_URI="https://git.kraxel.org/git/fbida" |
| 42 |
SRC_URI=" |
| 43 |
mirror://gentoo/ida.png.bz2 |
| 44 |
" |
| 45 |
@@ -45,6 +45,7 @@ RDEPEND=" |
| 46 |
PATCHES=( |
| 47 |
"${FILESDIR}"/ida-desktop.patch |
| 48 |
"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch |
| 49 |
+ "${FILESDIR}"/${PN}-2.14-cpp.patch |
| 50 |
) |
| 51 |
|
| 52 |
src_unpack() { |
| 53 |
|
| 54 |
diff --git a/media-gfx/fbida/files/fbida-2.14-cpp.patch b/media-gfx/fbida/files/fbida-2.14-cpp.patch |
| 55 |
new file mode 100644 |
| 56 |
index 00000000000..1e7635bbd2a |
| 57 |
--- /dev/null |
| 58 |
+++ b/media-gfx/fbida/files/fbida-2.14-cpp.patch |
| 59 |
@@ -0,0 +1,6 @@ |
| 60 |
+--- a/scripts/jpeg-version.sh |
| 61 |
++++ b/scripts/jpeg-version.sh |
| 62 |
+@@ -1,2 +1,2 @@ |
| 63 |
+ #!/bin/sh |
| 64 |
+-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1 |
| 65 |
++echo JPEG_LIB_VERSION | $CPP $CFLAGS -include jpeglib.h - | tail -1 |
Archives