unity7maintainers team mailing list archive

[Marco Trevisan <marco.trevisan@xxxxxxxxxxxxx>]

Hi Aleksev,

Thanks, I've prepared a merge request [1] with it, and a bileto silo [2]

[1] https://code.launchpad.net/~unity-team/unity/+git/unity/+merge/358294
[2] https://bileto.ubuntu.com/#/ticket/3504

Il 03/11/18 11:09, Aleksey Tulinov ha scritto:
> 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>
>