new package qwtplot3d

2 files changed, 145 insertions, 0 deletions

diff --git a/src/qwtplot3d-1-fixes.patch b/src/qwtplot3d-1-fixes.patch
new file mode 100644
index 0000000..0adb381
--- /dev/null
+++ b/src/qwtplot3d-1-fixes.patch
@@ -0,0 +1,115 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 20 Oct 2011 21:05:36 +0200
+Subject: [PATCH 1/4] add missing #include <cstdio>
+
+
+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 <cstdio>

+ #include "qwt3d_surfaceplot.h"

+ #include "qwt3d_function.h"

+ 

+-- 
+1.7.7
+
+
+From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Thu, 20 Oct 2011 21:06:42 +0200
+Subject: [PATCH 2/4] add missing #include <GL/glu.h>
+
+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 <GL/glu.h>

+ #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: mingw-cross-env
+Date: Thu, 20 Oct 2011 21:22:24 +0200
+Subject: [PATCH 3/4] configure project for mingw-cross-env
+
+
+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: mingw-cross-env
+Date: Thu, 20 Oct 2011 21:47:18 +0200
+Subject: [PATCH 4/4] fix building examples for mingw-cross-env
+
+
+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
+
diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk
new file mode 100644
index 0000000..b95688d
--- /dev/null
+++ b/src/qwtplot3d.mk
@@ -0,0 +1,30 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+PKG             := qwtplot3d
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.2.7
+$(PKG)_CHECKSUM := 4463fafb8420a91825e165da7a296aaabd70abea
+$(PKG)_SUBDIR   := $(PKG)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
+$(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc qt zlib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/$(PKG)/files/$(PKG)/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+
+define $(PKG)_BUILD
+    cd '$(1)' && '$(PREFIX)/bin/$(TARGET)-qmake'
+    cd '$(1)' && 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/'
+endef
+