unity7maintainers team mailing list archive

[Aleksey Tulinov <aleksey.tulinov@xxxxxxxxx>]

Hello.

Is it possible to apply some patches? First one is for build w/o PCH
(-Duse_pch=OFF), second one is for GCC 8 or something, maybe for the
new stdlib, point is: <iostream> should be included. Third one is for
boost 1.68, <boost/utility.hpp> no longer includes
<boost/next_prior.hpp>. I think boost::prior() is not really needed
there and --it will do as well, but i didn't want to change behavior
in any way, so it only fixes includes.

By the way thanks for the mirroring Bazaar repository to Git, this is
very convenient and helpful.


>From 1d63a16cb70bb908a012a357f1cb7cecd0143cfa Mon Sep 17 00:00:00 2001
From: Aleksey Tulinov <aleksey.tulinov@xxxxxxxxx>
Date: Tue, 10 Apr 2018 00:42:47 +0300
Subject: [PATCH 1/3] +added missing includes for build w/o pch

---
 UnityCore/GLibDBusServer.cpp        | 2 ++
 launcher/DevicesSettingsImp.cpp     | 1 +
 launcher/FavoriteStoreGSettings.cpp | 2 ++
 launcher/FavoriteStorePrivate.h     | 2 +-
 unity-shared/IconLoader.h           | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/UnityCore/GLibDBusServer.cpp b/UnityCore/GLibDBusServer.cpp
index 49b70d7c0..8fcfdf9d7 100644
--- a/UnityCore/GLibDBusServer.cpp
+++ b/UnityCore/GLibDBusServer.cpp
@@ -17,7 +17,9 @@
 * Authored by: Marco Trevisan (Treviño) <marco.trevisan@xxxxxxxxxxxxx>
 */

+#include <algorithm>
 #include <unordered_map>
+
 #include <NuxCore/Logger.h>

 #include "GLibDBusServer.h"
diff --git a/launcher/DevicesSettingsImp.cpp b/launcher/DevicesSettingsImp.cpp
index 08eddb9cb..25f40a6b2 100644
--- a/launcher/DevicesSettingsImp.cpp
+++ b/launcher/DevicesSettingsImp.cpp
@@ -17,6 +17,7 @@
  * Authored by: Andrea Azzarone <andrea.azzarone@xxxxxxxxxxxxx>
  */

+#include <algorithm>
 #include <list>

 #include <gio/gio.h>
diff --git a/launcher/FavoriteStoreGSettings.cpp
b/launcher/FavoriteStoreGSettings.cpp
index 415a04bfe..493e823b1 100644
--- a/launcher/FavoriteStoreGSettings.cpp
+++ b/launcher/FavoriteStoreGSettings.cpp
@@ -18,6 +18,8 @@
 *              Marco Trevisan <marco.trevisan@xxxxxxxxxxxxx>
 */

+#include <algorithm>
+
 #include <NuxCore/Logger.h>
 #include <UnityCore/DesktopUtilities.h>

diff --git a/launcher/FavoriteStorePrivate.h b/launcher/FavoriteStorePrivate.h
index 3edad2357..ebd3cfe2a 100644
--- a/launcher/FavoriteStorePrivate.h
+++ b/launcher/FavoriteStorePrivate.h
@@ -22,6 +22,7 @@

 #include <list>
 #include <string>
+#include <vector>

 namespace unity
 {
@@ -47,4 +48,3 @@ bool IsDesktopFilePath(std::string const& path);
 } // namespace unity

 #endif
-
diff --git a/unity-shared/IconLoader.h b/unity-shared/IconLoader.h
index fb4587e35..595def484 100644
--- a/unity-shared/IconLoader.h
+++ b/unity-shared/IconLoader.h
@@ -22,6 +22,7 @@

 #include <boost/utility.hpp>

+#include <functional>
 #include <memory>
 #include <gtk/gtk.h>
 #include <UnityCore/ActionHandle.h>
-- 
2.19.1


>From e7eaa99d2b65531e60ff0a19318dd52df417f33c Mon Sep 17 00:00:00 2001
From: Aleksey Tulinov <aleksey.tulinov@xxxxxxxxx>
Date: Fri, 2 Nov 2018 23:50:25 +0200
Subject: [PATCH 2/3] +added missing include

---
 UnityCore/GLibWrapper.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UnityCore/GLibWrapper.cpp b/UnityCore/GLibWrapper.cpp
index 21ad68e86..f398804ec 100644
--- a/UnityCore/GLibWrapper.cpp
+++ b/UnityCore/GLibWrapper.cpp
@@ -17,6 +17,8 @@
 * Authored by: Tim Penhey <tim.penhey@xxxxxxxxxxxxx>
 */

+#include <iostream>
+
 #include "GLibWrapper.h"

 namespace unity
@@ -213,4 +215,3 @@ bool operator!=(Object<GCancellable> const& lhs,
Cancellable const& rhs)

 }
 }
-
-- 
2.19.1


>From 0743e49f9f4f3a4c96ac44c03aa7dc7dad905bdb Mon Sep 17 00:00:00 2001
From: Aleksey Tulinov <aleksey.tulinov@xxxxxxxxx>
Date: Sat, 3 Nov 2018 00:24:07 +0200
Subject: [PATCH 3/3] +fixed includes

---
 launcher/FavoriteStorePrivate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/FavoriteStorePrivate.cpp
b/launcher/FavoriteStorePrivate.cpp
index b4d1d94f4..019c3073d 100644
--- a/launcher/FavoriteStorePrivate.cpp
+++ b/launcher/FavoriteStorePrivate.cpp
@@ -18,7 +18,7 @@
 */

 #include <algorithm>
-#include <boost/utility.hpp>
+#include <boost/next_prior.hpp>

 #include "FavoriteStorePrivate.h"

-- 
2.19.1