I succeeded in building the latest devel version in bmo with contour. Attached I send you the patch.You can get the built version from: https://build.merproject.org/project/show?project=home%3Awonko%3Apa-devel-contour-hack
I also attached a .ks file that uses this version. With these changes, the devel image boots into the ui as intended.
As you can see in the patch there were also some bugs in the code itself. I will try to submit that patch into git if I find the time.
Unfortunately, there is still the issue that the network manager applet does not accept input. Do you have any hints on how to identify or even solve the problem, or where the problem could be located?
On 05/26/2013 11:32 AM, Marco Martin wrote:
On Sunday 26 May 2013 08:59:18 Ruediger Gad wrote:I have some more findings and will try to briefly explain these in the hope that they are useful. 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.ha, riight, the qt networkmanager recently changed name (it's insanely a moving target unfortunately) so your patch should definitely go in (in master, that will go in devel, while Active/3 still uses the old name)
-- 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..ba99bae 100644
--- a/contourd/CMakeLists.txt
+++ b/contourd/CMakeLists.txt
@@ -12,6 +12,8 @@ include_directories(
${QT_INCLUDES}
${KDE4_INCLUDES}
${NEPOMUK_INCLUDE_DIR}
+ /usr/include/NetworkManager
+ /usr/include/NetworkManagerQt
${SOPRANO_INCLUDE_DIR}
# QtMobility doesn't work for us anyway:
@@ -102,7 +104,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..52561bd 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>
@@ -50,13 +50,13 @@ void SolidNetworkNotifier::init()
{
kDebug() << "Solid";
- NetworkManager::DeviceList iflist = NetworkManager::networkInterfaces();
+ NetworkManager::Device::List iflist = NetworkManager::networkInterfaces();
- foreach (NetworkManager::Device * iface, iflist) {
+ foreach (NetworkManager::Device::Ptr iface, iflist) {
// Checking whether it is a wifi
if (iface->type() != NetworkManager::Device::Wifi) continue;
- NetworkManager::WirelessDevice * wlan = static_cast < NetworkManager::WirelessDevice * > (iface);
+ NetworkManager::WirelessDevice * wlan = static_cast < NetworkManager::WirelessDevice * > (iface.data());
d->interfaces[wlan->interfaceName()] = wlan;
# -*-mic2-options-*- -f fs --record-pkgs=name --pkgmgr=yum --arch=armv7hl -*-mic2-options-*- # # Do not Edit! Generated by: # kickstarter.py # lang en_US.UTF-8 keyboard us timezone --utc UTC rootpw mer user --name mer --groups audio,video --password mer repo --name=mer-core --baseurl=http://releases.merproject.org/releases/latest/builds/armv7hl/packages --save --debuginfo --source --debuginfo repo --name=mer-core-debug --baseurl=http://releases.merproject.org/releases/latest/builds/armv7hl/debug --save --debuginfo --source repo --name=adaptation-archos-gen9-pvr --baseurl=http://repo.merproject.org/obs/home:/wonko:/archos-g9-pa-adaptation:/pvr/latest_armv7hl/ --save --debuginfo --source repo --name=mer-updates --baseurl=http://repo.merproject.org/obs/kde:/devel:/mer-updates/latest_armv7hl/ --save --debuginfo --source repo --name=kde-mw --baseurl=http://repo.merproject.org/obs/kde:/devel:/mw/latest_armv7hl/ --save --debuginfo --source repo --name=adaptation-archos-gen9 --baseurl=http://repo.merproject.org/obs/home:/wonko:/archos-g9-pa-adaptation/latest_armv7hl/ --save --debuginfo --source repo --name=kde-apps --baseurl=http://repo.merproject.org/obs/kde:/devel:/apps/latest_armv7hl/ --save --debuginfo --source repo --name=nemo-mw --baseurl=http://repo.merproject.org/obs/nemo:/devel:/mw/latest_armv7hl/ --save --debuginfo --source repo --name=kde-ux --baseurl=http://repo.merproject.org/obs/kde:/devel:/ux/latest_armv7hl/ --save --debuginfo --source repo --name=kde-ux-contour-hack --baseurl=http://repo.merproject.org/obs/home:/wonko:/pa-devel-contour-hack/latest_armv7hl/ --save --debuginfo --source %packages @Mer Core Utils @Mer Core @Mer Connectivity @Mer Minimal Xorg kernel-adaptation-archos-gen9-pvr nemo-mobile-session contextkit-plugin-upower plasma-mobile-config-archos-gen9-pvr plasma-mobile-config-archos-gen9-pvr-blacklist pvr-archos-gen9-kernel pvr-omap4-libEGL pvr-omap4-libGLESv1 pvr-omap4-libGLESv2 alsa-mixer-asound-state-archos-gen9 archos-udev-rules libwl1271-bin linux-firmware pixcir-touch-callibration pm-utils-config-wlan-archos xorg-conf-archos-gen9 xorg-x11-drv-evdev xorg-x11-drv-mtev xorg-x11-server-Xorg-setuid -connman -connman-test -connman-configs-mer droid-sans-fonts droid-sans-mono-fonts droid-serif-fonts liberation-fonts-common liberation-mono-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts cpio gzip openssh-server libqtwebkit-qmlwebkitplugin xorg-x11-drv-fbdev xorg-x11-drv-vesa xorg-x11-utils-xhost xorg-x11-server-Xorg-setuid dbus-x11 libqtdeclarative4-gestures libdeclarative-multimedia alsa-utils gdb gst-plugins-good ca-certificates pulseaudio-policy-enforcement iodbc contour contour-intro declarative-plasmoids kdelibs-data kdelibs-imageio-plugins kdelibs-plasma-runtime kdepim-strigi-plugins kde-runtime-desktoptheme kde-runtime-emoticons kde-runtime-nepomuk kde-runtime-netattach kde-runtime-newstuff kde-runtime-plasma kde-runtime-solid kde-runtime-sounds kde-runtime-wallet konsole kmix plasma-active plasma-mobile-mouse startactive virtuoso virtuoso-drivers virtuoso-server kdialog simple-tests sample-media ConsoleKit ConsoleKit-libs ConsoleKit-x11 dhclient libpcap ModemManager NetworkManager NetworkManager-glib NetworkManager-kde NetworkManager-kde-libs plasmoid-networkmanagement plasma-active-config-blacklist bodega-client ssu-vendor-data-kde encfs fuse rlog kpat kwrite plasma-mediacenter -okular %end %post # save a little bit of space at least... rm -f /boot/initrd* # make sure there aren't core files lying around rm -f /core* # Prelink can reduce boot time if [ -x /usr/sbin/prelink ]; then /usr/sbin/prelink -aRqm fi echo "export KDE_IS_PRELINKED=1">/etc/profile.d/kde.sh cat > /usr/share/xsessions/X-MEEGO-HS.plasmaactive << EOF [Desktop Entry] Version=1.0 Name=plasma active session Exec=/usr/bin/startactive Type=Application EOF # Set symlink pointing to .desktop file ln -sf X-MEEGO-HS.plasmaactive /usr/share/xsessions/default.desktop ln -s /lib/systemd/system/[email protected] /lib/systemd/system/getty.target.wants/[email protected] # kde-security: load the fuse module #echo "/sbin/modprobe fuse" >> /etc/modprobe.d/dist.conf mkdir -p /etc/modules-load.d/ echo "fuse" > /etc/modules-load.d/fuse.conf if [ "@SSU_RELEASE_TYPE@" = "rnd" ]; then [ -n "@MER_RELEASE@" ] && ssu release -r @MER_RELEASE@ [ -n "@FLAVOUR@" ] && ssu flavour @FLAVOUR@ ssu mode 2 else [ -n "@MER_RELEASE@" ] && ssu release @MER_RELEASE@ ssu mode 4 fi %end %post --nochroot if [ -n "$IMG_NAME" ]; then echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release fi %end
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ Active mailing list [email protected] https://mail.kde.org/mailman/listinfo/active
