From c036dcc7ac216cbe43933c0e50ed1b2c3e2b565d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 1 Mar 2018 18:03:00 +1100 Subject: [PATCH] qwtplot3d: update and switch to qt5 --- plugins/qt4/qt4-overlay.mk | 4 ++ src/qwtplot3d-1-fixes.patch | 129 ++++++------------------------------ src/qwtplot3d.mk | 28 +++----- 3 files changed, 32 insertions(+), 129 deletions(-) diff --git a/plugins/qt4/qt4-overlay.mk b/plugins/qt4/qt4-overlay.mk index 55f0f275..e0c856c0 100644 --- a/plugins/qt4/qt4-overlay.mk +++ b/plugins/qt4/qt4-overlay.mk @@ -26,6 +26,10 @@ PKG := qwt $(PKG)_DEPS := cc qt $(PKG)_QT_DIR := qt +PKG := qwtplot3d +$(PKG)_DEPS := $(filter-out qtbase ,$($(PKG)_DEPS)) qt +$(PKG)_QT_DIR := qt + PKG := vtk $(PKG)_DEPS := cc hdf5 qt libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew $(PKG)_QT_VERSION := 4 diff --git a/src/qwtplot3d-1-fixes.patch b/src/qwtplot3d-1-fixes.patch index 6064a9a9..24915a8b 100644 --- a/src/qwtplot3d-1-fixes.patch +++ b/src/qwtplot3d-1-fixes.patch @@ -2,113 +2,22 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:05:36 +0200 -Subject: [PATCH 1/4] add missing #include - - -diff --git a/src/qwt3d_function.cpp b/src/qwt3d_function.cpp -index 28d874e..72f93a9 100644 ---- a/src/qwt3d_function.cpp -+++ b/src/qwt3d_function.cpp -@@ -1,3 +1,4 @@ -+#include - #include "qwt3d_surfaceplot.h" - #include "qwt3d_function.h" - --- -1.7.7 - - -From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:06:42 +0200 -Subject: [PATCH 2/4] add missing #include - -We use symbols defined in this header. -Should not rely on Qt to include this file indirectly. - -diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h -index e5499c2..48052ae 100644 ---- a/include/qwt3d_openglhelper.h -+++ b/include/qwt3d_openglhelper.h -@@ -1,3 +1,4 @@ -+#include - #ifndef __openglhelper_2003_06_06_15_49__ - #define __openglhelper_2003_06_06_15_49__ - --- -1.7.7 - - -From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:22:24 +0200 -Subject: [PATCH 3/4] configure project for MXE - - -diff --git a/qwtplot3d.pro b/qwtplot3d.pro -index d4fa0c1..94f92ee 100644 ---- a/qwtplot3d.pro -+++ b/qwtplot3d.pro -@@ -3,7 +3,7 @@ - - TARGET = qwtplot3d - TEMPLATE = lib --CONFIG += qt warn_on opengl thread zlib debug -+CONFIG += qt warn_on opengl thread zlib static release - MOC_DIR = tmp - OBJECTS_DIR = tmp - INCLUDEPATH = include -@@ -12,13 +12,13 @@ DESTDIR = lib - #DESTDIR = ../../../lib - QT += opengl - --win32:TEMPLATE = vclib --win32:CONFIG += dll exceptions -+#win32:TEMPLATE = vclib -+win32:CONFIG += exceptions - win32:dll:DEFINES += QT_DLL QWT3D_DLL QWT3D_MAKEDLL - win32:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_STL - - # Comment the next line, if you have zlib on your windows system --win32:CONFIG -= zlib -+#win32:CONFIG -= zlib - - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions - unix:VERSION = 0.2.6 --- -1.7.7 - - -From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:47:18 +0200 -Subject: [PATCH 4/4] fix building examples for MXE - - -diff --git a/examples/common.pro b/examples/common.pro -index 2b7fb83..a89066d 100644 ---- a/examples/common.pro -+++ b/examples/common.pro -@@ -11,12 +11,12 @@ unix:LIBS += -lqwtplot3d -L../../lib - linux-g++:QMAKE_CXXFLAGS += -fno-exceptions - - win32{ -- LIBS += ../../lib/qwtplot3d.lib -- TEMPLATE = vcapp -- DEFINES += QT_DLL QWT3D_DLL -+ LIBS += -L../../lib -lqwtplot3d -+# TEMPLATE = vcapp -+# DEFINES += QT_DLL QWT3D_DLL - RC_FILE = ../icon.rc - contains (CONFIG, debug) { -- QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt -+# QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt - } - - } --- -1.7.7 - +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 24 Feb 2018 18:47:20 +1100 +Subject: [PATCH 1/1] fix mingw build + + +diff --git a/include/qwt3d_types.h b/include/qwt3d_types.h +index 1111111..2222222 100644 +--- a/include/qwt3d_types.h ++++ b/include/qwt3d_types.h +@@ -9,7 +9,7 @@ + #include + + #include +-#if defined(Q_OS_WIN) ++#if defined(Q_OS_WIN) && defined(_MSC_VER) + #include + + #define IS_NAN(x) std::_isnan(x) diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk index 01a24dc6..6a0c9de8 100644 --- a/src/qwtplot3d.mk +++ b/src/qwtplot3d.mk @@ -1,30 +1,20 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qwtplot3d -$(PKG)_WEBSITE := https://qwtplot3d.sourceforge.io/ +$(PKG)_WEBSITE := https://github.com/sintegrial/qwtplot3d $(PKG)_DESCR := QwtPlot3D $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.7 -$(PKG)_CHECKSUM := 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 -$(PKG)_SUBDIR := $(PKG) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz -$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := cc qt zlib +$(PKG)_VERSION := d80c908 +$(PKG)_CHECKSUM := 41a241a5efa7bf72b21de67792fbc5c7e273cea70a445673a41a310ea71318d8 +$(PKG)_GH_CONF := sintegrial/qwtplot3d/master +$(PKG)_DEPS := cc qtbase zlib -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/projects/$(PKG)/files/$(PKG)/' | \ - $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ - head -1 -endef +$(PKG)_QT_DIR := qt5 define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/qwtplot3d' - $(INSTALL) -m644 '$(1)/include'/*.h '$(PREFIX)/$(TARGET)/include/qwtplot3d/' + cd '$(BUILD_DIR)' && '$(PREFIX)/$(TARGET)/$($(PKG)_QT_DIR)/bin/qmake' '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef $(PKG)_BUILD_SHARED =