Add upstream patches for making dbus optional (and disabling it by default) and fixes for gcc-4.9, bug #513904 and bug #513404. Thanks to patrick for the report and to 0xd34df00d for the fixes.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

5 files changed, 167 insertions, 5 deletions

diff --git a/app-leechcraft/lc-core/ChangeLog b/app-leechcraft/lc-core/ChangeLog
index 672ab0f2954c..d6a372fa79ca 100644
--- a/app-leechcraft/lc-core/ChangeLog
+++ b/app-leechcraft/lc-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-leechcraft/lc-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-core/ChangeLog,v 1.18 2014/06/25 06:36:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-core/ChangeLog,v 1.19 2014/06/28 13:42:52 maksbotan Exp $
+
+  28 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/lc-core-0.6.65-dbus-optional.patch,
+  +files/lc-core-0.6.65-gcc-4.9.patch, lc-core-0.6.65.ebuild:
+  Add upstream patches for making dbus optional (and disabling it by default)
+  and fixes for gcc-4.9, bug #513904 and bug #513404. Thanks to patrick for the
+  report and to 0xd34df00d for the fixes.
 
   25 Jun 2014; Patrick Lauer <patrick@gentoo.org> lc-core-0.6.65.ebuild,
   lc-core-9999.ebuild:
diff --git a/app-leechcraft/lc-core/Manifest b/app-leechcraft/lc-core/Manifest
index b21adcf5f560..5d8457051e9a 100644
--- a/app-leechcraft/lc-core/Manifest
+++ b/app-leechcraft/lc-core/Manifest
@@ -1,7 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lc-core-0.6.65-dbus-optional.patch 2361 SHA256 53ba37d116651f8c1e4ee9493dd4aa0990f538b0d42798527f732204ff4026ef SHA512 0ff550e5608b7541fc21ffab0bcea95c21c8a6323b7e2a1034c19d8700d9fe162e6c3ac64c62515cc4640885af750bb1ea9fcc3e4d60beb52a5449c51755ea90 WHIRLPOOL fcef7f279f52c16e76e3a4d1ceb17e3078cc97a94fe17d2e7b9655af22244a10cc63687875fe1e2eb08ebaaadab4f3b250ea49b746807563833bacd14523ac77
+AUX lc-core-0.6.65-gcc-4.9.patch 1120 SHA256 899462ae387a35b078f04f63bd866faddb32460ffa241c92c0fcd361c17e1695 SHA512 36507fa04e9a108f55a2e2c6da4dc01d2fb39cdb547a2a1c0a1c2dfc02c768b0814830cd713d2e50cd179027f2b9b55ffea1902c5a3b5becd11798c3aa94da56 WHIRLPOOL 46a3f7797e0df8e2cb3e8cabda92854877b7263020bb7248c4728471ee2cb64d7fdb323b65387d95ac9e0826b4a623b258a85778605c5282f8966d11c4f18dea
 DIST leechcraft-0.6.60.tar.xz 5089252 SHA256 669c2325235c3c49dfc9a30d38c1ad08c0a6abf1ebbf2c8d33eca27e976e1b6d SHA512 0bac75f96bfc43c692e8b61ba5e9b6b82d535a78bd310966c36579666feb8b87217a9d74cfe792fa32b57b9b04e158239acbf2422014735d2316cbda2d8b39ec WHIRLPOOL f3056faab0006830afbcf5f3448094e530c908d432cebec731f305f34347e514db55416a911674c28445a3cd4e542136fd053ee5e444b3cf93e086dc9e88428c
 DIST leechcraft-0.6.65.tar.xz 5067580 SHA256 b821fb8716b3ba04862bbb358a738609ead84cd9c86b569fe31c712b48c2a7fd SHA512 94e3cfa42bea572cb2feeaf4c7153c8d7e08e0597d447db5033b72222cea67370e8948d0dd0e2b89585583a88b4ee3df7b32d72dcd624d383e79b9472ceffe30 WHIRLPOOL bc589f46c89351328e25e6e32febdcba8ead639a8d1daf18df7352372d66fb8f8e7e5bbef02d49b6a00a7f5ffa15d66699b79cc73f64ea1bf8b59949fcd81b8a
 EBUILD lc-core-0.6.60.ebuild 1233 SHA256 fa14049ff0dd9de00e377fc8569dbf2fcce4552bef905b3c8312059483cf41af SHA512 b1e866ab9f35022b22dfef124bacd67059c0750dc2ce3040cdb55d8d4b85085c3c5e8f90fb1e337127f6c00036d50196e0429f390708f34fed47d3d45ba0c55b WHIRLPOOL 76ccfb15ed8ea8b20abdd18ec604ed00f7a2156afb973a44592689c137eb54ad796e68c4f181839c0b2495694033bdc634d410d2b6cfe53cb455a92034504456
