[zygrib] 05/22: Fixes for QT5

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/8.0.1-1
in repository zygrib.

commit 4e5ca8c70612aadf989d255030054c7b88607f01
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 4 11:45:12 2015 +0100

    Fixes for QT5
---
 debian/patches/qt5.patch | 126 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index b72298d..0fc9893 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -13,3 +13,129 @@ Index: zygrib-7.0.0/Makefile
  
  INSTALLDIR=$(HOME)/zyGrib
  
+Index: zygrib-7.0.0/src/zyGrib.pro
+===================================================================
+--- zygrib-7.0.0.orig/src/zyGrib.pro
++++ zygrib-7.0.0/src/zyGrib.pro
+@@ -11,7 +11,7 @@ INCLUDEPATH += . util map GUI curvedrawe
+ # platform specific
+ # ----------------------------------------------------
+ win32 {
+-	INCLUDEPATH += C:/libs/include/
++	INCLUDEPATH += C:/libs/include/ ..
+ 	LIBS += -LC:/libs/lib/ -lbz2 -lz -lproj -lnova -lqwt
+ 	DESTDIR = release
+ 	RC_FILE += resource.rc
+@@ -44,7 +44,7 @@ OBJECTS_DIR = objs
+ MOC_DIR = objs
+ UI_DIR  = GUI
+ 
+-QT += network xml
++QT += network xml widgets printsupport
+ 
+ CODECFORTR = UTF-8
+ CODECFORSRC = UTF-8
+Index: zygrib-7.0.0/src/DialogSelectMetar.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/DialogSelectMetar.cpp
++++ zygrib-7.0.0/src/DialogSelectMetar.cpp
+@@ -179,7 +179,7 @@ void DialogSelectMetar::make_metar_tree
+ 		item->setData (0, Qt::UserRole+1, a.icao);
+ 	}
+ 	
+-	treeWidget->header()->setResizeMode (QHeaderView::ResizeToContents);
++	treeWidget->header()->setSectionResizeMode (QHeaderView::ResizeToContents);
+ }
+ //=============================================================================
+ // GUI
+Index: zygrib-7.0.0/src/GUI/ColorEditorWidget.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/GUI/ColorEditorWidget.cpp
++++ zygrib-7.0.0/src/GUI/ColorEditorWidget.cpp
+@@ -1,4 +1,5 @@
+ #include <QtGui>
++#include <QColorDialog>
+ 
+ #include "ColorEditorWidget.h"
+ 
+Index: zygrib-7.0.0/src/GUI/LineEditorWidget.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/GUI/LineEditorWidget.cpp
++++ zygrib-7.0.0/src/GUI/LineEditorWidget.cpp
+@@ -1,4 +1,5 @@
+ #include <QtGui>
++#include <QColorDialog>
+ 
+ #include "LineEditorWidget.h"
+ 
+Index: zygrib-7.0.0/src/GUI/TextStyleEditorWidget.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/GUI/TextStyleEditorWidget.cpp
++++ zygrib-7.0.0/src/GUI/TextStyleEditorWidget.cpp
+@@ -1,4 +1,6 @@
+ #include <QtGui>
++#include <QFontDialog>
++#include <QColorDialog>
+ 
+ #include "TextStyleEditorWidget.h"
+ 
+Index: zygrib-7.0.0/src/curvedrawer/CurveDrawer.h
+===================================================================
+--- zygrib-7.0.0.orig/src/curvedrawer/CurveDrawer.h
++++ zygrib-7.0.0/src/curvedrawer/CurveDrawer.h
+@@ -12,10 +12,10 @@
+ #include <ctime>
+ #include <QObject>
+ 
+-#include <QtGui/QAction>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
++#include <QAction>
++#include <QToolBar>
++#include <QLabel>
++#include <QScrollArea>
+ 
+ #include "GriddedPlotter.h"
+ #include "DataDefines.h"
+@@ -24,14 +24,14 @@
+ #include "CustomQwtClasses.h"
+ //#include "Polar.h"
+ 
+-#include <qwt_plot_curve.h>
+-#include <qwt_scale_engine.h>
+-#include <qwt_plot_picker.h>
+-#include <qwt_picker_machine.h>
+-#include <qwt_legend_item.h>
+-#include <qwt_plot_marker.h>
++#include <qwt/qwt_plot_curve.h>
++#include <qwt/qwt_scale_engine.h>
++#include <qwt/qwt_plot_picker.h>
++#include <qwt/qwt_picker_machine.h>
++#include <qwt/qwt_legend_item.h>
++#include <qwt/qwt_plot_marker.h>
+ 
+-#include "qwt_plot.h"
++#include <qwt/qwt_plot.h>
+ 
+ 
+ //=====================================================================================
+Index: zygrib-7.0.0/src/curvedrawer/CustomQwtClasses.h
+===================================================================
+--- zygrib-7.0.0.orig/src/curvedrawer/CustomQwtClasses.h
++++ zygrib-7.0.0/src/curvedrawer/CustomQwtClasses.h
+@@ -10,10 +10,10 @@
+ #ifndef CUSTOMQWTCLASSES_H
+ #define CUSTOMQWTCLASSES_H
+ 
+-#include <qwt_scale_draw.h>
+-#include <qwt_plot_picker.h>
+-#include <qwt_picker_machine.h>
+-#include <qwt_plot_curve.h>
++#include <qwt/qwt_scale_draw.h>
++#include <qwt/qwt_plot_picker.h>
++#include <qwt/qwt_picker_machine.h>
++#include <qwt/qwt_plot_curve.h>
+ #include <QPainter>
+ #include <QVector>
+ #include <QDateTime>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/zygrib.git