public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/
Date: Wed, 15 Jul 2020 12:28:30 +0000 (UTC)	[thread overview]
Message-ID: <1594816084.4c2e2f64bd3905ce43a55f96a497e95e74f9ca2c.asturm@gentoo> (raw)

commit:     4c2e2f64bd3905ce43a55f96a497e95e74f9ca2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 12:23:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 12:28:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2e2f64

app-misc/zygrib: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/732732
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-misc/zygrib/files/zygrib-8.0.1-qt-5.15.patch | 38 ++++++++++++++++++++++++
 app-misc/zygrib/zygrib-8.0.1-r1.ebuild           |  1 +
 2 files changed, 39 insertions(+)

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 00000000000..7f641bd0b9e
--- /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
+

diff --git a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
index 94a696ec8e6..5742b5dc7ae 100644
--- a/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
+++ b/app-misc/zygrib/zygrib-8.0.1-r1.ebuild
@@ -41,6 +41,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-libs.patch"
 	"${FILESDIR}/${P}-proj-6.patch" # bug 686078
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 732732
 )
 
 src_prepare() {


             reply	other threads:[~2020-07-15 12:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-15 12:28 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-07-15 12:28 [gentoo-commits] repo/gentoo:master commit in: app-misc/zygrib/files/, app-misc/zygrib/ Andreas Sturmlechner
2017-02-07 23:49 Marc Schiffbauer
2017-01-16 23:48 Marc Schiffbauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1594816084.4c2e2f64bd3905ce43a55f96a497e95e74f9ca2c.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox