I have made the following changes intended for : CE:MW:Shared / 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/6016 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6016: Messages from BOSS: State: review at 2012-08-22T07:19:58 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : 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:MW / qmsystem -> CE:MW:Shared / qmsystem changes files: -------------- --- qmsystem.changes +++ qmsystem.changes @@ -0,0 +1,3 @@ +* Mon Aug 20 2012 Philippe De Swert <[email protected]> - 1.4.3 +- Add patch to make the usb-modes more generic and add mtp + new: ---- qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch spec files: ----------- --- qmsystem.spec +++ qmsystem.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: qmsystem + # >> macros # << macros -Name: qmsystem Summary: QmSystem library Version: 1.4.3 Release: 1 @@ -20,6 +22,7 @@ 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 +Patch6: qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch Requires: sensorfw >= 0.6.33 Requires: timed >= 2.31 Requires(post): /sbin/ldconfig @@ -34,11 +37,9 @@ BuildRequires: pkgconfig(timed) >= 2.31 BuildRequires: fdupes - %description This package contains the QmSystem library. - %package tests Summary: Unit test cases and xml test description for libqmsystem2 library Group: Development/System @@ -72,6 +73,8 @@ %patch4 -p1 # qmsystem-1.4.3-add-missing-lib-for-linking.patch %patch5 -p1 +# qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch +%patch6 -p1 # >> setup # << setup @@ -85,6 +88,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -96,18 +100,10 @@ # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - - - %files %defattr(-,root,root,-) # >> files @@ -119,7 +115,6 @@ # %{_docdir}/qmsystem2/html/* # << files - %files tests %defattr(-,root,root,-) # >> files tests @@ -137,4 +132,3 @@ %{_libdir}/pkgconfig/qmsystem2.pc %{_datadir}/qt4/mkspecs/features/qmsystem2.prf # << files devel - other changes: -------------- ++++++ qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch (new) --- qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch +++ qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch @@ -0,0 +1,87 @@ +From f83ae124ef575c89dbd676623836f95eead8574c Mon Sep 17 00:00:00 2001 +From: Philippe De Swert <[email protected]> +Date: Tue, 21 Aug 2012 14:21:15 +0300 +Subject: [PATCH] Add support for MTP and developer mode + +Signed-off-by: Philippe De Swert <[email protected]> +--- + system/msystemdbus_p.h | 2 ++ + system/qmusbmode.cpp | 12 ++++++++++-- + system/qmusbmode.h | 4 +++- + 3 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/system/msystemdbus_p.h b/system/msystemdbus_p.h +index 0d1dfb3..eb752f9 100644 +--- a/system/msystemdbus_p.h ++++ b/system/msystemdbus_p.h +@@ -93,6 +93,8 @@ + #define MODE_UNDEFINED "undefined" + #define MODE_ASK "ask" + #define MODE_WINDOWS_NET "windows_network" ++ #define MODE_DEVELOPER "developer_mode" ++ #define MODE_MTP "mtp_mode" + #endif /* HAVE_USB_MODED_DEV */ + + #endif // MSYSTEMDBUS_P_H +diff --git a/system/qmusbmode.cpp b/system/qmusbmode.cpp +index 214e051..a1cc03c 100644 +--- a/system/qmusbmode.cpp ++++ b/system/qmusbmode.cpp +@@ -144,7 +144,7 @@ bool QmUSBMode::setMode(QmUSBMode::Mode mode) { + MEEGO_PRIVATE(QmUSBMode); + + // The OviSuite, MassStorage, ChargingOnly and SDK modes can be requested +- if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode)) { ++ if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode)) { + return false; + } + +@@ -164,7 +164,7 @@ bool QmUSBMode::setDefaultMode(QmUSBMode::Mode mode) { + MEEGO_PRIVATE(QmUSBMode); + + // The OviSuite, MassStorage, ChargingOnly and Ask modes can be requested +- if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || Ask == mode || SDK == mode)) { ++ if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode)) { + return false; + } + +@@ -265,6 +265,10 @@ QString QmUSBModePrivate::modeToString(QmUSBMode::Mode mode) { + return USB_CONNECTED_DIALOG_SHOW; + case QmUSBMode::SDK: + return MODE_WINDOWS_NET; ++ case QmUSBMode::MTP: ++ return MODE_MTP; ++ case QmUSBMode::Developer: ++ return MODE_DEVELOPER; + default: + return ""; + } +@@ -291,6 +295,10 @@ QmUSBMode::Mode QmUSBModePrivate::stringToMode(const QString &str) { + return QmUSBMode::ModeRequest; + } else if (str == MODE_WINDOWS_NET) { + return QmUSBMode::SDK; ++ } else if (str == MODE_MTP) { ++ return QmUSBMode::MTP; ++ } else if (str == MODE_DEVELOPER) { ++ return QmUSBMode::Developer; + } else { + return QmUSBMode::Undefined; + } +diff --git a/system/qmusbmode.h b/system/qmusbmode.h +index 8bb8807..b27c803 100644 +--- a/system/qmusbmode.h ++++ b/system/qmusbmode.h +@@ -79,7 +79,9 @@ public: + ModeRequest, //!< Signaled as an indication that the USB mode should be set with setMode(QmUSBMode::Mode). + Ask, //!< Waiting for the USB mode to be set with setMode(QmUSBMode::Mode). + Undefined, //!< Unknown/error. +- SDK //!< Windows network mode. Allows USB networking on the device. ++ SDK, //!< Windows network mode. Allows USB networking on the device. ++ Developer, //!< Developer mode. Allows USB networking ++ MTP //!< MTP mode. Allows for generic MTP + }; + + /*! +-- +1.7.10.4 + ++++++ qmsystem.yaml --- qmsystem.yaml +++ qmsystem.yaml @@ -14,6 +14,7 @@ - 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 + - qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch Description: This package contains the QmSystem library. Requires:
