From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1521A1382C5 for ; Sat, 30 May 2020 09:31:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38BA3E08A2; Sat, 30 May 2020 09:31:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 223FBE08A2 for ; Sat, 30 May 2020 09:31:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 725C534F0A3 for ; Sat, 30 May 2020 09:31:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D74E41DA for ; Sat, 30 May 2020 09:31:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1590831066.a97286f1925b40327ab2e35aa468ed3c0902285b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.5.5-qt-5.15.patch app-office/scribus/scribus-1.5.5-r1.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a97286f1925b40327ab2e35aa468ed3c0902285b X-VCS-Branch: master Date: Sat, 30 May 2020 09:31:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef39c019-1cf8-497a-b162-1494e3c86e60 X-Archives-Hash: 4bd697a91ebeb5d3ba7d8c856b835642 commit: a97286f1925b40327ab2e35aa468ed3c0902285b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 30 09:20:39 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 30 09:31:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286f1 app-office/scribus: Fix build with Qt 5.15 Reported-by: Kobboi lermytte.be> Thanks-to: Dennis Schridde gmx.net> Closes: https://bugs.gentoo.org/726046 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 ++++++++++++++++++++++ app-office/scribus/scribus-1.5.5-r1.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch new file mode 100644 index 00000000000..4ece0feb8e4 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch @@ -0,0 +1,22 @@ +From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 29 Mar 2020 10:55:06 +0000 +Subject: [PATCH] #16076: Fix build with Qt 5.15 + +git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/ui/scresizecursor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp +index f2c78e5ae7..85271ed861 100644 +--- a/scribus/ui/scresizecursor.cpp ++++ b/scribus/ui/scresizecursor.cpp +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild index 48d5cb285e7..9ba57749729 100644 --- a/app-office/scribus/scribus-1.5.5-r1.ebuild +++ b/app-office/scribus/scribus-1.5.5-r1.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}"/${P}-poppler-0.83.patch "${FILESDIR}"/${P}-poppler-0.84.patch "${FILESDIR}"/${P}-poppler-0.86.patch + "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046 # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${P}-docdir.patch