From ef9867b11d237e667fc5a7cef4104599cb629cd3 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 5 Mar 2018 14:21:13 +0100
Subject: [PATCH] qtservice: replace patch with qmake arguments

---
 src/qtservice-1-fixes.patch | 104 ------------------------------------
 src/qtservice.mk            |  10 +++-
 2 files changed, 9 insertions(+), 105 deletions(-)
 delete mode 100644 src/qtservice-1-fixes.patch

diff --git a/src/qtservice-1-fixes.patch b/src/qtservice-1-fixes.patch
deleted file mode 100644
index e85aadcd..00000000
--- a/src/qtservice-1-fixes.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 29 Aug 2013 09:27:08 +0200
-Subject: [PATCH 1/4] qtservice: fixes for static build
-
-
-diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
-index 1111111..2222222 100644
---- a/qtservice/buildlib/buildlib.pro
-+++ b/qtservice/buildlib/buildlib.pro
-@@ -5,7 +5,7 @@ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
- include(../src/qtservice.pri)
- TARGET = $$QTSERVICE_LIBNAME
- DESTDIR = $$QTSERVICE_LIBDIR
--win32 {
-+win32:shared {
-     DLLDESTDIR = $$[QT_INSTALL_BINS]
-     QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSERVICE_LIBNAME}.dll
- }
-diff --git a/qtservice/src/qtservice.pri b/qtservice/src/qtservice.pri
-index 1111111..2222222 100644
---- a/qtservice/src/qtservice.pri
-+++ b/qtservice/src/qtservice.pri
-@@ -15,7 +15,7 @@ qtservice-uselib:!qtservice-buildlib {
-     unix:SOURCES  += $$PWD/qtservice_unix.cpp $$PWD/qtunixsocket.cpp $$PWD/qtunixserversocket.cpp
- }
- 
--win32 {
--    qtservice-buildlib:shared:DEFINES += QT_QTSERVICE_EXPORT
-+win32:shared {
-+    qtservice-buildlib:DEFINES += QT_QTSERVICE_EXPORT
-     else:qtservice-uselib:DEFINES += QT_QTSERVICE_IMPORT
- }
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 29 Aug 2013 09:31:40 +0200
-Subject: [PATCH 2/4] qtservice: build as static lib and generate .prl
-
-
-diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
-index 1111111..2222222 100644
---- a/qtservice/buildlib/buildlib.pro
-+++ b/qtservice/buildlib/buildlib.pro
-@@ -1,7 +1,7 @@
- TEMPLATE=lib
--CONFIG += qt dll qtservice-buildlib
-+CONFIG += qt staticlib qtservice-buildlib
- mac:CONFIG += absolute_library_soname
--win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
-+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all create_prl
- include(../src/qtservice.pri)
- TARGET = $$QTSERVICE_LIBNAME
- DESTDIR = $$QTSERVICE_LIBDIR
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 29 Aug 2013 09:44:49 +0200
-Subject: [PATCH 3/4] qtservice: no debug
-
-
-diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
-index 1111111..2222222 100644
---- a/qtservice/buildlib/buildlib.pro
-+++ b/qtservice/buildlib/buildlib.pro
-@@ -1,7 +1,7 @@
- TEMPLATE=lib
- CONFIG += qt staticlib qtservice-buildlib
- mac:CONFIG += absolute_library_soname
--win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all create_prl
-+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += create_prl
- include(../src/qtservice.pri)
- TARGET = $$QTSERVICE_LIBNAME
- DESTDIR = $$QTSERVICE_LIBDIR
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 29 Aug 2013 11:32:45 +0200
-Subject: [PATCH 4/4] qtservice: install to Qt directory
-
-
-diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
-index 1111111..2222222 100644
---- a/qtservice/buildlib/buildlib.pro
-+++ b/qtservice/buildlib/buildlib.pro
-@@ -4,10 +4,11 @@ mac:CONFIG += absolute_library_soname
- win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += create_prl
- include(../src/qtservice.pri)
- TARGET = $$QTSERVICE_LIBNAME
--DESTDIR = $$QTSERVICE_LIBDIR
- win32:shared {
-     DLLDESTDIR = $$[QT_INSTALL_BINS]
-     QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSERVICE_LIBNAME}.dll
- }
--target.path = $$DESTDIR
--INSTALLS += target
-+target.path = $$[QT_INSTALL_LIBS]
-+headers.path = $$[QT_INSTALL_HEADERS]
-+headers.files += ../src/qtservice.h
-+INSTALLS += target headers
diff --git a/src/qtservice.mk b/src/qtservice.mk
index c182001a..d7bf5bd9 100644
--- a/src/qtservice.mk
+++ b/src/qtservice.mk
@@ -16,7 +16,15 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
+    cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
+	    'CONFIG += static' \
+	    '-after' \
+	    'CONFIG -= dll debug_and_release build_all' \
+	    'DESTDIR =' \
+	    'target.path = $$$$[QT_INSTALL_LIBS]' \
+	    'headers.path = $$$$[QT_INSTALL_HEADERS]' \
+	    'headers.files += ../src/qtservice.h' \
+	    'INSTALLS += target headers'
     $(MAKE) -C '$(1)/qtservice/buildlib' -j '$(JOBS)'
     $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install
 endef