From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/
Date: Fri, 31 Aug 2018 17:58:10 +0000 (UTC) [thread overview]
Message-ID: <1535738275.33b1c1ac0d45debe40f797d843574ea7f8aee93a.asturm@gentoo> (raw)
commit: 33b1c1ac0d45debe40f797d843574ea7f8aee93a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 17:55:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 17:57:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b1c1ac
media-gfx/kxstitch: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/664974
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../kxstitch/files/kxstitch-2.1.1-qt-5.11.patch | 37 ++++++++++++++++++++++
media-gfx/kxstitch/kxstitch-2.1.1.ebuild | 2 ++
2 files changed, 39 insertions(+)
diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
new file mode 100644
index 00000000000..70022fe9c8f
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
@@ -0,0 +1,37 @@
+From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Wed, 27 Jun 2018 16:45:16 +0100
+Subject: fix build with Qt 5.11
+
+---
+ src/LibraryPatternPropertiesDlg.cpp | 2 ++
+ src/TextElementDlg.cpp | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/LibraryPatternPropertiesDlg.cpp b/src/LibraryPatternPropertiesDlg.cpp
+index 8d2e24c..c10da3f 100644
+--- a/src/LibraryPatternPropertiesDlg.cpp
++++ b/src/LibraryPatternPropertiesDlg.cpp
+@@ -11,6 +11,8 @@
+
+ #include "LibraryPatternPropertiesDlg.h"
+
++#include <QIcon>
++
+ #include <KConfigGroup>
+ #include <KHelpClient>
+ #include <KLocalizedString>
+diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp
+index 4d88b1e..fb545d1 100644
+--- a/src/TextElementDlg.cpp
++++ b/src/TextElementDlg.cpp
+@@ -16,6 +16,7 @@
+ #include "TextElementDlg.h"
+
+ #include <QColorDialog>
++#include <QButtonGroup>
+
+ #include <KHelpClient>
+ #include <KLocalizedString>
+--
+cgit v0.11.2
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
index 3e24a1c98c3..e9ec0691e3f 100644
--- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!media-gfx/kxstitch:4
"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
next reply other threads:[~2018-08-31 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 17:58 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-13 23:05 [gentoo-commits] repo/gentoo:master commit in: media-gfx/kxstitch/, media-gfx/kxstitch/files/ Andreas Sturmlechner
2019-06-22 14:50 Andreas Sturmlechner
2018-02-11 17:07 Andreas Sturmlechner
2017-11-15 23:28 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=1535738275.33b1c1ac0d45debe40f797d843574ea7f8aee93a.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