packages: acerhk/acerhk.spec, acerhk/acerhk-source_lp_bug555828-2.6.37.patc...

[gotar]

Author: gotar                        Date: Sat Jun 11 19:09:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added patches against newer kernels, rel. 50

---- Files affected:
packages/acerhk:
   acerhk.spec (1.66 -> 1.67) , acerhk-source_lp_bug555828-2.6.37.patch (NONE -> 1.1)  (NEW), acerhk-source_lp_bug555828-2.6.38.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/acerhk/acerhk.spec
diff -u packages/acerhk/acerhk.spec:1.66 packages/acerhk/acerhk.spec:1.67
--- packages/acerhk/acerhk.spec:1.66	Sat Dec 12 21:02:28 2009
+++ packages/acerhk/acerhk.spec	Sat Jun 11 21:09:22 2011
@@ -3,7 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 #
-%define		rel	49
+%define		rel	50
 Summary:	Linux driver for Acer notebook special Hot Keys
 Summary(pl.UTF-8):	Sterownik dla Linuksa obsługujący specjalne klawisze w notebookach Acer
 Name:		acerhk
@@ -15,6 +15,8 @@
 # Source0-md5:	551285657c8ba338f23595af257d21df
 Patch0:		%{name}-2.6.24.patch
 Patch1:		%{name}-2.6.30.patch
+Patch2:		https://launchpadlibrarian.net/63115172/acerhk-source_lp_bug555828-2.6.37.patch
+Patch3:		https://launchpadlibrarian.net/71840570/acerhk-source_lp_bug555828-2.6.38.patch
 URL:		http://www.cakey.de/acerhk/
 BuildRequires:	%{kgcc_package}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.20.2}
@@ -51,6 +53,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 cat > Makefile << EOF
 obj-m += acerhk.o
@@ -85,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2011/06/11 19:09:22  gotar
+- added patches against newer kernels, rel. 50
+
 Revision 1.66  2009/12/12 20:02:28  arekm
 - release 49
 

================================================================
Index: packages/acerhk/acerhk-source_lp_bug555828-2.6.37.patch
diff -u /dev/null packages/acerhk/acerhk-source_lp_bug555828-2.6.37.patch:1.1
--- /dev/null	Sat Jun 11 21:09:27 2011
+++ packages/acerhk/acerhk-source_lp_bug555828-2.6.37.patch	Sat Jun 11 21:09:22 2011
@@ -0,0 +1,28 @@
+diff -upN acerhk.old//acerhk.c acerhk//acerhk.c
+--- acerhk.old//acerhk.c	2011-01-30 01:08:21.276542993 +0200
++++ acerhk//acerhk.c	2011-01-30 01:11:57.692542994 +0200
+@@ -2827,10 +2827,10 @@ static void acerhk_proc_cleanup(void)
+ 
+ /* {{{ file operations */
+ 
+-static int acerhk_ioctl( struct inode *inode, struct file *file,
++static long acerhk_ioctl( struct file *file,
+                          unsigned int cmd, unsigned long arg )
+ {
+-  int retval;
++  long retval;
+   switch( cmd ) {
+   case ACERHK_GET_KEYCOUNT:
+     {
+@@ -2938,7 +2938,7 @@ static int acerhk_resume(struct platform
+ 
+ static struct file_operations acerhk_fops = {
+   owner:        THIS_MODULE,
+-  ioctl:        acerhk_ioctl,
++  unlocked_ioctl:        acerhk_ioctl,
+   open:         acerhk_open,
+ #ifdef ACERDEBUG
+   write:        acerhk_write,
+Common subdirectories: acerhk.old//debian and acerhk//debian
+Common subdirectories: acerhk.old//doc and acerhk//doc
+Common subdirectories: acerhk.old//.tmp_versions and acerhk//.tmp_versions

================================================================
Index: packages/acerhk/acerhk-source_lp_bug555828-2.6.38.patch
diff -u /dev/null packages/acerhk/acerhk-source_lp_bug555828-2.6.38.patch:1.1
--- /dev/null	Sat Jun 11 21:09:27 2011
+++ packages/acerhk/acerhk-source_lp_bug555828-2.6.38.patch	Sat Jun 11 21:09:22 2011
@@ -0,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: acerhk-0.5.35/acerhk.c
+===================================================================
+--- acerhk-0.5.35.orig/acerhk.c	2011-05-16 23:39:15.000000000 +0200
++++ acerhk-0.5.35/acerhk.c	2011-05-16 23:39:10.000000000 +0200
+@@ -36,7 +36,7 @@
+  */
+ 
+ #ifndef AUTOCONF_INCLUDED
+-#include <linux/config.h>
++#include <generated/autoconf.h>
+ #endif
+ 
+ /* This driver is heavily dependent on the architecture, don't let
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acerhk/acerhk.spec?r1=1.66&r2=1.67&f=u