1 |
maksbotan 14/06/28 13:42:52 |
2 |
|
3 |
Added: lc-core-0.6.65-dbus-optional.patch |
4 |
lc-core-0.6.65-gcc-4.9.patch |
5 |
Log: |
6 |
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. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-leechcraft/lc-core/files/lc-core-0.6.65-dbus-optional.patch |
12 |
|
13 |
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 |
14 |
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 |
15 |
|
16 |
Index: lc-core-0.6.65-dbus-optional.patch |
17 |
=================================================================== |
18 |
commit 2e221a116dacf7541af8bfe6110856a70b8a8f70 |
19 |
Author: 0xd34df00d <0xd34df00d@×××××.com> |
20 |
Date: Mon Jun 16 14:54:15 2014 +0400 |
21 |
|
22 |
[Core] DBus loaders made optional. |
23 |
|
24 |
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
25 |
index c138fd5..dc2b8d6 100644 |
26 |
--- a/src/core/CMakeLists.txt |
27 |
+++ b/src/core/CMakeLists.txt |
28 |
@@ -5,8 +5,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR} |
29 |
${Boost_INCLUDE_DIR} |
30 |
) |
31 |
|
32 |
+option (WITH_DBUS_LOADERS "Build D-Bus loaders on UNIX" OFF) |
33 |
+ |
34 |
if (NOT USE_QT5) |
35 |
- if (NOT WIN32) |
36 |
+ if (WITH_DBUS_LOADERS) |
37 |
set (QT_USE_QTDBUS TRUE) |
38 |
endif () |
39 |
set (QT_USE_QTNETWORK TRUE) |
40 |
@@ -101,7 +103,7 @@ set (SRCS |
41 |
loaders/sopluginloader.cpp |
42 |
) |
43 |
|
44 |
-if (UNIX AND NOT APPLE) |
45 |
+if (WITH_DBUS_LOADERS) |
46 |
set (SRCS |
47 |
${SRCS} |
48 |
loaders/dbuspluginloader.cpp |
49 |
@@ -179,6 +181,6 @@ if (USE_QT5) |
50 |
QT5_USE_MODULES (leechcraft Gui Network Widgets Xml Sql Script Concurrent DBus Svg) |
51 |
endif () |
52 |
|
53 |
-if (UNIX AND NOT APPLE) |
54 |
+if (WITH_DBUS_LOADERS) |
55 |
add_subdirectory (loaders/dbus) |
56 |
endif () |
57 |
commit 4017753193a769a8bf7de6a54ec2c66954401e2f |
58 |
Author: 0xd34df00d <0xd34df00d@×××××.com> |
59 |
Date: Mon Jun 16 17:15:57 2014 +0400 |
60 |
|
61 |
[Core] Fixed linking without WITH_DBUS_LOADERS. |
62 |
|
63 |
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
64 |
index dc2b8d6..5f593ea 100644 |
65 |
--- a/src/core/CMakeLists.txt |
66 |
+++ b/src/core/CMakeLists.txt |
67 |
@@ -7,6 +7,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR} |
68 |
|
69 |
option (WITH_DBUS_LOADERS "Build D-Bus loaders on UNIX" OFF) |
70 |
|
71 |
+if (WITH_DBUS_LOADERS) |
72 |
+ add_definitions (-DWITH_DBUS_LOADERS) |
73 |
+endif () |
74 |
+ |
75 |
if (NOT USE_QT5) |
76 |
if (WITH_DBUS_LOADERS) |
77 |
set (QT_USE_QTDBUS TRUE) |
78 |
diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp |
79 |
index e769715..4cb479a 100644 |
80 |
--- a/src/core/pluginmanager.cpp |
81 |
+++ b/src/core/pluginmanager.cpp |
82 |
@@ -56,9 +56,11 @@ |
83 |
#include "shortcutmanager.h" |
84 |
#include "application.h" |
85 |
#include "loaders/sopluginloader.h" |
86 |
-#ifdef Q_OS_LINUX |
87 |
- #include "loaders/dbuspluginloader.h" |
88 |
+ |
89 |
+#ifdef WITH_DBUS_LOADERS |
90 |
+#include "loaders/dbuspluginloader.h" |
91 |
#endif |
92 |
+ |
93 |
#include "settingstab.h" |
94 |
|
95 |
namespace LeechCraft |
96 |
@@ -985,7 +987,7 @@ namespace LeechCraft |
97 |
|
98 |
Loaders::IPluginLoader_ptr PluginManager::MakeLoader (const QString& filename) |
99 |
{ |
100 |
-#ifndef Q_OS_LINUX |
101 |
+#ifndef WITH_DBUS_LOADERS |
102 |
return Loaders::IPluginLoader_ptr (new Loaders::SOPluginLoader (filename)); |
103 |
#else |
104 |
if (DBusMode_) |
105 |
|
106 |
|
107 |
|
108 |
1.1 app-leechcraft/lc-core/files/lc-core-0.6.65-gcc-4.9.patch |
109 |
|
110 |
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 |
111 |
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 |
112 |
|
113 |
Index: lc-core-0.6.65-gcc-4.9.patch |
114 |
=================================================================== |
115 |
From 2db7cf510491e3ef2f25341b35b3705acf824bc3 Mon Sep 17 00:00:00 2001 |
116 |
From: 0xd34df00d <0xd34df00d@×××××.com> |
117 |
Date: Thu, 12 Jun 2014 23:38:39 +0400 |
118 |
Subject: [PATCH] [Interfaces] Added missing include. |
119 |
|
120 |
--- |
121 |
src/interfaces/itexteditor.h | 1 + |
122 |
1 file changed, 1 insertion(+) |
123 |
|
124 |
diff --git a/src/interfaces/itexteditor.h b/src/interfaces/itexteditor.h |
125 |
index 059b936..0004bc5 100644 |
126 |
--- a/src/interfaces/itexteditor.h |
127 |
+++ b/src/interfaces/itexteditor.h |
128 |
@@ -29,6 +29,7 @@ |
129 |
|
130 |
#pragma once |
131 |
|
132 |
+#include <functional> |
133 |
#include <QPair> |
134 |
#include <QList> |
135 |
#include <QRegExp> |
136 |
-- |
137 |
1.9.3 |
138 |
|
139 |
From 317cbe27a95cc6536f163c0c833eeb1b4fb3f53b Mon Sep 17 00:00:00 2001 |
140 |
From: 0xd34df00d <0xd34df00d@×××××.com> |
141 |
Date: Thu, 12 Jun 2014 23:32:15 +0400 |
142 |
Subject: [PATCH] [Util] Added a missing include. |
143 |
|
144 |
--- |
145 |
src/util/qml/plotitem.h | 1 + |
146 |
1 file changed, 1 insertion(+) |
147 |
|
148 |
diff --git a/src/util/qml/plotitem.h b/src/util/qml/plotitem.h |
149 |
index 194c69c..8185851 100644 |
150 |
--- a/src/util/qml/plotitem.h |
151 |
+++ b/src/util/qml/plotitem.h |
152 |
@@ -29,6 +29,7 @@ |
153 |
|
154 |
#pragma once |
155 |
|
156 |
+#include <functional> |
157 |
#include <QDeclarativeItem> |
158 |
#include "qmlconfig.h" |
159 |
|
160 |
-- |
161 |
1.9.3 |