| 1 |
commit: 348c3c06fbcc4d6c84bdec267e0929030dba7230 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 6 11:15:29 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 6 11:15:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348c3c06 |
| 7 |
|
| 8 |
app-leechcraft/lc-core: Require USE="threads" for dev-libs/boost |
| 9 |
|
| 10 |
Gentoo-Bug: 574030, 580850 |
| 11 |
* Also fix C++11 direct initialization bug |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.28 |
| 14 |
|
| 15 |
...e-0.6.70-c++11-direct-list-initialization.patch | 35 ++++++++++++++++++++++ |
| 16 |
app-leechcraft/lc-core/lc-core-0.6.70.ebuild | 8 +++-- |
| 17 |
2 files changed, 41 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..b5b6700 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch |
| 24 |
@@ -0,0 +1,35 @@ |
| 25 |
+GCC 5.1 and upwards are more strict with direct initialization: |
| 26 |
+* /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] |
| 27 |
+* }; |
| 28 |
+See also: |
| 29 |
+https://bugs.gentoo.org/show_bug.cgi?id=574030 |
| 30 |
+ |
| 31 |
+--- leechcraft-0.6.70/src/util/network/addresses.cpp |
| 32 |
++++ leechcraft-0.6.70/src/util/network/addresses.cpp |
| 33 |
+@@ -38,7 +38,7 @@ |
| 34 |
+ AddrList_t GetLocalAddresses (int defaultPort) |
| 35 |
+ { |
| 36 |
+ AddrList_t defaultAddrs; |
| 37 |
+- const auto locals |
| 38 |
++ const auto locals = |
| 39 |
+ { |
| 40 |
+ QHostAddress::parseSubnet ("10.0.0.0/8"), |
| 41 |
+ QHostAddress::parseSubnet ("172.16.0.0/12"), |
| 42 |
+--- leechcraft-0.6.70/src/util/xdg/xdg.cpp |
| 43 |
++++ leechcraft-0.6.70/src/util/xdg/xdg.cpp |
| 44 |
+@@ -44,13 +44,13 @@ |
| 45 |
+ |
| 46 |
+ QPixmap GetAppPixmap (const QString& name) |
| 47 |
+ { |
| 48 |
+- const auto prefixes |
| 49 |
++ const auto prefixes = |
| 50 |
+ { |
| 51 |
+ "/usr/share/pixmaps/", |
| 52 |
+ "/usr/local/share/pixmaps/" |
| 53 |
+ }; |
| 54 |
+ |
| 55 |
+- const auto sizes { "192", "128", "96", "72", "64", "48", "36", "32" }; |
| 56 |
++ const auto sizes = { "192", "128", "96", "72", "64", "48", "36", "32" }; |
| 57 |
+ const QStringList themes |
| 58 |
+ { |
| 59 |
+ "/usr/local/share/icons/hicolor/", |
| 60 |
|
| 61 |
diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild |
| 62 |
index f7ca3c9..2f10cae 100644 |
| 63 |
--- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild |
| 64 |
+++ b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2015 Gentoo Foundation |
| 67 |
+# Copyright 1999-2016 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
@@ -15,7 +15,7 @@ SLOT="0" |
| 72 |
KEYWORDS=" amd64 ~x86" |
| 73 |
IUSE="debug doc +sqlite postgres +qwt" |
| 74 |
|
| 75 |
-COMMON_DEPEND=">=dev-libs/boost-1.46 |
| 76 |
+COMMON_DEPEND=">=dev-libs/boost-1.46:=[threads] |
| 77 |
dev-qt/qtcore:4 |
| 78 |
dev-qt/qtdbus:4 |
| 79 |
dev-qt/qtdeclarative:4 |
| 80 |
@@ -36,6 +36,10 @@ RDEPEND="${COMMON_DEPEND} |
| 81 |
|
| 82 |
REQUIRED_USE="|| ( postgres sqlite )" |
| 83 |
|
| 84 |
+PATCHES=( |
| 85 |
+ "${FILESDIR}/${P}-c++11-direct-list-initialization.patch" |
| 86 |
+) |
| 87 |
+ |
| 88 |
src_configure() { |
| 89 |
local mycmakeargs=( |
| 90 |
-DWITH_PLUGINS=False |
Archives