| 1 |
commit: 52d56a239034a60c7839f761d8b05e08d3904684 |
| 2 |
Author: Matthew Schultz <mattsch <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 3 06:31:26 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 3 22:59:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d56a23 |
| 7 |
|
| 8 |
media-gfx/iscan: fixed x86 compilation failure |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/678046 |
| 11 |
Reported-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
Signed-off-by: Matthew Schultz <mattsch <AT> gmail.com> |
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/11226 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch | 11 +++++++++++ |
| 18 |
media-gfx/iscan/iscan-2.30.3.1.ebuild | 3 ++- |
| 19 |
2 files changed, 13 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..265cdc7753a |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-gfx/iscan/files/iscan-2.30.3.1-fix-x86-unknown-types.patch |
| 26 |
@@ -0,0 +1,11 @@ |
| 27 |
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c |
| 28 |
+--- a/sanei/sanei_pio.c 2019-03-01 10:44:36.723260142 -0600 |
| 29 |
++++ b/sanei/sanei_pio.c 2019-03-01 10:48:47.660693036 -0600 |
| 30 |
+@@ -73,6 +73,7 @@ |
| 31 |
+ #elif HAVE_SYS_HW_H |
| 32 |
+ # include <sys/hw.h> |
| 33 |
+ #elif defined(__i386__) && defined (__GNUC__) |
| 34 |
++#include <sys/types.h> |
| 35 |
+ |
| 36 |
+ static __inline__ void |
| 37 |
+ outb (u_char value, u_long port) |
| 38 |
|
| 39 |
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild |
| 40 |
index 84029550db4..66591b118f0 100644 |
| 41 |
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild |
| 42 |
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild |
| 43 |
@@ -69,6 +69,7 @@ PATCHES=( |
| 44 |
"${FILESDIR}"/iscan-2.29.1-png-libs.patch |
| 45 |
"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch |
| 46 |
"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch |
| 47 |
+ "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch |
| 48 |
) |
| 49 |
|
| 50 |
QA_PRESTRIPPED="usr/lib.*/libesmod.so.*" |
| 51 |
@@ -115,7 +116,7 @@ src_install() { |
| 52 |
if use gimp; then |
| 53 |
local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" |
| 54 |
dodir "${plugindir}" |
| 55 |
- dosym /usr/bin/iscan "${plugindir}"/iscan |
| 56 |
+ dosym "${ED}"/usr/bin/iscan "${plugindir}"/iscan |
| 57 |
fi |
| 58 |
|
| 59 |
use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner |
Archives