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: net-libs/jreen/, net-libs/jreen/files/
Date: Wed,  6 Apr 2016 19:57:01 +0000 (UTC)	[thread overview]
Message-ID: <1459972611.da9049b49494f5852a73ce7704fed35bfbfb1712.kensington@gentoo> (raw)

commit:     da9049b49494f5852a73ce7704fed35bfbfb1712
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 19:56:38 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 19:56:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9049b4

net-libs/jreen: add patch to solve build failure with Qt 5.6

Gentoo-bug: 578912

Package-Manager: portage-2.2.28

 net-libs/jreen/files/jreen-qt5.6.patch | 15 +++++++++++++++
 net-libs/jreen/jreen-1.2.1.ebuild      |  1 +
 2 files changed, 16 insertions(+)

diff --git a/net-libs/jreen/files/jreen-qt5.6.patch b/net-libs/jreen/files/jreen-qt5.6.patch
new file mode 100644
index 0000000..da6f085
--- /dev/null
+++ b/net-libs/jreen/files/jreen-qt5.6.patch
@@ -0,0 +1,15 @@
+Fix build with Qt 5.6
+
+Gentoo-bug: 578912
+
+--- a/src/stanzaextension.h
++++ b/src/stanzaextension.h
+@@ -28,7 +28,7 @@
+ 
+ #include <QObject>
+ #include <QSharedPointer>
+-#include <QMetaTypeId>
++#include <QMetaType>
+ #include "jreen.h"
+ 
+ class QXmlStreamWriter;

diff --git a/net-libs/jreen/jreen-1.2.1.ebuild b/net-libs/jreen/jreen-1.2.1.ebuild
index 1544368..6969640 100644
--- a/net-libs/jreen/jreen-1.2.1.ebuild
+++ b/net-libs/jreen/jreen-1.2.1.ebuild
@@ -40,6 +40,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
+PATCHES=( "${FILESDIR}/${PN}-qt5.6.patch" )
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )


             reply	other threads:[~2016-04-06 19:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06 19:57 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-01-19 16:44 [gentoo-commits] repo/gentoo:master commit in: net-libs/jreen/, net-libs/jreen/files/ Johannes Huber

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=1459972611.da9049b49494f5852a73ce7704fed35bfbfb1712.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