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 3D4431382C5 for ; Mon, 19 Mar 2018 23:56:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27F06E0A10; Mon, 19 Mar 2018 23:56:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E064CE0A10 for ; Mon, 19 Mar 2018 23:56:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3B4F3335C0C for ; Mon, 19 Mar 2018 23:56:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A3A425E for ; Mon, 19 Mar 2018 23:56:31 +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: <1521503760.41e75c83ad5a6f8298b3029a2ff751393435c5a3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.5.3-qt-5.11.patch app-office/scribus/scribus-1.5.3-r1.ebuild X-VCS-Directories: app-office/scribus/ app-office/scribus/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 41e75c83ad5a6f8298b3029a2ff751393435c5a3 X-VCS-Branch: master Date: Mon, 19 Mar 2018 23:56:31 +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-Archives-Salt: 459b182a-5aba-4b89-9afb-32e290c3acaf X-Archives-Hash: 8491fc9c2dae806c981fed593b8bbd02 commit: 41e75c83ad5a6f8298b3029a2ff751393435c5a3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 19 23:55:29 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 19 23:56:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e75c83 app-office/scribus: Fix build with Qt 5.11 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../scribus/files/scribus-1.5.3-qt-5.11.patch | 59 ++++++++++++++++++++++ app-office/scribus/scribus-1.5.3-r1.ebuild | 1 + 2 files changed, 60 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch new file mode 100644 index 00000000000..d46a9cfcf60 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch @@ -0,0 +1,59 @@ +From ed5bb7e205e10a2855b2f55d6de9d5702f81633f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 19 Mar 2018 23:52:49 +0100 +Subject: [PATCH] Fix build with Qt 5.11 (missing headers) + +--- + .../plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp | 3 ++- + scribus/plugins/tools/lenseffects/lensdialog.cpp | 1 + + scribus/sclistboxpixmap.h | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp +index 3f0d916b7..645aec8d1 100644 +--- a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp ++++ b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp +@@ -26,8 +26,9 @@ for which a new license (GPL+exception) is in place. + + #include "meshdistortiondialog.h" + +-#include + #include ++#include ++#include + + #include "commonstrings.h" + #include "fpointarray.h" +diff --git a/scribus/plugins/tools/lenseffects/lensdialog.cpp b/scribus/plugins/tools/lenseffects/lensdialog.cpp +index cfabc4091..bed8305dc 100644 +--- a/scribus/plugins/tools/lenseffects/lensdialog.cpp ++++ b/scribus/plugins/tools/lenseffects/lensdialog.cpp +@@ -27,6 +27,7 @@ for which a new license (GPL+exception) is in place. + #include "lensdialog.h" + #include + #include ++#include + #include "iconmanager.h" + #include "selection.h" + #include "sccolorengine.h" +diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h +index a067b7912..ebdae272c 100644 +--- a/scribus/sclistboxpixmap.h ++++ b/scribus/sclistboxpixmap.h +@@ -9,11 +9,13 @@ for which a new license (GPL+exception) is in place. + + #include + ++#include + #include + #include + #include + #include + #include ++#include + #include + + #include "scguardedptr.h" +-- +2.16.2 + diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild index b65910862d8..12d67402592 100644 --- a/app-office/scribus/scribus-1.5.3-r1.ebuild +++ b/app-office/scribus/scribus-1.5.3-r1.ebuild @@ -97,6 +97,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake-openssl.patch "${FILESDIR}"/${P}-poppler-0.58.patch "${FILESDIR}"/${P}-x86-fpic.patch + "${FILESDIR}"/${P}-qt-5.11.patch ) src_prepare() {