Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / development / libraries / swiften / build-fix.patch
blobd0ce099973c22109bddeec14a9b8c5bb63cabb7e
1 diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h
2 --- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2018-04-06 13:06:46.000000000 +0300
3 +++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2019-10-08 20:52:23.171475337 +0300
4 @@ -9,6 +9,7 @@
5 #include <set>
7 #include <QWizard>
8 +#include <QAbstractItemModel>
10 #include <Swiften/Base/Override.h>
12 diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp
13 --- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp 2018-04-06 13:06:46.000000000 +0300
14 +++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp 2019-10-08 21:12:25.284754131 +0300
15 @@ -157,7 +157,7 @@
16 miniUPnPInterface = new MiniUPnPInterface();
17 miniUPnPSupported = miniUPnPInterface->isAvailable();
19 - SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
20 +// SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
21 if (miniUPnPSupported) {
22 return miniUPnPInterface;
24 @@ -168,7 +168,7 @@
25 natPMPInterface = new NATPMPInterface();
26 natPMPSupported = natPMPInterface->isAvailable();
28 - SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
29 +// SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
30 if (natPMPSupported) {
31 return natPMPInterface;
33 --- a/Swift/Controllers/ShowProfileController.h
34 +++ b/Swift/Controllers/ShowProfileController.h
35 @@ -12,6 +12,7 @@
37 #pragma once
39 +#include <map>
40 #include <Swiften/Elements/ErrorPayload.h>
41 #include <Swiften/Elements/VCard.h>
42 #include <Swiften/JID/JID.h>