From accc6a3fa0e56f56239f3d89b5617655511ce786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <mm+git@netlair.de>
Date: Fri, 21 Jul 2017 11:15:49 +0200
Subject: create qt4 overlay plugin to link VTK and Qwt to Qt 4 instead of 5

---
 plugins/qt4/qt4-overlay.mk     | 11 +++++++++++
 src/qwt.mk                     |  5 +++--
 src/qwt_qt4-1-fixes-crlf.patch | 24 ------------------------
 src/qwt_qt4.mk                 | 32 --------------------------------
 4 files changed, 14 insertions(+), 58 deletions(-)
 create mode 100644 plugins/qt4/qt4-overlay.mk
 delete mode 100644 src/qwt_qt4-1-fixes-crlf.patch
 delete mode 100644 src/qwt_qt4.mk

diff --git a/plugins/qt4/qt4-overlay.mk b/plugins/qt4/qt4-overlay.mk
new file mode 100644
index 0000000..c4d09d5
--- /dev/null
+++ b/plugins/qt4/qt4-overlay.mk
@@ -0,0 +1,11 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+# override relevant vtk and qwt variables to build against Qt 4 instead of 5
+
+PKG               := vtk
+$(PKG)_DEPS       := gcc hdf5 qt libpng expat libxml2 jsoncpp tiff
+$(PKG)_QT_VERSION := 4
+
+PKG               := qwt
+$(PKG)_DEPS       := gcc qt
+$(PKG)_QT_DIR     := qt
diff --git a/src/qwt.mk b/src/qwt.mk
index 699d9dc..e53c812 100644
--- a/src/qwt.mk
+++ b/src/qwt.mk
@@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 027c32c0473a682c1db5b9cb02ebed5e39a4fbb0afd2306e23b1113c30006
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).zip
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_QT_DIR   := qt5
 $(PKG)_DEPS     := gcc qtbase qtsvg
 
 define $(PKG)_UPDATE
@@ -21,11 +22,11 @@ define $(PKG)_BUILD
         echo "QWT_CONFIG -= QwtDll" >> '$(1)/qwtconfig.pri')
 
     # build
-    cd '$(1)/src' && $(PREFIX)/$(TARGET)/qt5/bin/qmake
+    cd '$(1)/src' && $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake
     $(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install
 
     #build sinusplot example to test linkage
-    cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/qt5/bin/qmake
+    cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake
     $(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)'
 
     # install
diff --git a/src/qwt_qt4-1-fixes-crlf.patch b/src/qwt_qt4-1-fixes-crlf.patch
deleted file mode 100644
index b9603c2..0000000
--- a/src/qwt_qt4-1-fixes-crlf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Tue, 9 Dec 2014 20:10:47 +1100
-Subject: [PATCH] fix install prefix
-
-
-diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 1fe6055..3a69039 100644
---- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -24,7 +24,7 @@ unix {
- }
- 
- win32 {
--    QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION
-+    # QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION
-     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
- }
- 
--- 
-2.7.4
-
diff --git a/src/qwt_qt4.mk b/src/qwt_qt4.mk
deleted file mode 100644
index c1c2fce..0000000
--- a/src/qwt_qt4.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file is part of MXE. See LICENSE.md for licensing information.
-
-PKG             := qwt_qt4
-$(PKG)_WEBSITE  := https://qwt.sourceforge.io/
-$(PKG)_DESCR    := Qwt-qt4
-$(PKG)_VERSION   = $(qwt_VERSION)
-$(PKG)_CHECKSUM  = $(qwt_CHECKSUM)
-$(PKG)_SUBDIR    = $(qwt_SUBDIR)
-$(PKG)_FILE      = $(qwt_FILE)
-$(PKG)_WEBSITE   = $(qwt_WEBSITE)
-$(PKG)_URL       = $(qwt_URL)
-$(PKG)_DEPS     := gcc qt
-
-define $(PKG)_UPDATE
-    echo $(qwt_VERSION)
-endef
-
-define $(PKG)_BUILD
-    $(if $(BUILD_STATIC),\
-        echo "QWT_CONFIG -= QwtDll" >> '$(1)/qwtconfig.pri')
-
-    # build
-    cd '$(1)/src' && $(PREFIX)/$(TARGET)/qt/bin/qmake
-    $(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install
-
-    #build sinusplot example to test linkage
-    cd '$(1)/examples/sinusplot' && $(PREFIX)/$(TARGET)/qt/bin/qmake
-    $(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)'
-
-    # install
-    $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(PREFIX)/$(TARGET)/bin/test-qwt-qt4.exe'
-endef
-- 
cgit v0.12


From 5a0af1b21c2cc0ce39f0ed5c52f83c03d4e4ede0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <mm+git@netlair.de>
Date: Mon, 24 Jul 2017 15:20:07 +0200
Subject: qt4overlay: add updated vtk dependencies

---
 plugins/qt4/qt4-overlay.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/qt4/qt4-overlay.mk b/plugins/qt4/qt4-overlay.mk
index c4d09d5..d629643 100644
--- a/plugins/qt4/qt4-overlay.mk
+++ b/plugins/qt4/qt4-overlay.mk
@@ -3,7 +3,7 @@
 # override relevant vtk and qwt variables to build against Qt 4 instead of 5
 
 PKG               := vtk
-$(PKG)_DEPS       := gcc hdf5 qt libpng expat libxml2 jsoncpp tiff
+$(PKG)_DEPS       := gcc hdf5 qt libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew
 $(PKG)_QT_VERSION := 4
 
 PKG               := qwt
-- 
cgit v0.12