On 05/26/2013 01:06 AM, Aaron J. Seigo wrote:
On Sunday, May 26, 2013 00:50:37 Ruediger Gad wrote:Another thing I found with respect to the devel image is that it is missing /usr/bin/contour which is present in the testing version. I assume contour is responsible for painting the main parts of the UI?No, plasma-device is. contourd should not be required.
I just gave it a try with a fresh image based on the devel branch. With the stock image the ui does not come up.Then I manually copied /usr/bin/contour and /usr/share/autostart/contour.desktop from the plasma-mobile rpm of the testing branch.
With the copied files in place the ui comes up as it should. ps also shows a running contour process.With respect to the changes in plasma-mobile that lead to contour not being built: There is a new automatism that dynamically determines at build-time whether contourd should be build or not.
There seem to be some errors related to this, at least on arm. Attached, I send you a diff with from my attempt to let it build again.Please note that those changes are very hackish and are only intended as experiments. I am not even sure if QtNetworkManager vs. NetworkManagerQt is really a mistake. But I hope that it is suited to give an impression of what may go wrong. Also note that even though the build progressed more with these changes it still failed.
I hope you consider this as useful. BR Ruediger
_______________________________________________ Active mailing list [email protected] https://mail.kde.org/mailman/listinfo/active
-- http://ruedigergad.com
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d15e9..893524e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(Nepomuk REQUIRED)
find_package(Soprano)
find_package(PkgConfig)
-pkg_check_modules(QTNETWORKMANAGER QtNetworkManager)
+pkg_check_modules(QTNETWORKMANAGER NetworkManagerQt)
macro_log_feature(
Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net";
diff --git a/contourd/CMakeLists.txt b/contourd/CMakeLists.txt
index 9fbeb3e..30486f0 100644
--- a/contourd/CMakeLists.txt
+++ b/contourd/CMakeLists.txt
@@ -12,6 +12,7 @@ include_directories(
${QT_INCLUDES}
${KDE4_INCLUDES}
${NEPOMUK_INCLUDE_DIR}
+ /usr/include/NetworkManager
${SOPRANO_INCLUDE_DIR}
# QtMobility doesn't work for us anyway:
@@ -102,7 +103,7 @@ set(recommendationmanager_SRC
set(ADDITIONAL_LINK_LIBRARIES
${ADDITIONAL_LINK_LIBRARIES}
- QtNetworkManager
+ NetworkManagerQt
)
########################################################################
diff --git a/contourd/location/network-engines/solid/SolidNetworkNotifier.cpp b/contourd/location/network-engines/solid/SolidNetworkNotifier.cpp
index 759042f..4989b15 100644
--- a/contourd/location/network-engines/solid/SolidNetworkNotifier.cpp
+++ b/contourd/location/network-engines/solid/SolidNetworkNotifier.cpp
@@ -23,8 +23,8 @@
#include <solid/control/wirelessnetworkinterface.h>
#include <solid/control/wirelessaccesspoint.h>
-#include <QtNetworkManager/manager.h>
-#include <QtNetworkManager/wirelessdevice.h>
+#include <NetworkManagerQt/manager.h>
+#include <NetworkManagerQt/wirelessdevice.h>
#include <QHash>
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ Active mailing list [email protected] https://mail.kde.org/mailman/listinfo/active
