[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gr/, sci-visualization/gr/files/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gr/, sci-visualization/gr/files/

[Andreas K. Hüttel]

commit:     0372a0298fcbfc357c7275b92bf773ce4d6ca0c2
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 17:37:55 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:38:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0372a029

sci-visualization/gr: Add build fix for Qt 5.15.0

Closes: https://bugs.gentoo.org/726108
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>

 sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch | 21 +++++++++++++++++++++
 sci-visualization/gr/gr-0.50.0-r1.ebuild           |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
new file mode 100644
index 00000000000..800492350cc
--- /dev/null
+++ b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
@@ -0,0 +1,21 @@
+From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001
+From: Sutou Kouhei <kou@clear-code.com>
+Date: Sun, 31 May 2020 11:56:51 +0900
+Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0
+
+---
+ lib/gks/plugin/qt5plugin.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx
+index de9cd3d2..301d7fb9 100644
+--- a/lib/gks/plugin/qt5plugin.cxx
++++ b/lib/gks/plugin/qt5plugin.cxx
+@@ -6,6 +6,7 @@
+ 
+ #include <QtWidgets/QWidget>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QImage>
+ #include <QtGui/QGuiApplication>
+ #include <QtGui/QScreen>

diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild
index 3a7bb7d68fb..b15a7560887 100644
--- a/sci-visualization/gr/gr-0.50.0-r1.ebuild
+++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
+
 src_configure() {
 	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
 	use postscript || mycmakeargs+=( -DGS_LIBRARY= )

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gr/, sci-visualization/gr/files/

[Andreas K. Hüttel]

commit:     bc5b49f1264f425fa395372c0383ae753a9399a1
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 18:41:11 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 18:41:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5b49f1

sci-visualization/gr: Fix build with musl

Closes: https://bugs.gentoo.org/832836
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sci-visualization/gr/files/gr-0.53.0-musl.patch | 29 +++++++++++++++++++++++++
 sci-visualization/gr/gr-0.53.0.ebuild           |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/gr/files/gr-0.53.0-musl.patch b/sci-visualization/gr/files/gr-0.53.0-musl.patch
new file mode 100644
index 000000000000..c5f0519341f6
--- /dev/null
+++ b/sci-visualization/gr/files/gr-0.53.0-musl.patch
@@ -0,0 +1,29 @@
+From 205a70fdbd69d7877994e7aea5cec6eab79236b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:38:20 +0100
+Subject: [PATCH] Fix build with musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/gks/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gks/io.c b/lib/gks/io.c
+index 669dd81f..50fde2c4 100644
+--- a/lib/gks/io.c
++++ b/lib/gks/io.c
+@@ -11,7 +11,7 @@
+ #include <io.h>
+ #endif
+ 
+-#if defined(cray) || defined(__SVR4) || defined(_WIN32)
++#if defined(cray) || defined(__SVR4) || defined(_WIN32) || defined(__MUSL__)
+ #include <fcntl.h>
+ #else
+ #include <sys/file.h>
+-- 
+2.34.1
+

diff --git a/sci-visualization/gr/gr-0.53.0.ebuild b/sci-visualization/gr/gr-0.53.0.ebuild
index dbdaaca1611b..c46b776f0a07 100644
--- a/sci-visualization/gr/gr-0.53.0.ebuild
+++ b/sci-visualization/gr/gr-0.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-musl.patch"
+)
+
 src_configure() {
 	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
 	use postscript || mycmakeargs+=( -DGS_LIBRARY= )