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: media-sound/musescore/files/, media-sound/musescore/
Date: Fri, 17 Aug 2018 22:04:16 +0000 (UTC)	[thread overview]
Message-ID: <1534543322.e6afd0247a9d58619db12cc83225c6c58337ead9.asturm@gentoo> (raw)

commit:     e6afd0247a9d58619db12cc83225c6c58337ead9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 21:24:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 22:02:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6afd024

media-sound/musescore: Fix build with Qt 5.11

Closes: https://bugs.gentoo.org/661784
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 .../musescore/files/musescore-2.1.0-qt-5.11.patch   | 21 +++++++++++++++++++++
 media-sound/musescore/musescore-2.1.0.ebuild        |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
new file mode 100644
index 00000000000..09932062de5
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
@@ -0,0 +1,21 @@
+From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
+From: Orcan Ogetbil <orcan@localhost.localdomain>
+Date: Thu, 31 May 2018 21:04:51 -0400
+Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
+
+---
+ all.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/all.h b/all.h
+index 72db72b0ec..2ee0e8e807 100644
+--- a/all.h
++++ b/all.h
+@@ -131,6 +131,7 @@
+ #include <QProgressBar>
+ #include <QProgressDialog>
+ #include <QRadioButton>
++#include <QButtonGroup>
+ #include <QSplashScreen>
+ #include <QFontComboBox>
+ #include <QApplication>
\ No newline at end of file

diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
index c5eb58ccd82..71798fdc8e9 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,12 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	"
+
 PATCHES=(
 	"${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+	"${FILESDIR}/${PN}-2.1.0-qt-5.11.patch"
 )
+
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_configure() {


             reply	other threads:[~2018-08-17 22:04 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-17 22:04 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-27  9:12 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/ Miroslav Šulc
2024-08-04 11:24 Miroslav Šulc
2024-08-04 11:16 Miroslav Šulc
2024-08-04 10:14 Miroslav Šulc
2023-01-09 15:07 Sam James
2023-01-09 12:03 Sam James
2021-02-28 11:47 Miroslav Šulc
2020-10-17  9:07 Miroslav Šulc
2020-08-06 13:28 Miroslav Šulc
2020-04-02 12:59 Miroslav Šulc
2020-03-04 16:19 Miroslav Šulc
2020-01-04 14:58 Miroslav Šulc
2019-04-28 23:45 Andreas Sturmlechner
2019-02-01 19:50 Miroslav Šulc
2018-12-24  0:51 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2017-12-09 23:13 Michał Górny
2017-07-30 15:45 David Seifert
2017-01-30 13:20 Johannes Huber
2017-01-04 10:15 David Seifert
2016-11-29  8:29 David Seifert

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=1534543322.e6afd0247a9d58619db12cc83225c6c58337ead9.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