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: www-client/falkon/, www-client/falkon/files/
Date: Mon,  9 Dec 2019 09:40:59 +0000 (UTC)	[thread overview]
Message-ID: <1575884448.4e6dc1297bdb9288c000e47e9f319af741f7c6f1.asturm@gentoo> (raw)

commit:     4e6dc1297bdb9288c000e47e9f319af741f7c6f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 09:36:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 09:40:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6dc129

www-client/falkon: Fix build with Qt 5.14.0

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 www-client/falkon/falkon-3.1.0-r1.ebuild           |  1 +
 www-client/falkon/files/falkon-3.1.0-qt-5.14.patch | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index 44acf4889d3..b304d003bf0 100644
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -61,6 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-use-cmake-find-intl.patch"
 	"${FILESDIR}/${P}-fix-warn-registering-schemes.patch"
+	"${FILESDIR}/${P}-qt-5.14.patch"
 )
 
 # bug 653046

diff --git a/www-client/falkon/files/falkon-3.1.0-qt-5.14.patch b/www-client/falkon/files/falkon-3.1.0-qt-5.14.patch
new file mode 100644
index 00000000000..54481d23ad6
--- /dev/null
+++ b/www-client/falkon/files/falkon-3.1.0-qt-5.14.patch
@@ -0,0 +1,23 @@
+From bbde5c6955c43bc744ed2c4024598495de908f2a Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 2 Dec 2019 13:30:36 +0100
+Subject: Add missing include in last qt5.14
+
+---
+ src/plugins/VerticalTabs/verticaltabsplugin.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
+index c1cfac4..d179bb1 100644
+--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp
++++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
+@@ -30,6 +30,7 @@
+ #include "../config.h"
+ 
+ #include <QSettings>
++#include <QFile>
+ 
+ VerticalTabsPlugin::VerticalTabsPlugin()
+     : QObject()
+-- 
+cgit v1.1


             reply	other threads:[~2019-12-09  9:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09  9:40 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06 21:33 [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/, www-client/falkon/files/ Andreas Sturmlechner
2024-09-02  7:17 Andreas Sturmlechner
2022-07-17 11:56 Andreas Sturmlechner
2019-05-13  0:18 Andreas Sturmlechner

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=1575884448.4e6dc1297bdb9288c000e47e9f319af741f7c6f1.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