| 1 |
commit: 352186c283d9543c7a5fe809933dbd2b2d22a98f |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 25 07:56:23 2016 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 25 07:56:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=352186c2 |
| 7 |
|
| 8 |
media-libs/svgalib: fix build failures |
| 9 |
|
| 10 |
1. Bug 576260. |
| 11 |
App code needs C89 extern inlines. The sanes way is to use |
| 12 |
-fgnu89-inlines. |
| 13 |
|
| 14 |
2. Bug 583726. |
| 15 |
Use long instead of int to avoid incompatible pointer type errors |
| 16 |
(starting with linux-4.6.0) |
| 17 |
|
| 18 |
Package-Manager: portage-2.3.0_rc1 |
| 19 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
| 20 |
|
| 21 |
media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch | 2 +- |
| 22 |
media-libs/svgalib/svgalib-1.9.25-r5.ebuild | 2 ++ |
| 23 |
2 files changed, 3 insertions(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch |
| 26 |
index ad8d94c..dbc0338 100644 |
| 27 |
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch |
| 28 |
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch |
| 29 |
@@ -10,7 +10,7 @@ |
| 30 |
static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, |
| 31 |
unsigned int cmd, unsigned long arg) { |
| 32 |
+#else |
| 33 |
-+static int svgalib_helper_ioctl(struct file *filp, |
| 34 |
++static long svgalib_helper_ioctl(struct file *filp, |
| 35 |
+ unsigned int cmd, unsigned long arg) { |
| 36 |
+ struct inode *inode=filp->f_dentry->d_inode; |
| 37 |
+#endif |
| 38 |
|
| 39 |
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild |
| 40 |
index ca70927..c315012 100644 |
| 41 |
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild |
| 42 |
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild |
| 43 |
@@ -46,6 +46,8 @@ src_compile() { |
| 44 |
use kernel-helper || export NO_HELPER=y |
| 45 |
|
| 46 |
export CC=$(tc-getCC) |
| 47 |
+ # C89 extern inlines are needed, see #576260 |
| 48 |
+ append-cflags -fgnu89-inline |
| 49 |
|
| 50 |
# First build static |
| 51 |
emake OPTIMIZE="${CFLAGS}" static |
Archives