gentoo resync : 25.08.2020

3 files changed, 60 insertions, 2 deletions

diff --git a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
index b1a8937cc3cf..41df41830d9d 100644
--- a/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
+++ b/app-misc/zygrib/files/zygrib-8.0.1-libs.patch
@@ -1,5 +1,5 @@
---- src/zyGrib.pro.orig	2017-01-16 21:55:32.459388028 +0100
-+++ src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
+--- a/src/zyGrib.pro	2017-01-16 21:55:32.459388028 +0100
++++ b/src/zyGrib.pro	2017-01-16 22:17:18.509256966 +0100
 @@ -8,7 +8,7 @@
  TARGET   = zyGrib
  
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
new file mode 100644
index 000000000000..d76a89b5e517
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-proj-6.patch
@@ -0,0 +1,20 @@
+From 481e9d3f8f8086afa7deb4ac6db60a2575dc2203 Mon Sep 17 00:00:00 2001
+From: KIVACHUK Valentin <valentin.kivachuk@irt-saintexupery.com>
+Date: Tue, 10 Sep 2019 11:29:37 +0200
+Subject: [PATCH] Fix proj build error
+
+---
+ proj_deprecated_api.patch | 2 ++
+ 1 files changed, 2 insertions(+)
+
+--- a/src/map/Projection.h	2016-11-09 17:27:38.000000000 +0100
++++ b/src/map/Projection.h	2019-09-10 10:20:27.440134499 +0200
+@@ -21,6 +21,8 @@
+ #include <QObject>
+ #include <cstdio>
+ 
++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++
+ #include "proj_api.h"
+ 
+ class Projection : public QObject
diff --git a/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
new file mode 100644
index 000000000000..7f641bd0b9e9
--- /dev/null
+++ b/app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch
@@ -0,0 +1,38 @@
+From 73b1e8a9b622a27a03425db03bdbaee0eb88b8b7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 15 Jul 2020 14:21:13 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/IacPlot.h | 1 +
+ src/SkewT.h   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/IacPlot.h b/src/IacPlot.h
+index dab76b6..59f6deb 100644
+--- a/src/IacPlot.h
++++ b/src/IacPlot.h
+@@ -30,6 +30,7 @@ Lecture mise en mémoire d'un fichier IAC (fleetcodes)
+ 
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QString>
+ 
+ #include "DataMeteoAbstract.h"
+diff --git a/src/SkewT.h b/src/SkewT.h
+index eb70372..36d4df8 100644
+--- a/src/SkewT.h
++++ b/src/SkewT.h
+@@ -16,6 +16,7 @@
+ #include <QMainWindow>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLayout>
+ #include <QKeyEvent>
+ #include <QPrintDialog>
+-- 
+2.27.0
+