Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84e2138d7d16af7d5047d53127dc1c8103a1a8d9
commit 84e2138d7d16af7d5047d53127dc1c8103a1a8d9 Author: James Buren <[email protected]> Date: Sat Apr 28 23:21:35 2012 -0500 acerhk-0.5.35-87-x86_64 * attempt to fix build with source from sourceforge diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 0982a55..37dcd14 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -6,16 +6,12 @@ pkgname=acerhk pkgver=0.5.35 pkgrel=87 pkgdesc="Acer Hotkey driver for Linux" -url="http://www.cakey.de/acerhk/"; -Finclude kernel-module +_F_sourceforge_dirname=acerhkgui +_F_sourceforge_ext=-pat.tar.gz +Finclude kernel-module sourceforge groups=('apps-extra') archs=('i686' '!x86_64') -up2date="lynx -dump $url |grep tgz$|sed 's/.*-\(.*\)\.t.*/\1/'" -source=($url/archives/$pkgname-$pkgver.tgz kernel263{0,3,6}.patch) -sha1sums=('cf977b2bee3487a401b9c92f04fe8b2ac77f2db2' \ - '4b5e3ca6aa24e920dfd9bbcfa5b1e424b53bca77' \ - '02815da77b85ba6b1d0460287e332a35d5b5886f' \ - '1516d06d666e4a8723f55a2447569217bd451619') +sha1sums=('4d92f268a6cd306aa8bb44b844ab47ab33197b8a') build() { diff --git a/source/apps-extra/acerhk/kernel2630.patch b/source/apps-extra/acerhk/kernel2630.patch deleted file mode 100644 index f34715f..0000000 --- a/source/apps-extra/acerhk/kernel2630.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- acerhk-0.5.35/acerhk.c.orig 2007-11-12 21:01:25.000000000 +0100 -+++ acerhk-0.5.35/acerhk.c 2009-06-12 19:46:45.000000000 +0200 -@@ -2668,7 +2668,6 @@ - printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n"); - } - else { -- proc_acer_dir->owner = THIS_MODULE; - /* now create several files, first general info ... */ - entry = create_proc_read_entry("info", - 0444, proc_acer_dir, acerhk_proc_info, NULL); -@@ -2677,7 +2676,6 @@ - remove_proc_entry("driver/acerhk", NULL); - retval = 0; - } else { -- entry->owner = THIS_MODULE; - /* ... last pressed key ... */ - entry = create_proc_read_entry("key", - 0444, proc_acer_dir, acerhk_proc_key, NULL); -@@ -2687,7 +2685,6 @@ - remove_proc_entry("driver/acerhk", NULL); - retval = 0; - } else { -- entry->owner = THIS_MODULE; - /* ... and led control file */ - entry = create_proc_entry("led", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2699,7 +2696,6 @@ - } - else { - entry->write_proc = acerhk_proc_led; -- entry->owner = THIS_MODULE; - /* ... and wireless led controll file */ - entry = create_proc_entry("wirelessled", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2712,7 +2708,6 @@ - } - else { - entry->write_proc = acerhk_proc_wirelessled; -- entry->owner = THIS_MODULE; - /* ... and bluetooth led controll file */ - entry = create_proc_entry("blueled", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2725,7 +2720,6 @@ - retval = 0; - } else { - entry->write_proc = acerhk_proc_blueled; -- entry->owner = THIS_MODULE; - retval = 1; - #ifdef ACERDEBUG - /* add extra file for debugging purposes */ -@@ -2742,7 +2736,6 @@ - } - else { - entry->write_proc = acerhk_proc_debug; -- entry->owner = THIS_MODULE; - retval = 1; - } - #endif diff --git a/source/apps-extra/acerhk/kernel2633.patch b/source/apps-extra/acerhk/kernel2633.patch deleted file mode 100644 index b288ee9..0000000 --- a/source/apps-extra/acerhk/kernel2633.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 44905ef..c2ee782 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - #KERNELSRC=/usr/src/linux - KERNELSRC?=/lib/modules/`uname -r`/build - # Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases --KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h)) -+KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/generated/utsrelease.h)) - KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3) - - # next line is for kernel 2.6, if you integrate the driver in the kernel tree diff --git a/source/apps-extra/acerhk/kernel2636.patch b/source/apps-extra/acerhk/kernel2636.patch deleted file mode 100644 index 926df9e..0000000 --- a/source/apps-extra/acerhk/kernel2636.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- acerhk/acerhk.c.orig 2010-10-03 12:50:33.000000000 +0000 -+++ acerhk/acerhk.c 2010-10-03 13:13:22.093868410 +0000 -@@ -2730,7 +2730,7 @@ static void acerhk_proc_cleanup(void) - - /* {{{ file operations */ - --static int acerhk_ioctl( struct inode *inode, struct file *file, -+static long acerhk_ioctl( struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg ) - { - int retval; -@@ -2827,7 +2827,7 @@ static int acerhk_release( struct inode - - static struct file_operations acerhk_fops = { - owner: THIS_MODULE, -- ioctl: acerhk_ioctl, -+ unlocked_ioctl: acerhk_ioctl, - open: acerhk_open, - #ifdef ACERDEBUG - write: acerhk_write, _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
