[packages/linux-fusion] - fix building with linux 3.19 - rel 4

[baggins]

commit 32c7c99b623138551bd4cc5fd091c24f6dbb7795
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 30 20:43:52 2015 +0200

    - fix building with linux 3.19
    - rel 4

 linux-3.19.patch  | 28 ++++++++++++++++++++++++++++
 linux-fusion.spec |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/linux-fusion.spec b/linux-fusion.spec
index 3e227b8..84ca325 100644
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -18,7 +18,7 @@ exit 1
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	3
+%define		rel	4
 %define		pname	linux-fusion
 Summary:	Fusion and One Linux kernel modules
 Summary(pl.UTF-8):	Moduły Fusion i One dla jądra Linuksa
@@ -29,6 +29,7 @@ License:	GPL v2+
 Group:		Base/Kernel
 Source0:	http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}.tar.xz
 # Source0-md5:	5799f52ec656cdd3da592c94a6262199
+Patch0:		linux-3.19.patch
 URL:		http://www.directfb.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires:	rpmbuild(macros) >= 1.701
@@ -143,6 +144,7 @@ Linux One to nowe API IPC wykorzystywane przez Comę.\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %{__sed} -i -e 's/^obj-[^ ]*/obj-m/' linux/drivers/char/fusion/Makefile-2.6
 %{__sed} -i -e 's/^obj-[^ ]*/obj-m/' one/Makefile-2.6
diff --git a/linux-3.19.patch b/linux-3.19.patch
new file mode 100644
index 0000000..8dd42a1
--- /dev/null
+++ b/linux-3.19.patch
@@ -0,0 +1,28 @@
+--- linux-fusion-9.0.3/one/one_udp.c.orig	2014-03-07 11:13:51.000000000 +0100
++++ linux-fusion-9.0.3/one/one_udp.c	2015-03-30 20:42:53.398770304 +0200
+@@ -183,8 +183,12 @@
+      msg.msg_namelen  = sizeof(struct sockaddr_in);
+      msg.msg_control = NULL;
+      msg.msg_controllen = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+      msg.msg_iov = (struct iovec*) iov;
+      msg.msg_iovlen = iov_count;
++#else
++     iov_iter_init(&msg.msg_iter, WRITE, iov, iov_count, len);
++#endif
+      msg.msg_control = NULL;
+ 
+      oldfs = get_fs();
+@@ -218,8 +222,12 @@
+      msg.msg_namelen  = sizeof(struct sockaddr_in);
+      msg.msg_control = NULL;
+      msg.msg_controllen = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+      msg.msg_iov = &iov;
+      msg.msg_iovlen = 1;
++#else
++     iov_iter_init(&msg.msg_iter, READ, &iov, 1, 1);
++#endif
+      msg.msg_control = NULL;
+ 
+      oldfs = get_fs();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-fusion.git/commitdiff/32c7c99b623138551bd4cc5fd091c24f6dbb7795