maksbotan 14/06/28 13:42:52
Added: lc-core-0.6.65-dbus-optional.patch
lc-core-0.6.65-gcc-4.9.patch
Log:
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.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F8DBDADE)
Revision Changes Path
1.1
app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch?rev=1.1&content-type=text/plain
Index: lc-core-0.6.65-dbus-optional.patch
===================================================================
commit 2e221a116dacf7541af8bfe6110856a70b8a8f70
Author: 0xd34df00d <[email protected]>
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 <[email protected]>
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_)
1.1 app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch?rev=1.1&content-type=text/plain
Index: lc-core-0.6.65-gcc-4.9.patch
===================================================================
>From 2db7cf510491e3ef2f25341b35b3705acf824bc3 Mon Sep 17 00:00:00 2001
From: 0xd34df00d <[email protected]>
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 <[email protected]>
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
