Commit 20daa617 authored by Florent Revest's avatar Florent Revest

While we don't have Qt 5.5 in meta-qt5 we must use an older commit of lipstick...

While we don't have Qt 5.5 in meta-qt5 we must use an older commit of lipstick which depends on deprecated libs like qmsystem2. They should be removed as soon as meta-qt5 will be updated.
parent fa2c922f
SUMMARY = "Nemomobile's libiodata"
HOMEPAGE = "https://github.com/nemomobile/libiodata"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/nemomobile/libiodata.git;protocol=https"
SRCREV = "${AUTOREV}"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
inherit qmake5
B = "${S}"
do_configure_prepend () {
cd tests/
ln -s ../src/libiodata-qt5.so libiodata-qt5.so
cd ../type-to-cxx/
ln -s ../src/libiodata-qt5.so libiodata-qt5.so
cd ..
}
do_install () {
# Fix install paths for all
find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
oe_runmake install INSTALL_ROOT=${D}
}
BBCLASSEXTEND = "native"
FILES_${PN}-dbg += "/usr/share/iodata-qt5-tests"
FILES_${PN}-dev += "/usr/share/mkspecs"
From e9700fddec7f2697042d94b71cf4c7a919ab0217 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Tue, 14 Jul 2015 17:31:11 +0200
Subject: [PATCH] Disables tests and doc and fixes build
---
lipstick.pro | 4 ++--
src/lipstickglobal.h | 2 ++
src/src.pro | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lipstick.pro b/lipstick.pro
index 78ee362..ca79711 100644
--- a/lipstick.pro
+++ b/lipstick.pro
@@ -1,9 +1,9 @@
TEMPLATE = subdirs
-SUBDIRS += src plugin tools tests doc
+SUBDIRS += src plugin tools
plugin.depends = src
tools.depends = src
-tests.depends = src
+
QMAKE_CLEAN += \
build-stamp \
diff --git a/src/lipstickglobal.h b/src/lipstickglobal.h
index 01ffed0..be236bf 100644
--- a/src/lipstickglobal.h
+++ b/src/lipstickglobal.h
@@ -18,6 +18,8 @@
#define LIPSTICKGLOBAL_H
#include <QtGlobal>
+#include <QDebug>
+#include <QGuiApplication>
#if defined(LIPSTICK_BUILD_LIBRARY)
#define LIPSTICK_EXPORT Q_DECL_EXPORT
diff --git a/src/src.pro b/src/src.pro
index f3affe8..9f95a75 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -115,7 +115,7 @@ SOURCES += \
CONFIG += link_pkgconfig mobility qt warn_on depend_includepath qmake_cache target_qt
CONFIG -= link_prl
-PKGCONFIG += mlite5 mce dbus-1 dbus-glib-1 libresourceqt5 ngf-qt5 qmsystem2-qt5 Qt5SystemInfo libsystemd-daemon
+PKGCONFIG += mlite5 mce dbus-1 dbus-glib-1 libresourceqt5 ngf-qt5 qmsystem2-qt5 Qt5SystemInfo libsystemd
LIBS += -lrt
--
2.1.4
......@@ -3,19 +3,22 @@ HOMEPAGE = "https://github.com/nemomobile/lipstick"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24"
SRC_URI = "git://github.com/nemomobile/lipstick.git;protocol=https"
SRC_URI = "git://github.com/nemomobile/lipstick.git;protocol=https \
file://0001-Disables-tests-and-doc-and-fixes-build.patch"
SRC_URI[md5sum] = "d1b7dc2ee09b51192b14083292135c69"
SRC_URI[sha256sum] = "aa8049c9d49bb035f526d19a2bfb7d8e5b78c810946b10dcbd1d02c7a88520e4"
SRCREV = "${AUTOREV}"
SRCREV = "d62073e39be884350d81977da1beaceaafb46164"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
DEPENDS += " qtbase qtsensors qtquick1 qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qt5-qpa-hwcomposer-plugin"
DEPENDS += " qtbase qtsensors qtquick1 qtwayland mlite dbus dbus-glib libresourceqt qtsystems libngf-qt statefs-qt mce usb-moded-qt5 systemd wayland qt5-qpa-hwcomposer-plugin qmsystem"
inherit qmake5
do_configure_prepend() {
sed -i "s/libsystemd-daemon/libsystemd/" ${S}/src/src.pro
sed -i "s/tests doc/tests/" ${S}/lipstick.pro
}
FILES_${PN} += "/usr/lib/qt5/qml/org/nemomobile/lipstick/liblipstickplugin.so /usr/lib/qt5/qml/org/nemomobile/lipstick/qmldir"
FILES_${PN}-dev += "/usr/lib/liblipstick-qt5.prl"
FILES_${PN}-dbg += "/usr/lib/qt5/qml/org/nemomobile/lipstick/.debug"
FILES_${PN}-locale += "/usr/share/translations"
INSANE_SKIP_${PN} += "dev-deps"
SUMMARY = "Nemomobile's discontinued qmsystem"
HOMEPAGE = "https://github.com/nemomobile-graveyard/qmsystem"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://system/qmsystemstate.cpp;beginline=1;endline=29;md5=63b0668100f7f3c7d93090514722bceb"
SRC_URI = "git://github.com/nemomobile-graveyard/qmsystem.git;protocol=https"
SRCREV = "${AUTOREV}"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
inherit qmake5
B = "${S}"
DEPENDS += "timed sensorfw libdsme libiphb"
FILES_${PN}-dbg += "/opt /usr/share/qmsystem-qt5-tests/"
FILES_${PN}-dev += "/usr/share/qt5/mkspecs"
SUMMARY = "Nemomobile's sensorfw"
HOMEPAGE = "https://github.com/mer-packages/sensorfw"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SRC_URI = "git://github.com/mer-packages/sensorfw.git;protocol=https"
SRCREV = "${AUTOREV}"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
inherit qmake5
FILES_${PN} += "/usr/lib/sensord-qt5/*.so /usr/lib/sensord-qt5/testing/*.so"
FILES_${PN}-dbg += "/usr/share/sensorfw-tests/ /usr/lib/sensord-qt5/.debug/ /usr/lib/sensord-qt5/testing/.debug/"
FILES_${PN}-dev += "/usr/share/qt5/mkspecs/"
......@@ -10,7 +10,7 @@ PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
INSANE_SKIP_statefs-qt += "dev-deps"
INSANE_SKIP_${PN} += "dev-deps"
DEPENDS += " qtbase qtquick1 cor qtaround"
inherit cmake_qt5
......@@ -21,5 +21,5 @@ do_install_append() {
rm ${D}/usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so
}
FILES_${PN} += "/usr/lib/qt5/qml/Mer/State/"
FILES_${PN} += "/usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so /usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so.0 /usr/lib/qt5/qml/Mer/State/libstatefs-declarative.so.0.2.51 /usr/lib/qt5/qml/Mer/State/qmldir"
FILES_${PN}-dbg += "/usr/lib/qt5/qml/Mer/State/.debug/"
This diff is collapsed.
SUMMARY = "Nemomobile's time daemon"
HOMEPAGE = "https://github.com/nemomobile/timed"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/nemomobile/timed.git;protocol=https \
file://0001-Fixes-build.patch"
SRCREV = "${AUTOREV}"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
inherit qmake5
B = "${S}"
do_configure_prepend() {
mkdir -p src/h/timed-qt5/
cp src/lib/qmacro.h src/h/timed-qt5/qmacro.h
}
DEPENDS += "pcre systemd tzdata libiodata-native libiodata statefs-qt qtbase"
FILES_${PN} += "/usr/lib/ /usr/share/contextkit"
FILES_${PN} += "/usr/share/mkspecs"
FILES_${PN}-dbg += "/opt"
INSANE_SKIP_${PN} += "dev-deps"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment