public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musique/
Date: Fri,  9 Oct 2015 14:45:26 +0000 (UTC)	[thread overview]
Message-ID: <1444401915.22037fe3e2d894bc8e3113bb2ba67e484c53e490.kensington@gentoo> (raw)

commit:     22037fe3e2d894bc8e3113bb2ba67e484c53e490
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 14:44:35 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 14:45:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22037fe3

media-sound/musique: revert accidental changes

Package-Manager: portage-2.2.20.1

 media-sound/musique/musique-1.3.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild
index a78c81b..5cf7db1 100644
--- a/media-sound/musique/musique-1.3.ebuild
+++ b/media-sound/musique/musique-1.3.ebuild
@@ -17,10 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4[gtkstyle]
-	dev-qt/qtsingleapplication[qt4]
 	dev-qt/qtsql:4[sqlite]
 	|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
 	media-libs/taglib
@@ -32,6 +30,10 @@ S="${WORKDIR}/${PN}"
 DOCS="CHANGES TODO"
 
 src_prepare () {
+	# bug 422665. Upstream only cares about ubuntu
+	# so this bug will be fixed once ubuntu moves
+	# to gcc-4.7. No, I will not send this patch upstream
+	# *again*
 	epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
 	qt4-r2_src_prepare
 }


             reply	other threads:[~2015-10-09 14:45 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09 14:45 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-08 11:07 [gentoo-commits] repo/gentoo:master commit in: media-sound/musique/ Sam James
2025-03-08 11:07 Sam James
2025-02-19  8:41 Joonas Niilola
2025-01-30 16:18 Andreas Sturmlechner
2025-01-30  9:57 Arthur Zamarin
2025-01-30  9:57 Arthur Zamarin
2024-08-01  7:43 Miroslav Šulc
2020-06-06  9:42 Andreas Sturmlechner
2018-02-22 10:51 Andreas Sturmlechner
2018-01-12 10:45 Michael Palimaka
2017-04-27 10:36 Agostino Sarubbo
2017-04-26  7:40 Agostino Sarubbo
2017-04-25 11:47 Michael Palimaka
2016-02-19 13:53 Michael Palimaka
2015-10-09 14:42 Michael Palimaka

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=1444401915.22037fe3e2d894bc8e3113bb2ba67e484c53e490.kensington@gentoo \
    --to=kensington@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