1
0
Adrian Schröter 2019-01-08 07:25:25 +00:00 committed by Git OBS Bridge
parent 77f6b57390
commit abd0fb8d63
2 changed files with 42 additions and 2 deletions

View File

@ -26,7 +26,7 @@ Conflicts: cura-engine
Url: https://code.alephobjects.com/diffusion/CTE/cura-engine.git
Source0: CuraEngine-%{version}.tar.xz
Source1: CuraEngine.1
#Patch1: fix-build.patch
Patch1: fix-build.patch
%if 0%{?suse_version} < 1500
BuildRequires: gcc6-c++
#!BuildIgnore: libgcc_s1
@ -47,7 +47,7 @@ This is the LulzBot variation of the engine.
%prep
%setup -q -n CuraEngine-%version
#%patch1 -p1
%patch1 -p1
%build
%if 0%{?suse_version} < 1500

40
fix-build.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/tests/arcus/MockSocket.cpp b/tests/arcus/MockSocket.cpp
index 73cbb867..a72780e1 100644
--- a/tests/arcus/MockSocket.cpp
+++ b/tests/arcus/MockSocket.cpp
@@ -20,7 +20,7 @@ void MockSocket::sendMessage(Arcus::MessagePtr message)
sent_messages.push_back(message);
}
-Arcus::MessagePtr MockSocket::takeNextMessage()
+Arcus::MessagePtr MockSocket::takeNextMessage(bool)
{
Arcus::MessagePtr result = received_messages.front();
received_messages.pop_front();
@@ -39,4 +39,4 @@ Arcus::MessagePtr MockSocket::popMessageFromSendQueue()
return result;
}
-} //namespace cura
\ No newline at end of file
+} //namespace cura
diff --git a/tests/arcus/MockSocket.h b/tests/arcus/MockSocket.h
index 80370f49..f9e8050a 100644
--- a/tests/arcus/MockSocket.h
+++ b/tests/arcus/MockSocket.h
@@ -27,7 +27,7 @@ public:
//Catch these functions so that we can see whether they are called.
void sendMessage(Arcus::MessagePtr message) override;
- Arcus::MessagePtr takeNextMessage() override;
+ Arcus::MessagePtr takeNextMessage(bool) override;
//Helpers to store the sent and received messages.
void pushMessageToReceivedQueue(Arcus::MessagePtr message);
@@ -38,4 +38,4 @@ public:
} //namespace cura
-#endif //MOCKSOCKET_H
\ No newline at end of file
+#endif //MOCKSOCKET_H