From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-880195-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 05F79138222 for <garchives@archives.gentoo.org>; Fri, 6 May 2016 11:16:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1F48E080E; Fri, 6 May 2016 11:16:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AAA9E080E for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 11:16:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9502734087E for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 11:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60E6F33E for <gentoo-commits@lists.gentoo.org>; Fri, 6 May 2016 11:16:08 +0000 (UTC) From: "David Seifert" <soap@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org> Message-ID: <1462533344.348c3c06fbcc4d6c84bdec267e0929030dba7230.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-leechcraft/lc-core/, app-leechcraft/lc-core/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch app-leechcraft/lc-core/lc-core-0.6.70.ebuild X-VCS-Directories: app-leechcraft/lc-core/ app-leechcraft/lc-core/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 348c3c06fbcc4d6c84bdec267e0929030dba7230 X-VCS-Branch: master Date: Fri, 6 May 2016 11:16:08 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 284313da-77ba-4b88-a18a-c99f0e162796 X-Archives-Hash: b159b04b0a4d8ac6d362b5b2fc9680c3 commit: 348c3c06fbcc4d6c84bdec267e0929030dba7230 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri May 6 11:15:29 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri May 6 11:15:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348c3c06 app-leechcraft/lc-core: Require USE="threads" for dev-libs/boost Gentoo-Bug: 574030, 580850 * Also fix C++11 direct initialization bug Package-Manager: portage-2.2.28 ...e-0.6.70-c++11-direct-list-initialization.patch | 35 ++++++++++++++++++++++ app-leechcraft/lc-core/lc-core-0.6.70.ebuild | 8 +++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch b/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch new file mode 100644 index 0000000..b5b6700 --- /dev/null +++ b/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch @@ -0,0 +1,35 @@ +GCC 5.1 and upwards are more strict with direct initialization: +* /var/tmp/portage/app-leechcraft/lc-core-0.6.70/work/leechcraft-0.6.70/src/util/network/addresses.cpp:46:3: error: direct-list-* initialization of ‘auto’ requires exactly one element [-fpermissive] +* }; +See also: +https://bugs.gentoo.org/show_bug.cgi?id=574030 + +--- leechcraft-0.6.70/src/util/network/addresses.cpp ++++ leechcraft-0.6.70/src/util/network/addresses.cpp +@@ -38,7 +38,7 @@ + AddrList_t GetLocalAddresses (int defaultPort) + { + AddrList_t defaultAddrs; +- const auto locals ++ const auto locals = + { + QHostAddress::parseSubnet ("10.0.0.0/8"), + QHostAddress::parseSubnet ("172.16.0.0/12"), +--- leechcraft-0.6.70/src/util/xdg/xdg.cpp ++++ leechcraft-0.6.70/src/util/xdg/xdg.cpp +@@ -44,13 +44,13 @@ + + QPixmap GetAppPixmap (const QString& name) + { +- const auto prefixes ++ const auto prefixes = + { + "/usr/share/pixmaps/", + "/usr/local/share/pixmaps/" + }; + +- const auto sizes { "192", "128", "96", "72", "64", "48", "36", "32" }; ++ const auto sizes = { "192", "128", "96", "72", "64", "48", "36", "32" }; + const QStringList themes + { + "/usr/local/share/icons/hicolor/", diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild index f7ca3c9..2f10cae 100644 --- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild +++ b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS=" amd64 ~x86" IUSE="debug doc +sqlite postgres +qwt" -COMMON_DEPEND=">=dev-libs/boost-1.46 +COMMON_DEPEND=">=dev-libs/boost-1.46:=[threads] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 @@ -36,6 +36,10 @@ RDEPEND="${COMMON_DEPEND} REQUIRED_USE="|| ( postgres sqlite )" +PATCHES=( + "${FILESDIR}/${P}-c++11-direct-list-initialization.patch" +) + src_configure() { local mycmakeargs=( -DWITH_PLUGINS=False