-EBUILD lc-core-0.6.65.ebuild 1253 SHA256 cf7f7e20632c9ba38f05ab14451ad806ba6b8b8d4029555c4dabae7712585886 SHA512 84187322307d88c9a7193ce31d2bad49909e1d2ee8344b465ec0c25b8e126ef75d453b0a451d8be00e696c39e2744c814ff65f825f4d39a5913c5a8cd68947d5 WHIRLPOOL cbc971591e48709a4530c6a5b80ec7bcce3fe288e580363524e0b55221ea1f11eb1684f76aff55e63f270704f3bb3ae18c5cb49b4368fa5f64bc40a657a6f094
+EBUILD lc-core-0.6.65.ebuild 1325 SHA256 e0131b31a2d8868df61fa2cee714bfbfb8d95fb30dee36b63e88019a3d6aaa30 SHA512 f6f18e6ce696552bb8f255f81007b713e9a2cb9569c319f1fc3f32e00b1308b6659aa0daa990b4c60278da2edada2a6970cb566b895b6e05dbfca6cdba7f8ec7 WHIRLPOOL f111b3b57e78bef82101c303985ee68b9c386041fce2097b9d21e2d461ca178e95769ac02212e4984f9f53ad1e2b08432eb731351f352d6f32afe925164967d6
 EBUILD lc-core-9999.ebuild 1239 SHA256 4471da61fa29f7d76457f2cc1f7fceea1925613bbf7a0fd61f344d9eae43420d SHA512 e6da861bfcf412115c243cde9e5ad5e0f763272016065b87e67db98f5f68af6fd4627a2a47987697d7cbdcc7d3a3ef1bc495a72da5b535eee677a6f6c85f7e93 WHIRLPOOL 8cd62f0484b081a8456ba739bd191a04ed82ef819c451d37786055e5959e35b7b7a26ab4d980ef8379f7969d6437c5f28b385b11e2366dc94d01c1b9933aee2e
