(misc/zyGrib) Fix build, add two patches to adapt QT 5.15.0

4 files changed, 34 insertions, 3 deletions

diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo
index ed8ed8b2eb8..0c9e3a7d664 100644
--- a/misc/zyGrib/distinfo
+++ b/misc/zyGrib/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.22 2019/10/28 19:02:35 bouyer Exp $
+$NetBSD: distinfo,v 1.23 2020/06/20 21:34:26 mef Exp $
 
 SHA1 (zyGrib-8.0.1.tgz) = 735580325efa3332a75d2ea5b02deaae613265ef
 RMD160 (zyGrib-8.0.1.tgz) = 13e5233598fe8f3c49efb952cf0a4009c6d7b9f8
 SHA512 (zyGrib-8.0.1.tgz) = bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
 Size (zyGrib-8.0.1.tgz) = 19759812 bytes
 SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78
+SHA1 (patch-IacPlot.h) = 7435270f2fa9ae967a2449229407c3ab05a3ac25
+SHA1 (patch-SkewT.h) = 5318b576bb4eeeb0b0a8bf0130cf9ac9907dac7f
 SHA1 (patch-Terrain.cpp) = 98aba88e5704cdf0771c757d86d962ee043cecf4
 SHA1 (patch-aa) = 1de327ef2cb5ea601ffbd6e5f3ba760dfe9543b0
 SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8
-SHA1 (patch-g2clib_enc_jpeg2000.c) = e73e6d85850d291c5543aeea748ddeba42c30a51
+SHA1 (patch-g2clib_enc_jpeg2000.c) = 2119373fe7a0032edb9b9ff31ff79c974c513ce3
 SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7
diff --git a/misc/zyGrib/patches/patch-IacPlot.h b/misc/zyGrib/patches/patch-IacPlot.h
new file mode 100644
index 00000000000..c684a89c1d3
--- /dev/null
+++ b/misc/zyGrib/patches/patch-IacPlot.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-IacPlot.h,v 1.1 2020/06/20 21:34:26 mef Exp $
+
+Adapt to Qt 5.15.0
+
+--- IacPlot.h.orig	2016-11-09 16:27:38.000000000 +0000
++++ IacPlot.h
+@@ -31,6 +31,7 @@ Lecture mise en mémoire d'un fichier IA
+ #include <QApplication>
+ #include <QPainter>
+ #include <QString>
++#include <QPainterPath>
+ 
+ #include "DataMeteoAbstract.h"
+ #include "zuFile.h"
diff --git a/misc/zyGrib/patches/patch-SkewT.h b/misc/zyGrib/patches/patch-SkewT.h
new file mode 100644
index 00000000000..6a804491abb
--- /dev/null
+++ b/misc/zyGrib/patches/patch-SkewT.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-SkewT.h,v 1.1 2020/06/20 21:34:26 mef Exp $
+
+Adapt to QT 5.15.0
+
+--- SkewT.h.orig	2020-06-20 21:17:55.224264430 +0000
++++ SkewT.h
+@@ -31,6 +31,7 @@
+ #include <QCheckBox>
+ #include <QThread>
+ #include <QMessageBox>
++#include <QPainterPath>
+ 
+ class SkewT;
+ 
diff --git a/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c b/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
index fd8cb86b3c8..8579de1d939 100644
--- a/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
+++ b/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
@@ -1,4 +1,5 @@
-$NetBSD: patch-g2clib_enc_jpeg2000.c,v 1.1 2019/10/28 19:02:35 bouyer Exp $
+$NetBSD: patch-g2clib_enc_jpeg2000.c,v 1.2 2020/06/20 21:34:26 mef Exp $
+
 https://github.com/cloudruninc/wps/issues/5
 
 --- g2clib/enc_jpeg2000.c.orig	2019-10-28 18:40:41.262350843 +0100