[sensorfw] Fix OBS build. Fixes MER#1728

sailfishos · Dec 29, 2016 · cf2f2c8 · cf2f2c8
1 parent 2095755
commit cf2f2c8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/adaptors/iioadaptor/iioadaptor.cpp b/adaptors/iioadaptor/iioadaptor.cpp
@@ -38,15 +38,15 @@
 #include <time.h>
 
 #include "iioadaptor.h"
-#include <sensord-qt5/sysfsadaptor.h>
-#include <sensord-qt5/deviceadaptorringbuffer.h>
+#include <sysfsadaptor.h>
+#include <deviceadaptorringbuffer.h>
 #include <QTextStream>
 #include <QDir>
 #include <QTimer>
 #include <QDirIterator>
 #include <qmath.h>
 
-#include <sensord-qt5/deviceadaptor.h>
+#include <deviceadaptor.h>
 #include "datatypes/orientationdata.h"
 
 #define GRAVITY         9.80665

diff --git a/adaptors/iioadaptor/iioadaptor.pro b/adaptors/iioadaptor/iioadaptor.pro
@@ -9,11 +9,6 @@ SOURCES += iioadaptor.cpp \
 
 CONFIG += qt debug warn_on link_prl link_pkgconfig plugin
 
-PKGCONFIG += sensord-qt5
-for(PKG, $$list($$unique(PKGCONFIG))) {
-     !system(pkg-config --exists $$PKG):error($$PKG development files are missing)
-}
-
 CONFIG += link_pkgconfig
 PKGCONFIG += udev
 LIBS += -ludev

diff --git a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp
@@ -78,7 +78,7 @@ void LidSensorAdaptorEvdev::init()
     qDebug() << Q_FUNC_INFO << name();
     QStringList strList = Config::configuration()->value<QStringList>(name() + "/input_match");
     qDebug() << strList;
-    for (const QString str : strList) {
+    foreach (const QString str, strList) {
         if (!getInputDevices(str)) {
             sensordLogW() << "Input device not found.";
             SysfsAdaptor::init();

diff --git a/debian/control b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Lorn Potter <lorn.potter@gmail.com>
 Uploaders: 
-Build-Depends: debhelper (>=5), qt5-default
+Build-Depends: debhelper (>=5), qt5-default, libudev-dev
 Standards-Version: 3.7.3
 
 Package: sensorfw-qt5
@@ -18,7 +18,7 @@ Package: libsensorfw-qt5-plugins
 Section: misc
 Priority: extra
 Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), ${misc:Depends}, libqt5core5a
+Depends: sensorfw-qt5 (= ${binary:Version}), ${misc:Depends}, libqt5core5a, udev
 Description: Sensor framework daemon and libraries plugins
  Platform plugins for sensorfw.
 

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(mlite5)
 BuildRequires:  doxygen
 BuildRequires:  systemd
+BuildRequires:  libudev-devel
 Provides:   sensord-qt5
 Obsoletes:   sensorframework