-MISC ChangeLog 9462 SHA256 79c91d6273878b6432b0064e866f6ee33244551203789a6773c7fb5e854894b8 SHA512 7ab39e3cfcd9f79fe21e1840c2c1661e38a0578dc47686893f85c1d6c75bcfc0a3f7a2d158247007312909d4dfac7d347e9a6aea4b41a73074cc450e69bed9c4 WHIRLPOOL 33232d20b9a16d0bb945f5f5fc15435a3ce050a479bbc8452597d1020b31f542f3c33730b850531037ea7a9f300d1cf517f12acd4dfaf3b430821289eb07e4c1
+MISC ChangeLog 9824 SHA256 8704064acb13319c8b2c08d66f46e74f87e6c64b463ce93c8699134bf9e4050b SHA512 ae6385b32d9353cc8cd12a85a593fb313a85bb4c7fa0434149eef1cb0ccc016fee3ec3e3e7e46138c954c7ec05bcbb413a4d3ff5e9748684bfbdcc470eedcb37 WHIRLPOOL dcea7fb4aba6a087758dd8fdb8167176d429d37f6e5c1ae889fe93b94d2c78dd0768cfa4eb3f8211ca08814ad364b4a1972f9f722ed77578174aa01f0766ace4
 MISC metadata.xml 434 SHA256 d2b76b29c68bf4c82277072711d3eb0503afc1dedcce0684b515fc6519cdb3e6 SHA512 eb807c618b80498bf58001f255c5a3f013d6c57bad194a2a4a2146135af12d73670df73b7e7e1d835e8037043bf7765e779832decf6d2aedc0adc532b89233f2 WHIRLPOOL 80111ef76b01eb8e7f445ab238ac4d02e681641e95869b4ea5b4ca95d986a86ee9239c50043007b1b7e88e5ec3c7394abf65e9058dfbcf9a1d069d57f0b72d16
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJTrsX3AAoJEAmJmMX429re+OUH+QGbFxhW8HbnNLHMEiweSj9Q
+ro+FBT6X0pIDbENxjpI5nRGb9ePtV8n5WuF5GOVsrH/YC5tV8DyLGnFUdGtQKvUC
+rXh4dduHYD0GfCZPVA6am5rxc1qsUJQ/d62G3j7jf/9S1GLtwuF7/pQG2ZtEodqg
+eJwS2U7Kpk9VeaX93pHXT/CQwCIqxJW9hPZt6d+HpBg4aZ8ygmSaArK1YNfUISMd
+o0UJ8d8U5pyIoF+A1/MFz7clXA52wk/YCzcnMMyJwV4bziILy5kfgnpEMn2Qf9sm
+db/0bKZ/ycybn6+eAqY0/dtZdihD6YR0h+lcboo6ba0hunaq8DkK1ERZTt5KNVE=
+=Hv3C
+-----END PGP SIGNATURE-----
diff --git a/app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch b/app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch
new file mode 100644
index 000000000000..6d784608b3bc
--- /dev/null
+++ b/app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch
@@ -0,0 +1,87 @@
+commit 2e221a116dacf7541af8bfe6110856a70b8a8f70
+Author: 0xd34df00d <0xd34df00d@gmail.com>
+Date:   Mon Jun 16 14:54:15 2014 +0400
+
+    [Core] DBus loaders made optional.
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index c138fd5..dc2b8d6 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -5,8 +5,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ 	${Boost_INCLUDE_DIR}
+ 	)
+ 
++option (WITH_DBUS_LOADERS "Build D-Bus loaders on UNIX" OFF)
++
+ if (NOT USE_QT5)
+-	if (NOT WIN32)
++	if (WITH_DBUS_LOADERS)
+ 		set (QT_USE_QTDBUS TRUE)
+ 	endif ()
+ 	set (QT_USE_QTNETWORK TRUE)
+@@ -101,7 +103,7 @@ set (SRCS
+ 	loaders/sopluginloader.cpp
+ 	)
+ 
+-if (UNIX AND NOT APPLE)
++if (WITH_DBUS_LOADERS)
+ 	set (SRCS
+ 		${SRCS}
+ 		loaders/dbuspluginloader.cpp
+@@ -179,6 +181,6 @@ if (USE_QT5)
+ 	QT5_USE_MODULES (leechcraft Gui Network Widgets Xml Sql Script Concurrent DBus Svg)
+ endif ()
+ 
+-if (UNIX AND NOT APPLE)
++if (WITH_DBUS_LOADERS)
+ 	add_subdirectory (loaders/dbus)
+ endif ()
+commit 4017753193a769a8bf7de6a54ec2c66954401e2f
+Author: 0xd34df00d <0xd34df00d@gmail.com>
+Date:   Mon Jun 16 17:15:57 2014 +0400
+
+    [Core] Fixed linking without WITH_DBUS_LOADERS.
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index dc2b8d6..5f593ea 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -7,6 +7,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ 
+ option (WITH_DBUS_LOADERS "Build D-Bus loaders on UNIX" OFF)
+ 
++if (WITH_DBUS_LOADERS)
++	add_definitions (-DWITH_DBUS_LOADERS)
++endif ()
++
+ if (NOT USE_QT5)
+ 	if (WITH_DBUS_LOADERS)
+ 		set (QT_USE_QTDBUS TRUE)
+diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp
+index e769715..4cb479a 100644
+--- a/src/core/pluginmanager.cpp
++++ b/src/core/pluginmanager.cpp
+@@ -56,9 +56,11 @@
+ #include "shortcutmanager.h"
+ #include "application.h"
+ #include "loaders/sopluginloader.h"
+-#ifdef Q_OS_LINUX
+-	#include "loaders/dbuspluginloader.h"
++
++#ifdef WITH_DBUS_LOADERS
++#include "loaders/dbuspluginloader.h"
+ #endif
++
+ #include "settingstab.h"
+ 
+ namespace LeechCraft
+@@ -985,7 +987,7 @@ namespace LeechCraft
+ 
+ 	Loaders::IPluginLoader_ptr PluginManager::MakeLoader (const QString& filename)
+ 	{
+-#ifndef Q_OS_LINUX
++#ifndef WITH_DBUS_LOADERS
+ 		return Loaders::IPluginLoader_ptr (new Loaders::SOPluginLoader (filename));
+ #else
+ 		if (DBusMode_)
diff --git a/app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch b/app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch
new file mode 100644
index 000000000000..1ea3cc410c67
--- /dev/null
+++ b/app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch
@@ -0,0 +1,48 @@
+From 2db7cf510491e3ef2f25341b35b3705acf824bc3 Mon Sep 17 00:00:00 2001
+From: 0xd34df00d <0xd34df00d@gmail.com>
+Date: Thu, 12 Jun 2014 23:38:39 +0400
+Subject: [PATCH] [Interfaces] Added missing include.
+
+---
+ src/interfaces/itexteditor.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/interfaces/itexteditor.h b/src/interfaces/itexteditor.h
+index 059b936..0004bc5 100644
+--- a/src/interfaces/itexteditor.h
++++ b/src/interfaces/itexteditor.h
+@@ -29,6 +29,7 @@
+ 
+ #pragma once
+ 
++#include <functional>
+ #include <QPair>
+ #include <QList>
+ #include <QRegExp>
+-- 
+1.9.3
+
+From 317cbe27a95cc6536f163c0c833eeb1b4fb3f53b Mon Sep 17 00:00:00 2001
+From: 0xd34df00d <0xd34df00d@gmail.com>
+Date: Thu, 12 Jun 2014 23:32:15 +0400
+Subject: [PATCH] [Util] Added a missing include.
+
+---
+ src/util/qml/plotitem.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/qml/plotitem.h b/src/util/qml/plotitem.h
+index 194c69c..8185851 100644
+--- a/src/util/qml/plotitem.h
++++ b/src/util/qml/plotitem.h
+@@ -29,6 +29,7 @@
+ 
+ #pragma once
+ 
++#include <functional>
+ #include <QDeclarativeItem>
+ #include "qmlconfig.h"
+ 
+-- 
+1.9.3
+
diff --git a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
index 29876db767dc..f96cfbe95cf1 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-core/lc-core-0.6.65.ebuild,v 1.2 2014/06/25 06:36:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-core/lc-core-0.6.65.ebuild,v 1.3 2014/06/28 13:42:52 maksbotan Exp $
 
 EAPI="5"
 
@@ -22,7 +22,6 @@ COMMON_DEPEND=">=dev-libs/boost-1.46
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4[postgres?,sqlite?]
 	dev-qt/qtwebkit:4
-	dev-qt/qtdbus:4
 	qwt? ( x11-libs/qwt:6 )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )"
@@ -35,6 +34,11 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-dbus-optional.patch
+	"${FILESDIR}"/${P}-gcc-4.9.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_PLUGINS=False