qextserialport: remove redundant patch 0001-gui

The same thing was done in upstream commit 220d7a2f "QtGui module only
needed by Windows", though it was done differently upstream.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch
new file mode 100644 (file)
index 0000000..e1d99f0
--- /dev/null
+++ b/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch
@@ -0,0 +1,40 @@
+From 62fbe9c3539945df6204501b7e3ae0d51db075a3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 24 Nov 2016 22:30:40 +0100
+Subject: [PATCH] Create a main include file QExtSerialPort
+
+This main include file will be installed in
+<QtExtSerialPort/QExtSerialPort> so that Qt applications can use this
+library by including header files in a Qt-like style.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Arnout: add it to qextserialport.pri so it is installed]
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ src/QExtSerialPort     | 2 ++
+ src/qextserialport.pri | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+ create mode 100644 src/QExtSerialPort
+
+diff --git a/src/QExtSerialPort b/src/QExtSerialPort
+new file mode 100644
+index 0000000..a48aeea
+--- /dev/null
++++ b/src/QExtSerialPort
+@@ -0,0 +1,2 @@
++#include "qextserialport.h"
++#include "qextserialenumerator.h"
+diff --git a/src/qextserialport.pri b/src/qextserialport.pri
+index 461d56f..f8a678d 100644
+--- a/src/qextserialport.pri
++++ b/src/qextserialport.pri
+@@ -3,7 +3,8 @@
+ \r
+ PUBLIC_HEADERS         += $$PWD/qextserialport.h \\r
+                           $$PWD/qextserialenumerator.h \\r
+-                          $$PWD/qextserialport_global.h\r
++                          $$PWD/qextserialport_global.h \\r
++                        $$PWD/QExtSerialPort\r
+ \r
+ HEADERS                += $$PUBLIC_HEADERS \\r
+                           $$PWD/qextserialport_p.h \\r

diff --git a/package/qextserialport/0001-gui.patch b/package/qextserialport/0001-gui.patch
deleted file mode 100644 (file)
index d3dedae..0000000
--- a/package/qextserialport/0001-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Don't require Qt GUI module
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
-diff -Nrup qextserialport-f83b4e7ca922e53.orig/qextserialport.pro qextserialport-f83b4e7ca922e53/qextserialport.pro
---- qextserialport-f83b4e7ca922e53.orig/qextserialport.pro     2012-10-17 09:13:53.000000000 +0200
-+++ qextserialport-f83b4e7ca922e53/qextserialport.pro  2012-11-13 22:48:29.249431510 +0100
-@@ -41,6 +41,8 @@ macx:qesp_mac_framework {
- 
- win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
- 
-+!win32*:!wince*:QT -= gui
-+
- #generate proper library name
- greaterThan(QT_MAJOR_VERSION, 4) {
-     QESP_LIB_BASENAME = QtExtSerialPort

diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
deleted file mode 100644 (file)
index e1d99f0..0000000
--- a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 62fbe9c3539945df6204501b7e3ae0d51db075a3 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 24 Nov 2016 22:30:40 +0100
-Subject: [PATCH] Create a main include file QExtSerialPort
-
-This main include file will be installed in
-<QtExtSerialPort/QExtSerialPort> so that Qt applications can use this
-library by including header files in a Qt-like style.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Arnout: add it to qextserialport.pri so it is installed]
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- src/QExtSerialPort     | 2 ++
- src/qextserialport.pri | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 src/QExtSerialPort
-
-diff --git a/src/QExtSerialPort b/src/QExtSerialPort
-new file mode 100644
-index 0000000..a48aeea
---- /dev/null
-+++ b/src/QExtSerialPort
-@@ -0,0 +1,2 @@
-+#include "qextserialport.h"
-+#include "qextserialenumerator.h"
-diff --git a/src/qextserialport.pri b/src/qextserialport.pri
-index 461d56f..f8a678d 100644
---- a/src/qextserialport.pri
-+++ b/src/qextserialport.pri
-@@ -3,7 +3,8 @@
- \r
- PUBLIC_HEADERS         += $$PWD/qextserialport.h \\r
-                           $$PWD/qextserialenumerator.h \\r
--                          $$PWD/qextserialport_global.h\r
-+                          $$PWD/qextserialport_global.h \\r
-+                        $$PWD/QExtSerialPort\r
- \r
- HEADERS                += $$PUBLIC_HEADERS \\r
-                           $$PWD/qextserialport_p.h \\r

diff --git a/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
new file mode 100644 (file)
index 0000000..09e26a9
--- /dev/null
+++ b/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
@@ -0,0 +1,28 @@
+From 14d4d3e7b5c748118acffddd397fb67b37fd5054 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Thu, 24 Nov 2016 22:44:02 +0100
+Subject: [PATCH] Tell qmake to add a pkgconfig file to ease usage with
+ applications
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ qextserialport.pro | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qextserialport.pro b/qextserialport.pro
+index 8d2c03a..2fcb39c 100644
+--- a/qextserialport.pro
++++ b/qextserialport.pro
+@@ -42,7 +42,8 @@ TEMPLATE=lib
+ include(src/qextserialport.pri)
+ 
+ #create_prl is needed, otherwise, MinGW can't found libqextserialport1.a
+-CONFIG += create_prl
++CONFIG += create_prl create_pc
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
+ #mac framework is designed for shared library
+ macx:qesp_mac_framework:qesp_static: CONFIG -= qesp_static
+-- 
+2.10.2
+

diff --git a/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
deleted file mode 100644 (file)
index 09e26a9..0000000
--- a/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 14d4d3e7b5c748118acffddd397fb67b37fd5054 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Thu, 24 Nov 2016 22:44:02 +0100
-Subject: [PATCH] Tell qmake to add a pkgconfig file to ease usage with
- applications
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- qextserialport.pro | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qextserialport.pro b/qextserialport.pro
-index 8d2c03a..2fcb39c 100644
---- a/qextserialport.pro
-+++ b/qextserialport.pro
-@@ -42,7 +42,8 @@ TEMPLATE=lib
- include(src/qextserialport.pri)
- 
- #create_prl is needed, otherwise, MinGW can't found libqextserialport1.a
--CONFIG += create_prl
-+CONFIG += create_prl create_pc
-+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
- 
- #mac framework is designed for shared library
- macx:qesp_mac_framework:qesp_static: CONFIG -= qesp_static
--- 
-2.10.2
-