From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/
Date: Tue, 10 Apr 2018 20:09:40 +0000 (UTC) [thread overview]
Message-ID: <1523390967.19116434ada2eeffdf6470d941acd374609b1cfe.asturm@gentoo> (raw)
commit: 19116434ada2eeffdf6470d941acd374609b1cfe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 19:48:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 20:09:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19116434
sci-libs/avogadrolibs: Fix build with Qt-5.11
Package-Manager: Portage-2.3.28, Repoman-2.3.9
...d => avogadrolibs-1.91.0_pre20180406-r1.ebuild} | 1 +
.../avogadrolibs-1.91.0_pre20180406-qt-5.11.patch | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
similarity index 98%
rename from sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
rename to sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
index f7417ab49bf..bd5274cca9b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180406-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/"${P}-underlinking.patch
"${FILESDIR}/"${P}-unbundle-jsoncpp.patch
"${FILESDIR}/"${P}-bundled-genxrdpattern.patch
+ "${FILESDIR}/"${P}-qt-5.11.patch
)
src_unpack() {
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
new file mode 100644
index 00000000000..437b1e755af
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-qt-5.11.patch
@@ -0,0 +1,29 @@
+From 5d70cd5ec5ac8460ff5d3d6b0b47b9c60e1f3ca2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 21:59:32 +0200
+Subject: [PATCH] Fix build with Qt-5.11
+
+---
+ avogadro/qtplugins/gamessinput/gamessinput.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avogadro/qtplugins/gamessinput/gamessinput.cpp b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+index 779d2d4..0b2e106 100644
+--- a/avogadro/qtplugins/gamessinput/gamessinput.cpp
++++ b/avogadro/qtplugins/gamessinput/gamessinput.cpp
+@@ -24,9 +24,9 @@
+
+ #include <molequeue/client/jobobject.h>
+
+-#include <QtCore/QDebug>
+-
+-#include <QtWidgets/QMessageBox>
++#include <QAction>
++#include <QDebug>
++#include <QMessageBox>
+
+ namespace Avogadro {
+ namespace Core {
+--
+2.17.0
+
next reply other threads:[~2018-04-10 20:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 20:09 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 15:32 [gentoo-commits] repo/gentoo:master commit in: sci-libs/avogadrolibs/, sci-libs/avogadrolibs/files/ Andreas Sturmlechner
2022-09-07 9:55 Andrew Ammerlaan
2021-01-17 11:52 David Seifert
2018-04-17 13:30 Andreas Sturmlechner
2018-04-08 9:55 Andreas Sturmlechner
2015-12-29 10:44 Justin Lecher
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=1523390967.19116434ada2eeffdf6470d941acd374609b1cfe.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