clang6 build fix for x11/kde4/rocs. Upstream is no help, since that
code was completely removed around the time this was released.
Yes, I suspect SelectMoveHandAction.cpp is wrong and the '&' should
be '|', but I didn't want to introduce any behavior changes.
OK?
Index: patches/patch-RocsCore_DataStructures_Graph_GraphStructure_cpp
===================================================================
RCS file: patches/patch-RocsCore_DataStructures_Graph_GraphStructure_cpp
diff -N patches/patch-RocsCore_DataStructures_Graph_GraphStructure_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-RocsCore_DataStructures_Graph_GraphStructure_cpp 23 Apr
2018 13:43:09 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: RocsCore/DataStructures/Graph/GraphStructure.cpp
+--- RocsCore/DataStructures/Graph/GraphStructure.cpp.orig
++++ RocsCore/DataStructures/Graph/GraphStructure.cpp
+@@ -323,7 +323,7 @@ QMap<DataPtr,PointerList> Rocs::GraphStructure::dijkst
+ counter = 0;
+ foreach(PointerPtr p, pointerListAll) {
+ edges[counter] = Edge(node_mapping[p->from()->identifier()],
node_mapping[p->to()->identifier()]);
+- edge_mapping[std::make_pair < int, int >
(node_mapping[p->from()->identifier()], node_mapping[p->to()->identifier()])] =
p;
++ edge_mapping[std::make_pair(node_mapping[p->from()->identifier()],
node_mapping[p->to()->identifier()])] = p;
+ if (!p->property("value").toString().isEmpty()) {
+ weights[counter] = p->property("value").toDouble();
+ } else {
+@@ -333,7 +333,7 @@ QMap<DataPtr,PointerList> Rocs::GraphStructure::dijkst
+ // if graph is directed, also add back-edges
+ if (p->direction() == PointerType::Bidirectional) {
+ edges[counter] = Edge(node_mapping[p->to()->identifier()],
node_mapping[p->from()->identifier()]);
+- edge_mapping[std::make_pair< int, int
>(node_mapping[p->to()->identifier()], node_mapping[p->from()->identifier()])]
= p;
++ edge_mapping[std::make_pair(node_mapping[p->to()->identifier()],
node_mapping[p->from()->identifier()])] = p;
+ if (!p->property("value").toString().isEmpty()) {
+ weights[counter] = p->property("value").toDouble();
+ } else {
Index:
patches/patch-RocsCore_LoadSave_Plugins_tgfFileFormat_Tests_TestTgfFileFormatPlugin_cpp
===================================================================
RCS file:
patches/patch-RocsCore_LoadSave_Plugins_tgfFileFormat_Tests_TestTgfFileFormatPlugin_cpp
diff -N
patches/patch-RocsCore_LoadSave_Plugins_tgfFileFormat_Tests_TestTgfFileFormatPlugin_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
patches/patch-RocsCore_LoadSave_Plugins_tgfFileFormat_Tests_TestTgfFileFormatPlugin_cpp
23 Apr 2018 13:43:09 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index:
RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/TestTgfFileFormatPlugin.cpp
+---
RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/TestTgfFileFormatPlugin.cpp.orig
++++ RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/TestTgfFileFormatPlugin.cpp
+@@ -66,7 +66,7 @@ void TestTgfFileFormatPlugin::serializeUnserializeTest
+ ds = testDoc->dataStructures().at(0);
+
+ // test imported values
+- QVERIFY(ds);
++ QVERIFY(ds != NULL);
+ QVERIFY2(ds->dataList(0).size() == 5, "ERROR: Number of data is not 5 ");
+ QVERIFY2(ds->pointers(0).size() == 5, "ERROR: Number of pointers is not 5
");
+ foreach(DataPtr n, ds->dataList(0)) {
Index: patches/patch-VisualEditor_Actions_SelectMoveHandAction_cpp
===================================================================
RCS file: patches/patch-VisualEditor_Actions_SelectMoveHandAction_cpp
diff -N patches/patch-VisualEditor_Actions_SelectMoveHandAction_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-VisualEditor_Actions_SelectMoveHandAction_cpp 23 Apr 2018
13:43:09 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: VisualEditor/Actions/SelectMoveHandAction.cpp
+--- VisualEditor/Actions/SelectMoveHandAction.cpp.orig
++++ VisualEditor/Actions/SelectMoveHandAction.cpp
+@@ -83,8 +83,8 @@ bool SelectMoveHandAction::executePress(QPointF pos)
+ }
+
+ if (_graphScene->items().count() > 600) { // 5! + 25 items on screen
+- _graphScene->views().at(0)->setRenderHints(QPainter::Antialiasing
+- & QPainter::TextAntialiasing);
++ _graphScene->views().at(0)->setRenderHints(QPainter::RenderHint(
++ QPainter::Antialiasing & QPainter::TextAntialiasing));
+ }
+ return true;
+ }
--
Christian "naddy" Weisgerber [email protected]
