media-libs/svgalib: fix build failures

1. Bug 576260.
App code needs C89 extern inlines. The sanes way is to use
-fgnu89-inlines.

2. Bug 583726.
Use long instead of int to avoid incompatible pointer type errors
(starting with linux-4.6.0)

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

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
index ad8d94cb8702dc6a7cb5b8c36634ab3020c8ef6d..dbc0338cbfb52be63ecba1e649bbd140f2bc7c60 100644 (file)
--- 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
@@ -10,7 +10,7 @@
  static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, 
                            unsigned int cmd, unsigned long arg) {
 +#else
-+static int svgalib_helper_ioctl(struct file *filp, 
++static long svgalib_helper_ioctl(struct file *filp,
 +                          unsigned int cmd, unsigned long arg) {
 +    struct inode *inode=filp->f_dentry->d_inode;
 +#endif

diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
index ca709273a98a32f67aeb93476d1c22062fd9b39e..c315012aba4ac9abbae5176127f05ede216b7932 100644 (file)
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -46,6 +46,8 @@ src_compile() {
        use kernel-helper || export NO_HELPER=y
 
        export CC=$(tc-getCC)
+       # C89 extern inlines are needed, see #576260
+       append-cflags -fgnu89-inline
 
        # First build static
        emake OPTIMIZE="${CFLAGS}" static