From f5f6ca5bc72f1a8fc5fbe2e98a2ab2096293cfdb Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Tue, 18 Jun 2024 17:18:33 -0300 Subject: [PATCH] Fix linuxdeploy log directory rename --- lib/linuxdeploy | 2 +- src/deployers/BasicPluginsDeployer.cpp | 4 ++-- src/deployers/Multimedia6PluginsDeployer.cpp | 4 ++-- src/deployers/PlatformPluginsDeployer.cpp | 4 ++-- src/deployers/SvgPluginsDeployer.cpp | 4 ++-- src/deployers/TextToSpeechPluginsDeployer.cpp | 4 ++-- src/deployers/WebEnginePluginsDeployer.cpp | 4 ++-- src/deployers/XcbglIntegrationPluginsDeployer.cpp | 4 ++-- src/deployment.h | 4 ++-- src/main.cpp | 4 ++-- src/qml.cpp | 4 ++-- src/util.cpp | 5 +++-- src/util.h | 1 - 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/linuxdeploy b/lib/linuxdeploy index 76ec4f2..a29b9a4 160000 --- a/lib/linuxdeploy +++ b/lib/linuxdeploy @@ -1 +1 @@ -Subproject commit 76ec4f2c6a7bc9be3ddce41f7f4b4e31ead6d95e +Subproject commit a29b9a48d7f0f8d0f404743274368327edcb5428 diff --git a/src/deployers/BasicPluginsDeployer.cpp b/src/deployers/BasicPluginsDeployer.cpp index f636fed..f04b0e8 100644 --- a/src/deployers/BasicPluginsDeployer.cpp +++ b/src/deployers/BasicPluginsDeployer.cpp @@ -3,12 +3,12 @@ #include // library headers -#include +#include // local headers #include "BasicPluginsDeployer.h" -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; using namespace linuxdeploy::core::appdir; using namespace linuxdeploy::plugin::qt; diff --git a/src/deployers/Multimedia6PluginsDeployer.cpp b/src/deployers/Multimedia6PluginsDeployer.cpp index 709c81b..4004828 100644 --- a/src/deployers/Multimedia6PluginsDeployer.cpp +++ b/src/deployers/Multimedia6PluginsDeployer.cpp @@ -2,13 +2,13 @@ #include // library headers -#include +#include // local headers #include "Multimedia6PluginsDeployer.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; namespace fs = std::filesystem; diff --git a/src/deployers/PlatformPluginsDeployer.cpp b/src/deployers/PlatformPluginsDeployer.cpp index 04f8e37..a40bba6 100644 --- a/src/deployers/PlatformPluginsDeployer.cpp +++ b/src/deployers/PlatformPluginsDeployer.cpp @@ -2,14 +2,14 @@ #include // library headers -#include +#include #include // local headers #include "PlatformPluginsDeployer.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; namespace fs = std::filesystem; diff --git a/src/deployers/SvgPluginsDeployer.cpp b/src/deployers/SvgPluginsDeployer.cpp index 36f452a..5e38cea 100644 --- a/src/deployers/SvgPluginsDeployer.cpp +++ b/src/deployers/SvgPluginsDeployer.cpp @@ -2,13 +2,13 @@ #include // library headers -#include +#include // local headers #include "SvgPluginsDeployer.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; namespace fs = std::filesystem; diff --git a/src/deployers/TextToSpeechPluginsDeployer.cpp b/src/deployers/TextToSpeechPluginsDeployer.cpp index 8b8e2c2..c044419 100644 --- a/src/deployers/TextToSpeechPluginsDeployer.cpp +++ b/src/deployers/TextToSpeechPluginsDeployer.cpp @@ -2,13 +2,13 @@ #include // library headers -#include +#include // local headers #include "TextToSpeechPluginsDeployer.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; namespace fs = std::filesystem; diff --git a/src/deployers/WebEnginePluginsDeployer.cpp b/src/deployers/WebEnginePluginsDeployer.cpp index 32e6dde..939b3c9 100644 --- a/src/deployers/WebEnginePluginsDeployer.cpp +++ b/src/deployers/WebEnginePluginsDeployer.cpp @@ -3,14 +3,14 @@ #include // library headers -#include +#include #include // local headers #include "WebEnginePluginsDeployer.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; namespace fs = std::filesystem; diff --git a/src/deployers/XcbglIntegrationPluginsDeployer.cpp b/src/deployers/XcbglIntegrationPluginsDeployer.cpp index be24abb..6e2c390 100644 --- a/src/deployers/XcbglIntegrationPluginsDeployer.cpp +++ b/src/deployers/XcbglIntegrationPluginsDeployer.cpp @@ -1,12 +1,12 @@ // library headers -#include +#include // local headers #include "XcbglIntegrationPluginsDeployer.h" #include "deployment.h" using namespace linuxdeploy::plugin::qt; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; bool XcbglIntegrationPluginsDeployer::doDeploy() { ldLog() << "Deploying xcb-gl integrations" << std::endl; diff --git a/src/deployment.h b/src/deployment.h index 04df3a1..17550bc 100644 --- a/src/deployment.h +++ b/src/deployment.h @@ -7,7 +7,7 @@ // library includes #include #include -#include +#include #include // local includes @@ -19,7 +19,7 @@ namespace fs = std::filesystem; using namespace linuxdeploy::core; using namespace linuxdeploy::util::misc; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; // little helper called by other integration plugins inline bool deployIntegrationPlugins(appdir::AppDir& appDir, const fs::path& qtPluginsPath, const std::initializer_list& subDirs) { diff --git a/src/main.cpp b/src/main.cpp index 9f0ca45..3d61c59 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,7 +9,7 @@ // library includes #include #include -#include +#include #include // local includes @@ -22,7 +22,7 @@ namespace fs = std::filesystem; using namespace linuxdeploy::core; using namespace linuxdeploy::util::misc; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; using namespace linuxdeploy::plugin::qt; diff --git a/src/qml.cpp b/src/qml.cpp index 6bdf4ce..3d588e5 100644 --- a/src/qml.cpp +++ b/src/qml.cpp @@ -4,7 +4,7 @@ // library includes #include #include -#include +#include #include #include #include @@ -14,7 +14,7 @@ #include "qml.h" using namespace linuxdeploy::core; -using namespace linuxdeploy::core::log; +using namespace linuxdeploy::log; using namespace linuxdeploy::subprocess; using namespace linuxdeploy::util; using namespace nlohmann; diff --git a/src/util.cpp b/src/util.cpp index 3bd0d87..9bc3cd4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2,6 +2,7 @@ #include // library headers +#include #include #include @@ -13,7 +14,7 @@ using namespace linuxdeploy::subprocess; std::map queryQmake(const std::filesystem::path& qmakePath) { auto qmakeCall = subprocess({qmakePath.string(), "-query"}).run(); - using namespace linuxdeploy::core::log; + using namespace linuxdeploy::log; if (qmakeCall.exit_code() != 0) { ldLog() << LD_ERROR << "Call to qmake failed:" << qmakeCall.stderr_string() << std::endl; @@ -54,7 +55,7 @@ std::map queryQmake(const std::filesystem::path& qmake }; std::filesystem::path findQmake() { - using namespace linuxdeploy::core::log; + using namespace linuxdeploy::log; std::filesystem::path qmakePath; diff --git a/src/util.h b/src/util.h index 3d48755..f384662 100644 --- a/src/util.h +++ b/src/util.h @@ -10,7 +10,6 @@ // library includes #include -#include typedef struct { bool success;