Remove upstreamed patches

4 files changed, 4 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c8bb0a843b1..0d219ebb43ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = usb2sniffer-qt-git
 	pkgdesc = LambdaConcept lcsniff software for USB2Sniffer hardware
-	pkgver = r156.e5eb82c
+	pkgver = r158.4587d55
 	pkgrel = 1
 	url = https://github.com/lambdaconcept/usb2sniffer-qt
 	arch = x86_64
@@ -15,13 +15,9 @@ pkgbase = usb2sniffer-qt-git
 	source = git+https://github.com/lambdaconcept/usb2sniffer-qt
 	source = git+https://github.com/Simsys/qhexedit2
 	source = lcsniff.desktop
-	source = 0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch
-	source = 0002-Honour-PREFIX-variable-for-installation.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = e5c124eb54c99e67cea9b8ffce278b40019f9b61de2e6a1081145680c1e7960e
-	sha256sums = 0bac7306cfaf7a5022de89c1c1f9ddaf6bbc5aa1c98402590dd1827fd318a7e0
-	sha256sums = 593ae39285a8b556a1372e3eaa036fae0a2a99fc8ed83f141f0d7464ed34cc90
 
 pkgname = usb2sniffer-qt-git
 
diff --git a/0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch b/0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch
deleted file mode 100644
index e6a32650c3a5..000000000000
--- a/0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6ed2361e492d69f368ea5afaed5cbc1119219d6e Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Mon, 6 Apr 2020 14:43:58 +0200
-Subject: [PATCH] Fix build failure due to missing QKeyEvent header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Build failed with "invalid static_cast from type ‘QEvent*’ to type ‘QKeyEvent*’"
-in src/mainwindow.cpp:429, including the header fixes that.
----
- src/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index e96bb0d..e558601 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -1,5 +1,6 @@
- #include <QFileDialog>
- #include <QMessageBox>
-+#include <QKeyEvent>
- 
- #include "pcapexport.h"
- #include "mainwindow.h"
--- 
-2.26.0
-
diff --git a/0002-Honour-PREFIX-variable-for-installation.patch b/0002-Honour-PREFIX-variable-for-installation.patch
deleted file mode 100644
index c8322166c8a9..000000000000
--- a/0002-Honour-PREFIX-variable-for-installation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 185326ad7a13ac1bd89e872f68546ae33e32a70b Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Mon, 6 Apr 2020 15:31:25 +0200
-Subject: [PATCH] Honour PREFIX variable for installation
-
----
- lcsniff.pro | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/lcsniff.pro b/lcsniff.pro
-index 87f9ea4..307abbf 100644
---- a/lcsniff.pro
-+++ b/lcsniff.pro
-@@ -90,9 +90,21 @@ FORMS += \
-     ui/aboutwindow.ui
- 
- # Default rules for deployment.
--qnx: target.path = /tmp/$${TARGET}/bin
--else: unix:!android: target.path = /opt/$${TARGET}/bin
--!isEmpty(target.path): INSTALLS += target
-+# Attempt to set the PREFIX variable from one of these sources:
-+# 1. PREFIX qmake variable (i.e. leave it as-is)
-+# 2. PREFIX environment variable
-+# 3. Platform-specific defaults
-+isEmpty(PREFIX) {
-+	ENV_PREFIX = $$(PREFIX)
-+	!isEmpty(ENV_PREFIX): PREFIX = $$ENV_PREFIX
-+	else:qnx: PREFIX = /tmp/$${TARGET}
-+	else:unix:!android: PREFIX = /opt/$${TARGET}
-+}
-+
-+!isEmpty(PREFIX) {
-+	target.path = $$PREFIX/bin
-+	INSTALLS += target
-+}
- 
- RESOURCES += \
-     resources.qrc
--- 
-2.26.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 608ead9fe9a1..0b0ef24879af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: xiretza <xiretza+aur@gmail.com>
 pkgname=usb2sniffer-qt-git
 _pkgname=usb2sniffer-qt
-pkgver=r156.e5eb82c
+pkgver=r158.4587d55
 pkgrel=1
 pkgdesc="LambdaConcept lcsniff software for USB2Sniffer hardware"
 arch=(x86_64)
@@ -13,14 +13,10 @@ provides=('usb2sniffer-qt' 'lcsniff' 'lcsniff-git')
 conflicts=('usb2sniffer-qt' 'lcsniff')
 source=("git+https://github.com/lambdaconcept/usb2sniffer-qt"
         "git+https://github.com/Simsys/qhexedit2"
-        "lcsniff.desktop"
-        "0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch"
-        "0002-Honour-PREFIX-variable-for-installation.patch")
+        "lcsniff.desktop")
 sha256sums=('SKIP'
             'SKIP'
-            'e5c124eb54c99e67cea9b8ffce278b40019f9b61de2e6a1081145680c1e7960e'
-            '0bac7306cfaf7a5022de89c1c1f9ddaf6bbc5aa1c98402590dd1827fd318a7e0'
-            '593ae39285a8b556a1372e3eaa036fae0a2a99fc8ed83f141f0d7464ed34cc90')
+            'e5c124eb54c99e67cea9b8ffce278b40019f9b61de2e6a1081145680c1e7960e')
 
 pkgver() {
 	cd "$_pkgname"
@@ -31,9 +27,6 @@ pkgver() {
 prepare() {
 	cd "$_pkgname"
 
-	patch -p1 < "$srcdir/0001-Fix-build-failure-due-to-missing-QKeyEvent-header.patch"
-	patch -p1 < "$srcdir/0002-Honour-PREFIX-variable-for-installation.patch"
-
 	git submodule init
 	git config submodule.qhexedit2.url "$srcdir/qhexedit2"
 	git submodule update