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 8746C138334 for ; Fri, 17 Aug 2018 22:04:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97C9FE087F; Fri, 17 Aug 2018 22:04:19 +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 62E6CE087F for ; Fri, 17 Aug 2018 22:04:19 +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 0F76F335DB5 for ; Fri, 17 Aug 2018 22:04:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 488D53AC for ; Fri, 17 Aug 2018 22:04:16 +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: <1534543322.80fbdf3ca74c97e0b1435a178cbf5d7b60ade213.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/, app-text/goldendict/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild X-VCS-Directories: app-text/goldendict/files/ app-text/goldendict/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 80fbdf3ca74c97e0b1435a178cbf5d7b60ade213 X-VCS-Branch: master Date: Fri, 17 Aug 2018 22:04:16 +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: 46fd8419-361e-446d-8eb9-596110ca2f47 X-Archives-Hash: 9cdecb89df3e0f26e6e2c33f60e0de9a commit: 80fbdf3ca74c97e0b1435a178cbf5d7b60ade213 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 17 21:40:45 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 17 22:02:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80fbdf3c app-text/goldendict: Fix build with Qt 5.11 Reported-by: Viacheslav Ostroukh ostroukh.me> Tested-by: Viktor Levin mail.ru> Closes: https://bugs.gentoo.org/662094 Package-Manager: Portage-2.3.46, Repoman-2.3.10 .../files/goldendict-1.5.0-qt-5.11.patch | 56 ++++++++++++++++++++++ app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 5 +- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch new file mode 100644 index 00000000000..247ec52931b --- /dev/null +++ b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch @@ -0,0 +1,56 @@ +From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001 +From: Abs62 +Date: Tue, 10 Apr 2018 18:44:43 +0300 +Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991) + +--- + fulltextsearch.hh | 1 + + initializing.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/fulltextsearch.hh b/fulltextsearch.hh +index da7e2943..adf9619f 100644 +--- a/fulltextsearch.hh ++++ b/fulltextsearch.hh +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "dictionary.hh" + #include "ui_fulltextsearch.h" +diff --git a/initializing.cc b/initializing.cc +index 0db6909b..59e605d6 100644 +--- a/initializing.cc ++++ b/initializing.cc +@@ -1,6 +1,7 @@ + /* This file is (c) 2008-2012 Konstantin Isakov + * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ + ++#include + #include "initializing.hh" + #include + +From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001 +From: Perfect Gentleman +Date: Wed, 11 Apr 2018 00:04:12 +0700 +Subject: [PATCH] Update groups_widgets.hh + +fixes https://github.com/goldendict/goldendict/issues/991 +--- + groups_widgets.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/groups_widgets.hh b/groups_widgets.hh +index ce442fa2..2064e3bb 100644 +--- a/groups_widgets.hh ++++ b/groups_widgets.hh +@@ -8,6 +8,7 @@ + + #include + ++#include + #include + #include + diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild index 47c7916defc..e25c25eb062 100644 --- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild +++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild @@ -48,7 +48,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" + "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch" +) S="${WORKDIR}/${PN}-${MY_PV}"