I have made the following changes intended for : CE:UX:MTF / qmsystem Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/3751 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3751: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T12:48:14 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / qmsystem -> CE:UX:MTF / qmsystem changes files: -------------- --- qmsystem.changes +++ qmsystem.changes @@ -0,0 +1,4 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 1.4.3 +- Added qmsystem-1.4.3-add-missing-lib-for-linking.patch to fix + linking with newer toolchains. + new: ---- qmsystem-1.4.3-add-missing-lib-for-linking.patch spec files: ----------- --- qmsystem.spec +++ qmsystem.spec @@ -19,6 +19,7 @@ Patch2: qmsystem-set-default-usbmode-with-dbus.diff Patch3: qmsystem-1.4.1-meego-1.3-compile-fix.patch Patch4: qmsystem-1.4.1-no-docs.patch +Patch5: qmsystem-1.4.3-add-missing-lib-for-linking.patch Requires: sensorfw >= 0.6.33 Requires: timed >= 2.31 Requires(post): /sbin/ldconfig @@ -69,6 +70,8 @@ %patch3 -p1 # qmsystem-1.4.1-no-docs.patch %patch4 -p1 +# qmsystem-1.4.3-add-missing-lib-for-linking.patch +%patch5 -p1 # >> setup # << setup other changes: -------------- ++++++ qmsystem-1.4.3-add-missing-lib-for-linking.patch (new) --- qmsystem-1.4.3-add-missing-lib-for-linking.patch +++ qmsystem-1.4.3-add-missing-lib-for-linking.patch @@ -0,0 +1,75 @@ +From e572ed6c1d98585daa44b721de48f1d13258d6d4 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 14:57:47 +0200 +Subject: [PATCH] Newer toolchain requires that libs are explicitly mentioned + during linking. + +Signed-off-by: Marko Saukko <[email protected]> +--- + keyd/keyd.pro | 1 + + tests/devicemode/devicemode.pro | 1 + + tests/manual_compass/manual_compass.pro | 1 + + tests/manual_usbmode/manual_usbmode.pro | 1 + + tests/usbmode/usbmode.pro | 1 + + 5 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/keyd/keyd.pro b/keyd/keyd.pro +index 66176aa..f37972e 100644 +--- a/keyd/keyd.pro ++++ b/keyd/keyd.pro +@@ -12,6 +12,7 @@ SOURCES += main.cpp \ + keytranslator.cpp + HEADERS += qmkeyd.h \ + keytranslator.h ++LIBS += -lrt + + target.path = $$(DESTDIR)/usr/sbin + INSTALLS = target +diff --git a/tests/devicemode/devicemode.pro b/tests/devicemode/devicemode.pro +index de74be0..6a395dc 100644 +--- a/tests/devicemode/devicemode.pro ++++ b/tests/devicemode/devicemode.pro +@@ -1,5 +1,6 @@ + QT -= gui + SOURCES += devicemode.cpp ++LIBS += -lQtDBus + + TARGET = devicemode-test + include(../common-install.pri) +diff --git a/tests/manual_compass/manual_compass.pro b/tests/manual_compass/manual_compass.pro +index 97002d2..680ab86 100644 +--- a/tests/manual_compass/manual_compass.pro ++++ b/tests/manual_compass/manual_compass.pro +@@ -3,6 +3,7 @@ QT -= gui + CONFIG += link_pkgconfig + PKGCONFIG += gconf-2.0 + SOURCES += manual_compass.cpp ++LIBS += -lgobject-2.0 + + TARGET = manual-compass-test + +diff --git a/tests/manual_usbmode/manual_usbmode.pro b/tests/manual_usbmode/manual_usbmode.pro +index e99b5c9..cdaa104 100644 +--- a/tests/manual_usbmode/manual_usbmode.pro ++++ b/tests/manual_usbmode/manual_usbmode.pro +@@ -3,5 +3,6 @@ QT -=gui + + TARGET = manual-usbmode-test + SOURCES += manual_usbmode.cpp ++LIBS += -lrt + + include(../common-install.pri) +diff --git a/tests/usbmode/usbmode.pro b/tests/usbmode/usbmode.pro +index c962feb..9e62203 100644 +--- a/tests/usbmode/usbmode.pro ++++ b/tests/usbmode/usbmode.pro +@@ -3,5 +3,6 @@ QT -=gui + + TARGET = usbmode-test + SOURCES += usbmode.cpp ++LIBS += -lrt + + include(../common-install.pri) +-- +1.7.6.4 + ++++++ qmsystem.yaml --- qmsystem.yaml +++ qmsystem.yaml @@ -13,6 +13,7 @@ - qmsystem-set-default-usbmode-with-dbus.diff - qmsystem-1.4.1-meego-1.3-compile-fix.patch - qmsystem-1.4.1-no-docs.patch + - qmsystem-1.4.3-add-missing-lib-for-linking.patch Description: This package contains the QmSystem library. Requires:
