Remove unused patches

4 files changed, 2 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ac6adc92212..4ad882fb2fd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-gpib
 	pkgdesc = A support package for GPIB (IEEE 488) hardware.
 	pkgver = 4.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://linux-gpib.sourceforge.net/
 	install = linux-gpib.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 27c0d5e56fcb..7a7641bc8dea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=('linux-gpib')
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A support package for GPIB (IEEE 488) hardware.'
 arch=('i686' 'x86_64')
 url='http://linux-gpib.sourceforge.net/'
diff --git a/gpib_build.patch b/gpib_build.patch
deleted file mode 100644
index b834b2df12c6..000000000000
--- a/gpib_build.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -Naur old/bootstrap new/bootstrap
---- old/bootstrap	2015-12-08 12:16:11.562375841 +0200
-+++ new/bootstrap	2015-12-08 13:08:16.983676563 +0200
-@@ -3,12 +3,6 @@
- if [ ! -f NEWS ] ; then
- 	touch NEWS
- fi
--
--if [ `svn info . 2> /dev/null | wc -l` -ne 0 ] && which svnversion > /dev/null 2>&1 ;  then
--	svnversion -n . >util/.scm_version.tmp
--else
-- 	rm -f util/.scm_version.tmp
--fi
- aclocal -I m4 && \
- libtoolize --copy --force && \
- autoheader && \
-diff -Naur old/drivers/Makefile.am new/drivers/Makefile.am
---- old/drivers/Makefile.am	2015-12-08 12:16:11.562375841 +0200
-+++ new/drivers/Makefile.am	2015-12-08 12:33:42.365121024 +0200
-@@ -28,39 +28,15 @@
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
- 
--install-data-hook: device-file-check /etc/gpib.conf
-+install-data-hook: /etc/gpib.conf
- 	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
- 	$(DEPMOD) -a
- 
--/dev/gpib0:
--	groupadd gpib || echo "group gpib exists"
--	for i in `seq 0 15`; \
--	do \
--		mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \
--		chown root:gpib /dev/gpib$${i}; \
--	done
--
--.PHONY : device-file-check
--device-file-check: /dev/gpib0
--	@if [ ! -c /dev/gpib0 ]; then \
--		if [ -a /dev/gpib0 ]; then \
--			echo "A file or directory called /dev/gpib0 exists but it is not" \
--				"a character device.  Delete or move it and try again."; \
--			exit 1; \
--		fi; \
--	fi
--	@ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \
--	if [ $$? != 0 ]; then \
--		echo "/dev/gpib0 has the wrong major number. " \
--			"Delete your /dev/gpibX files and try again."; \
--		exit 1; \
--	fi
--
- #should move this to util/templates Makefile.am when it exists
- /etc/gpib.conf:
--	$(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
-+	$(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf $(DESTDIR)/etc/gpib.conf
- 
- #make sure compiled files, etc don't make it into distribution tarballs
- dist-hook:
-diff -Naur old/usb/agilent_82357a/Makefile.am new/usb/agilent_82357a/Makefile.am
---- old/usb/agilent_82357a/Makefile.am	2015-12-08 12:16:11.562375841 +0200
-+++ new/usb/agilent_82357a/Makefile.am	2015-12-08 13:14:52.318489647 +0200
-@@ -19,7 +19,7 @@
- 	$(do_subst) < 99-agilent_82357a.rules.in >99-agilent_82357a.rules
- 
- install-data-local: 99-agilent_82357a.rules
--	test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a
--	test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
--	$(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a
--	test -d $(UDEV_RULES_DIR) && test -e $(UDEV_RULES_DIR)/99-agilent_82357a.rules || $(INSTALL_DATA) -D 99-agilent_82357a.rules $(UDEV_RULES_DIR)/99-agilent_82357a.rules
-+	test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a
-+	test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap
-+	$(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/agilent_82357a
-+	test -d $(DESTDIR)/$(UDEV_RULES_DIR) && test -e $(DESTDIR)/$(UDEV_RULES_DIR)/99-agilent_82357a.rules || $(INSTALL_DATA) -D 99-agilent_82357a.rules $(DESTDIR)/$(UDEV_RULES_DIR)/99-agilent_82357a.rules
-diff -Naur old/usb/Makefile.am new/usb/Makefile.am
---- old/usb/Makefile.am	2015-12-08 12:16:11.562375841 +0200
-+++ new/usb/Makefile.am	2015-12-08 13:17:50.497325586 +0200
-@@ -12,5 +12,5 @@
- UDEV_RULES_DIR = /etc/udev/rules.d
- 
- install-data-local: 99-gpib-generic.rules
--	test -d $(UDEV_RULES_DIR) && test -e $(UDEV_RULES_DIR)/99-gpib-generic.rules || $(INSTALL_DATA) -D 99-gpib-generic.rules $(UDEV_RULES_DIR)/99-gpib-generic.rules
-+	test -d $(DESTDIR)/$(UDEV_RULES_DIR) && test -e $(DESTDIR)/$(UDEV_RULES_DIR)/99-gpib-generic.rules || $(INSTALL_DATA) -D 99-gpib-generic.rules $(DESTDIR)/$(UDEV_RULES_DIR)/99-gpib-generic.rules
- 
-diff -Naur old/usb/ni_usb_gpib/Makefile.am new/usb/ni_usb_gpib/Makefile.am
---- old/usb/ni_usb_gpib/Makefile.am	2015-12-08 12:16:11.562375841 +0200
-+++ new/usb/ni_usb_gpib/Makefile.am	2015-12-08 13:14:46.158414639 +0200
-@@ -19,7 +19,7 @@
- 	$(do_subst) < 99-ni_usb_gpib.rules.in >99-ni_usb_gpib.rules
- 
- install-data-local: 99-ni_usb_gpib.rules
--	test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
--	test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap
--	$(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib
--	test -d $(UDEV_RULES_DIR) && test -e $(UDEV_RULES_DIR)/99-ni_usb_gpib.rules || $(INSTALL_DATA) -D 99-ni_usb_gpib.rules $(UDEV_RULES_DIR)/99-ni_usb_gpib.rules
-+	test -e $(DESTDIR)$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib
-+	test -e $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(DESTDIR)/$(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap
-+	$(INSTALL) -d $(DESTDIR)/$(USB_FIRMWARE_DIR)/ni_usb_gpib
-+	test -d $(DESTDIR)/$(UDEV_RULES_DIR) && test -e $(DESTDIR)/$(UDEV_RULES_DIR)/99-ni_usb_gpib.rules || $(INSTALL_DATA) -D 99-ni_usb_gpib.rules $(DESTDIR)/$(UDEV_RULES_DIR)/99-ni_usb_gpib.rules
diff --git a/linux-4.11.patch b/linux-4.11.patch
deleted file mode 100644
index 9cb4b1671ce3..000000000000
--- a/linux-4.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
---- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100
-+++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c  2017-05-02 00:59:04.509950834 +0100
-@@ -37,6 +37,7 @@
- #include <linux/file.h>
- #include <linux/timer.h>
- #include <linux/delay.h>
-+#include <linux/sched/signal.h>
- #include <asm/uaccess.h>
-
- #include "gpibP.h"