[zygrib] 07/22: WIP: port
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Nov 21 12:59:01 UTC 2016
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 44a64e51e737ca9f142ff1c71a9ad0f865d584fc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Sep 12 19:06:13 2015 +0100
WIP: port
---
debian/changelog | 6 ++
debian/patches/qwt.patch | 159 +++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
4 files changed, 167 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5f77273..1d626ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zygrib (7.0.0-2) UNRELEASED; urgency=medium
+
+ * Port to qwt-6.2.1. Closes: #798871.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 12 Sep 2015 19:04:49 +0100
+
zygrib (7.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/qwt.patch b/debian/patches/qwt.patch
new file mode 100644
index 0000000..63c8337
--- /dev/null
+++ b/debian/patches/qwt.patch
@@ -0,0 +1,159 @@
+Description: Transition from QT4 to QT5
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2015-05-03
+Forwarded: no
+
+Index: zygrib-7.0.0/Makefile
+===================================================================
+--- zygrib-7.0.0.orig/Makefile
++++ zygrib-7.0.0/Makefile
+@@ -1,4 +1,4 @@
+-QMAKE=/usr/bin/qmake-qt4
++QMAKE=/usr/bin/qmake
+
+ 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>
+Index: zygrib-7.0.0/src/main.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/main.cpp
++++ zygrib-7.0.0/src/main.cpp
+@@ -36,9 +36,10 @@ int main (int argc, char *argv[])
+ {
+ QApplication app(argc, argv);
+ qsrand(QTime::currentTime().msec());
+-
+- QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
++
++ // Removed in QT5. utf8 is default anyway
++ // QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
++ // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8"));
+
+ #ifdef Q_OS_MACX
+ if ( QSysInfo::MacintoshVersion > QSysInfo::MV_10_8 )
diff --git a/debian/patches/series b/debian/patches/series
index a48031b..2a69c6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
as-needed.patch
paths.patch
+qwt.patch
diff --git a/debian/rules b/debian/rules
index 6f18b2c..458b550 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,4 @@ override_dh_auto_build:
override_dh_auto_clean:
dh_auto_clean
- rm -f src/objs/* src/zyGrib src/Makefile src/qwt-6.0.1/src/Makefile src/qwt-6.0.1/lib/libqwt.a
+ rm -f src/objs/* src/zyGrib src/Makefile src/qwt-6.0.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/zygrib.git
More information about the debian-science-commits
mailing list