I have made the following changes intended for : CE:UX:MTF / libmeegotouch
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2687 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2687: Messages from BOSS: None State: new 2011-10-24T19:08:43 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_UX_MTF_armv7hl found. WARNING check_valid_changes (libmeegotouch) failed: Package libmeegotouch changelog not valid: Invalid email at line 299 * Thu Nov 04 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.20.51 please follow ref at http://wiki.meego.com/Packaging/Guidelines#Changelogs accepted on No date Changes: submit: Project:MTF / libmeegotouch -> CE:UX:MTF / libmeegotouch Index: libmeegotouch.changes =================================================================== --- libmeegotouch.changes (revision 0) +++ libmeegotouch.changes (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,505 @@ +* Wed Oct 19 2011 Miroslav Safr <[email protected]> - 0.24.5 +- merged orientation changes from MR 2318 and MR 2321 to BMC_19732_MR_2318.patch (integrated in 0.24.6) +- added temp_MR_2314_remove_prl_duplicates.patch (integrated in 0.24.6) +- added buildfix_remove_warnings.patch (integrated in 0.24.6) +- enabled dependency on libngf to be able to make NGF working (this is automatically enabled in configure than) +- BMC#20100 - [CE] Home screen rotates after closing an application. +-- added BMC_19732_MR_2318.patch (integrated in 0.24.6) + +* Fri Oct 11 2011 Miroslav Safr <[email protected]> - 0.24.4 +- added post install execution to remove old cache + +* Fri Oct 7 2011 Miroslav Safr <[email protected]> - 0.24.4 +- update + +* Wed Sep 21 2011 Miroslav Safr <[email protected]> - 0.24.2 +- added mgen_critical.patch to have more info about mgen problems (integrate 0.24.4) +- added BMC_22746_navigation_bar_style.patch which should fix wrong reload of the navigationbar style (integrated 0.24.4) + +* Tue Sep 18 2011 Miroslav Safr <[email protected]> - 0.24.2 +- upgrade + +* Mon Sep 17 2011 Miroslav Safr <[email protected]> - 0.23.9 +- MPanRecognizerTouch revert back + +* Fri Sep 16 2011 Miroslav Safr <[email protected]> - 0.23.9 +- disable ngfd (it anyway does not work becuase libmngfclient is missing) +- removed temporary patches which removed focus feature which was only in recent qt versions +- temp_disable_ItemStopsFocusHandling.patch, temp_disable_QMeeGoGraphicsSystemHelper_enableSwitchEvents.patch + +* Mon Sep 12 2011 Marko Saukko <[email protected]> - 0.23.9 +- Added revert-MPanRecognizerTouch-usage-on-arm.patch to fix scrolling issue. + +* Fri Sep 02 2011 Marko Saukko <[email protected]> - 0.23.9 +- Changed /var/run/ to users home, because in MeeGo 1.3 we do not + have permission to write to /var/run/. Fixes BMC#22845. + Patch: BMC_22845_move-var-run-to-home.patches + +* Wed Aug 10 2011 Miroslav Safr <[email protected]> - 0.23.9 +- removed integrated patches: BMC_11351_MR_2010_non-modal_system_dialogs.patch BMC_17994_MR_1950_rotation_animation.patch BMC_20408_MR_2079_solve_wid_casting.patch + +* Thu Jul 21 2011 Miroslav Safr <[email protected]> - 0.22.5 +- BMC#20100 [CE] Home screen rotates after closing an application. +-- disable 180 degree rotation for N900 because the usecase does not work + +* Thu Jul 21 2011 Miroslav Safr <[email protected]> - 0.22.5 +- BMC#20408 - Build fail on OS X: invalid conversion in libmeegotouch +-- added BMC_20408_MR_2079_solve_wid_casting.patch to avoid unnecessary casting which breaks Mac build + +* Thu Jun 23 2011 Miroslav Safr <[email protected]> - 0.22.5 +- BMC#19732 - [CE] When minimizing the application in landscape mode thumbnail view is rotated. +-- added BMC_17994_MR_1950_rotation_animation.patch + +* Thu Jun 23 2011 Miroslav Safr <[email protected]> - 0.22.5 +- BMC#11351 - System Dialogs cannot be minimised to Home anymore +-- added BMC_11351_MR_2010_non-modal_system_dialogs.patch +- cleaning integrated patches and ut_mlayout works again + +* Mon Jun 15 2011 Miroslav Safr <[email protected]> - 0.22.5 +- part of BMC#17994 - [CE] System info banner for plugged/unplugged usb-cable is empty +-- we install also engeneering english translations for lmt so the missing strings from EN translation could use fallback + +* Mon Jun 15 2011 Miroslav Safr <[email protected]> - 0.22.5 +- BMC#18616 - [CE] Notification page of widgetsgallery is not adjusted to portrait +-- updated to 0.22.5-1 + +* Mon Jun 15 2011 Miroslav Safr <[email protected]> - 0.22.4 +- BMC#14922 - SMS notification does not play an alert sound. +- enable ngf functionality +- BMC#18546 - meegotouch application framework update for Meego 1.2 +- upgrading to 0.22.4-1 + +* Mon Jun 06 2011 Miroslav Safr <[email protected]> - 0.22.1 +- BMC#18546 meegotouch application framework update for Meego 1.2 +-- updated to 0.22.1-1 tag +- BMC#17861 [DE] Navigation bar style and icon ids fail to load for Settings +-- Fixes: NB#260025 - New settings icons are missing in base theme. +-- Fixes: NB#243914 - [TASK] Base theme is missing pictures referenced from css styles. +- BMC#4068 - added BMC_4068_default_autodetect_conf.patch +- added temp_disable_ItemStopsFocusHandling.patch (new feature waiting for newer qt > 4.7.3) +- temp_disable_QMeeGoGraphicsSystemHelper_enableSwitchEvents.patch (new feature waiting for newer qt > 4.7.3) +- removed integrated Boot_sequence_is_broken_after_erase-user-data_flashing_MR_1709.patch +- cleaning integrated patches: Boot_sequence_is_broken_after_erase-user-data_flashing_MR_1709.patch, disable_ut_mlabel_test.patch + +* Mon May 16 2011 Miroslav Safr <[email protected]> - 0.21.4 +- BMC#17408: added BMC_17408_ButtonBox-at-MDialog-shows-the-butto.patch (integrated in 0.21.15) +-- it is critical bug and it does not change library API or ABI + +* Wed Apr 20 2011 Fathi Boudra <[email protected]> - 0.21.4 +- enabled meegographicssystem on ARM (BMC#12929) + +* Thu Apr 07 2011 Miroslav Safr <[email protected]> - 0.21.4 +- BMC#15199 - Update libmeegotouch to 0.21.4 to make theme working +- added Boot_sequence_is_broken_after_erase-user-data_flashing_MR_1709.patch (integrated 0.21.6) + Only time out when not receiving any data from the themedaemon for more than + 15 seconds, then print out a warning and retry +- added Requires meegotouch-demos-l10n to meegotouch-demos + +* Tue Apr 05 2011 Miroslav Safr <[email protected]> - 0.21.1 +- disabled explicitely meegographicssystem: the feature is autodetected since + latest update and causes segfaults on ARM + +* Fri Apr 01 2011 Miroslav Safr <[email protected]> - 0.21.1 +- BMC#15199 - Update libmeegotouch to 0.21.1-1 +- added Requires meegotouch-demos to meegotouch-demos-tests +- added disable_ut_mlabel_test.patch +- removed patches: + rely_on_QT_ARCH_for_mmoc.patch - merged upstream + BMC_12753_temp_solve_statusbar_height.patch - merged upstream + BMC_12929_meegographicssystem.patch - merged upstream +- removed patches backported from 0.20.95-1 previously: + BMC13246_0001-New-MDeviceProfile-orientationFromAngle.patch + BMC13246_0002-Changes-Code-cosmetics.-Removing-trailing-whitespace.patch + BMC13246_0003-Changes-MWindow-Remove-assumption-that-Angle0-is-Lan.patch + BMC13246_0004-Changed-MTheme-remove-assumption-that-default-orient.patch + BMC13246_0005-Changed-MStyleSheetAttribute-consider-device-s-nativ.patch + BMC13246_0006-Changed-MSceneManager-remove-assumption-that-native-.patch + BMC13246_0007-Changed-MOrientationTrackerPrivate-remove-assumption.patch + BMC13246_0008-New-Adding-a-default-portrait-device-configuration.patch + BMC13246_0009-Revert-Changes-Do-not-rotate-the-dim-layer-effect-wi.patch + +* Mon Mar 21 2011 Shane Bryan <[email protected]> - 0.20.89 +- BMC#13246 - Assumes all displays start in Landscape orientation + added patches backported from fixes merged upstream (as of 0.20.95-1): + - BMC13246_0001-New-MDeviceProfile-orientationFromAngle.patch + - BMC13246_0002-Changes-Code-cosmetics.-Removing-trailing-whitespace.patch + - BMC13246_0003-Changes-MWindow-Remove-assumption-that-Angle0-is-Lan.patch + - BMC13246_0004-Changed-MTheme-remove-assumption-that-default-orient.patch + - BMC13246_0005-Changed-MStyleSheetAttribute-consider-device-s-nativ.patch + - BMC13246_0006-Changed-MSceneManager-remove-assumption-that-native-.patch + - BMC13246_0007-Changed-MOrientationTrackerPrivate-remove-assumption.patch + - BMC13246_0008-New-Adding-a-default-portrait-device-configuration.patch + - BMC13246_0009-Revert-Changes-Do-not-rotate-the-dim-layer-effect-wi.patch + added new DefaultPortrait.conf to .spec file + +* Mon Mar 21 2011 Fathi Boudra <[email protected]> - 0.20.89 +- removed BMC14407_MTextEdit_prompt_only_visible_when_text_edit_not_focused.patch + as it has been rejected upstream. The current behavior is intentional + +* Wed Mar 16 2011 Fathi Boudra <[email protected]> - 0.20.89 +- added BMC14407_MTextEdit_prompt_only_visible_when_text_edit_not_focused.patch + Thanks to Robin Burchell + +* Tue Mar 15 2011 Miroslav Safr <[email protected]> - 0.20.89 +- updated BMC_12753_temp_solve_statusbar_height.patch so it solves the same + problem in 2nd place where the scene is resized + +* Fri Mar 11 2011 Fathi Boudra <[email protected]> - 0.20.89 +- added BMC_12929_meegographicssystem.patch to define M_USE_OPENGL when + OpenGL ES 2 support is availble in QT_CONFIG + +* Wed Mar 2 2011 Miroslav Safr <[email protected]> - 0.20.89 +- updated to 0.20.89-1 +- removed integrated add_iCDK_config_target.patch +- BMC#10384 - meego-im-uiserver does not register to qttas-server + added TDriver support by ./configure -testable +- BMC#8510 - libmeegotouchviews behaves both a plugin and a library + moved .so files to devel and marked obsoletes with older versions +- BMC#8268 - added BMC_8268_show_statusbar_on_n900.patch +- merged arm_ftbfs_egl.patch to arm_egl_visibility.patch + +* Thu Feb 24 2011 Miroslav Safr <[email protected]> - 0.20.87 +- Update meegotouch components to week 8 (BMC#13802) +- removed obsolete patch incorrect_libmeegotouch_version.patch +- rebased rely_on_QT_ARCH_for_mmoc.patch +- removing meegotouch-config-default package - not needed anymore + +* Thu Feb 22 2011 Miroslav Safr <[email protected]> - 0.20.84 +- BMC#13632 - Update libmeegotouch 0.20.84-1 +- BMC#12975 - libmeegotouch Requires gtk2 (generated from spectacle) + +* Fri Feb 18 2011 Brad Peters <[email protected]> - 0.20.83 +- BMC#10383 - Added an iCDK.conf to targets directory + +* Fri Feb 10 2011 Miroslav Safr <[email protected]> - 0.20.83 +- BMC#13441 - Update meegotouch components to week 6 + - updated to 0.20.83-1 + +* Fri Feb 05 2011 Miroslav Safr <[email protected]> - 0.20.81 +- BMC#13257 - Update meegotouch components to week 5 + - updated to 0.20.81-1 (depends on meegotouch-theme 0.20.72) + +* Wed Feb 03 2011 Miroslav Safr <[email protected]> - 0.20.80 +- updated libmeegotouch to latest tag 0.20.80-1 (depends on meegotouch-theme 0.20.71) +- removed fixed patch incorrect_libmeegotouch_version.patch + +* Thu Feb 03 2011 Fathi Boudra <[email protected]> - 0.20.77 +- removed QtServiceFramework build requires to avoid OBS extra build cycles + +* Tue Feb 01 2011 Fathi Boudra <[email protected]> - 0.20.77 +- added QtServiceFramework and xcomposite build requires +- replaced contextprovider-1.0 by contextsubscriber-1.0 >= 0.5.25 +- used UseAsNeeded: no +- avoided mmoc confusion: ship script on ARM and binary on IA32 +- added rely_on_QT_ARCH_for_mmoc.patch to select mmoc executable based on + QT_ARCH (BMC#13202) +- added incorrect_libmeegotouch_version.patch, it should be 0.20.77 instead of + 0.20.76 + +* Mon Jan 31 2011 Miroslav Safr <[email protected]> - 0.20.77 +- updated libmeegotouch to 0.20.77 (305 more lines skipped) Index: BMC_8268_show_statusbar_on_n900.patch =================================================================== --- BMC_8268_show_statusbar_on_n900.patch (revision 0) +++ BMC_8268_show_statusbar_on_n900.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,14 @@ +diff --git a/src/data/targets/N900.conf b/src/data/targets/N900.conf +index fa61edc..6bc3c7f 100644 +--- a/src/data/targets/N900.conf ++++ b/src/data/targets/N900.conf +@@ -6,7 +6,7 @@ X=261 + Y=261 + [allowedOrientations] + keyboardOpen = 0 +-keyboardClosed = 0,180,270 ++keyboardClosed = 0,270 + [other] +-showStatusBar=false ++showStatusBar=true + Index: libmeegotouch.sh =================================================================== --- libmeegotouch.sh (revision 0) +++ libmeegotouch.sh (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,1 @@ +export M_DECORATED=0 Index: temp_MR_2314_remove_prl_duplicates.patch =================================================================== --- temp_MR_2314_remove_prl_duplicates.patch (revision 0) +++ temp_MR_2314_remove_prl_duplicates.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,13 @@ +diff --git a/src/common_top.pri b/src/common_top.pri +index 75f1749..86b7d59 100644 +--- a/src/common_top.pri ++++ b/src/common_top.pri +@@ -24,7 +24,7 @@ INCLUDEPATH += $${OUT_PWD}/.gen + + QMAKE_STRIP = echo + +-CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl ++CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl no_install_prl + !win32:CONFIG += link_pkgconfig + macx:CONFIG -= lib_bundle + Index: mthemedaemon.desktop =================================================================== --- mthemedaemon.desktop (revision 0) +++ mthemedaemon.desktop (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,3 @@ +[Desktop Entry] +Exec=/usr/bin/mthemedaemon +X-Moblin-Priority=Highest Index: BMC_4068_default_autodetect_conf.patch =================================================================== --- BMC_4068_default_autodetect_conf.patch (revision 0) +++ BMC_4068_default_autodetect_conf.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,13 @@ +diff --git a/src/data/targets/Default.conf b/src/data/targets/Default.conf +index 989dfd4..3070346 100644 +--- a/src/data/targets/Default.conf ++++ b/src/data/targets/Default.conf +@@ -1,6 +1,6 @@ + [resolution] +-X=854 +-Y=480 ++X=autodetect ++Y=autodetect + [ppi] + X=254 + Y=254 Index: boss.conf =================================================================== --- boss.conf (revision 0) +++ boss.conf (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,2 @@ +[checks] +check_valid_changes = warn Index: BMC_22746_navigation_bar_style.patch =================================================================== --- BMC_22746_navigation_bar_style.patch (revision 0) +++ BMC_22746_navigation_bar_style.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,100 @@ +From 5c95a47e8c01ba1f0877d2269380c2d1352e5a68 Mon Sep 17 00:00:00 2001 +From: Stanislav Ionascu <[email protected]> +Date: Fri, 23 Sep 2011 13:06:38 +0300 +Subject: [PATCH] Changes: MWidgetView - check if style has change prior calling applyStyle. + +RevBy: Marcin Miklas, Daniel d'Andrada. +MergeRequest: 2094 + +Details: A new method applyStyleIfNeeded introduced in MWidgetViewPrivate, that checks that the style has changed, and if it did, calling applyStyle. + +Fixes: NB#274812 - Custom navigation bar with shifts downwards text field after certain rotation steps + +RevBy: Marcin Miklas, Daniel d'Andrada. +MergeRequest: 2094 + +Details: When the scene of the widget has changed widget view should check if the style has changed, and in cases it did, call applyStyle(), this is done via applyStyleIfNeeded call from MWidgetPrivate. +--- + src/corelib/widgets/core/mwidgetview.cpp | 24 +++++++++++++++--------- + src/corelib/widgets/core/mwidgetview_p.h | 1 + + 2 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/corelib/widgets/core/mwidgetview.cpp b/src/corelib/widgets/core/mwidgetview.cpp +index f422373..318ddf6 100644 +--- a/src/corelib/widgets/core/mwidgetview.cpp ++++ b/src/corelib/widgets/core/mwidgetview.cpp +@@ -138,6 +138,15 @@ const MWidgetStyle *MWidgetViewPrivate::currentStyle() const + return static_cast<const MWidgetStyle *>(styleContainer->currentStyle()); + } + ++void MWidgetViewPrivate::applyStyleIfNeeded() ++{ ++ styleContainer->updateCurrentStyle(); ++ if (styleContainer->currentStyle() != appliedStyle) { ++ q_ptr->applyStyle(); ++ appliedStyle = styleContainer->currentStyle(); ++ } ++} ++ + MWidgetView::MWidgetView() : + d_ptr(new MWidgetViewPrivate) + { +@@ -461,7 +470,7 @@ void MWidgetViewPrivate::reloadChildItemsStyles(QGraphicsItem* item) + if (view) { + MWidgetStyleContainer& style = view->style(); + style.reloadStyles(); +- view->applyStyle(); ++ view->d_func()->applyStyleIfNeeded(); + } + } + } +@@ -486,7 +495,7 @@ void MWidgetView::notifyItemChange(QGraphicsItem::GraphicsItemChange change, con + if (value.value<QGraphicsItem*>() != NULL) { + mPerformanceWarning("MWidgetView::reloadChildItemsStyles") << "Styles are recursively reloaded due to parent change :" << d->controller; + d->reloadChildItemsStyles(d->controller); +- applyStyle(); ++ d->applyStyleIfNeeded(); + } + } else if (change == QGraphicsItem::ItemSceneChange) { + QGraphicsScene *scene = value.value<QGraphicsScene*>(); +@@ -494,9 +503,10 @@ void MWidgetView::notifyItemChange(QGraphicsItem::GraphicsItemChange change, con + if (scene) + mscene = qobject_cast<MScene*>(scene); + +- if (mscene) ++ if (mscene) { + d->styleContainer->setSceneManager(mscene->sceneManager()); +- else ++ d->applyStyleIfNeeded(); ++ } else + d->styleContainer->setSceneManager(0); + } + } +@@ -517,11 +527,7 @@ void MWidgetView::orientationChangeEvent(MOrientationChangeEvent *event) + Q_UNUSED(event); + Q_D(MWidgetView); + +- style().updateCurrentStyle(); +- if (d->currentStyle() != d->appliedStyle) { +- applyStyle(); +- d->appliedStyle = d->currentStyle(); +- } ++ d->applyStyleIfNeeded(); + } + + void MWidgetView::tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGesture *gesture) +diff --git a/src/corelib/widgets/core/mwidgetview_p.h b/src/corelib/widgets/core/mwidgetview_p.h +index ea48e55..51cc46e 100644 +--- a/src/corelib/widgets/core/mwidgetview_p.h ++++ b/src/corelib/widgets/core/mwidgetview_p.h +@@ -45,6 +45,7 @@ public: // public to inherited classes + static void reloadChildItemsStyles(QGraphicsItem* item); + + const MWidgetStyle *currentStyle() const; ++ void applyStyleIfNeeded(); + + //private: // public only to MWidgetView + MWidgetController *controller; +-- +1.7.4.1 + Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,6 @@ +PKG_NAME := libmeegotouch +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common + Index: BMC_22845_move-var-run-to-home.patch =================================================================== --- BMC_22845_move-var-run-to-home.patch (revision 0) +++ BMC_22845_move-var-run-to-home.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,108 @@ +diff -ruN --exclude='*~' libmeegotouch-0.23.9.orig/src/corelib/theme/mthemedaemonprotocol.cpp libmeegotouch-0.23.9/src/corelib/theme/mthemedaemonprotocol.cpp +--- libmeegotouch-0.23.9.orig/src/corelib/theme/mthemedaemonprotocol.cpp 2011-09-02 12:36:35.544789349 +0300 ++++ libmeegotouch-0.23.9/src/corelib/theme/mthemedaemonprotocol.cpp 2011-09-02 12:38:20.750092221 +0300 +@@ -20,10 +20,11 @@ + #include "mthemedaemonprotocol.h" + #include <QHash> + #include <QtEndian> ++#include <QDir> + + using namespace M::MThemeDaemonProtocol; + +-const QString M::MThemeDaemonProtocol::ServerAddress = "/var/run/m.mthemedaemon"; ++const QString M::MThemeDaemonProtocol::ServerAddress = QDir::homePath() + "/.m.mthemedaemon"; + static const int SOCKET_DELAY_MS = 15000; + + PacketData::~PacketData() +diff -ruN --exclude='*~' libmeegotouch-0.23.9.orig/src/extensions/mashup/appletcommunication/mappletclient.cpp libmeegotouch-0.23.9/src/extensions/mashup/appletcommunication/mappletclient.cpp +--- libmeegotouch-0.23.9.orig/src/extensions/mashup/appletcommunication/mappletclient.cpp 2011-09-02 12:36:35.163781006 +0300 ++++ libmeegotouch-0.23.9/src/extensions/mashup/appletcommunication/mappletclient.cpp 2011-09-02 12:37:41.986244191 +0300 +@@ -19,6 +19,7 @@ + + #include "mappletclient.h" + #include <MDebug> ++#include <QDir> + + + static const int MAX_CONNECTION_ATTEMPTS = 100; +@@ -37,7 +38,7 @@ + closeConnection(); + + // Prepend the path to the server name +- QString path = "/var/run/" + serverName; ++ QString path = QDir::homePath() +"/" + serverName; + + // Connect to the specified server + socket = new QLocalSocket; +diff -ruN --exclude='*~' libmeegotouch-0.23.9.orig/src/extensions/mashup/appletcommunication/mappletserver.cpp libmeegotouch-0.23.9/src/extensions/mashup/appletcommunication/mappletserver.cpp +--- libmeegotouch-0.23.9.orig/src/extensions/mashup/appletcommunication/mappletserver.cpp 2011-09-02 12:36:35.165781050 +0300 ++++ libmeegotouch-0.23.9/src/extensions/mashup/appletcommunication/mappletserver.cpp 2011-09-02 15:42:55.058670228 +0300 +@@ -20,6 +20,7 @@ + #include <QLocalServer> + #include <QDataStream> + #include <MDebug> ++#include <QDir> + #include "mappletserver.h" + + MAppletServer::MAppletServer() : +@@ -37,7 +38,7 @@ + closeConnection(); + + // Prepend the path to the server name +- QString path = "/var/run/" + serverName; ++ QString path = QDir::homePath() + "/" + serverName; + + // Remove the socket file if it exists + QLocalServer::removeServer(path); +diff -ruN --exclude='*~' libmeegotouch-0.23.9.orig/tests/ut_mappletclient/ut_mappletclient.cpp libmeegotouch-0.23.9/tests/ut_mappletclient/ut_mappletclient.cpp +--- libmeegotouch-0.23.9.orig/tests/ut_mappletclient/ut_mappletclient.cpp 2011-09-02 12:36:35.630791231 +0300 ++++ libmeegotouch-0.23.9/tests/ut_mappletclient/ut_mappletclient.cpp 2011-09-02 12:38:54.998841388 +0300 +@@ -20,6 +20,7 @@ + #include <QtTest/QtTest> + #include <QLocalServer> + #include <QLocalSocket> ++#include <QDir> + + #include "mappletserver.h" + #include "mappletclient.h" +@@ -51,9 +52,9 @@ + + void RemoteProcessThread::run() + { +- QLocalServer::removeServer("/var/run/foobar"); ++ QLocalServer::removeServer(QDir::homePath() + "/foobar"); + server = new QLocalServer(); +- server->listen("/var/run/foobar"); ++ server->listen(QDir::homePath() + "/foobar"); + + connect(server, SIGNAL(newConnection()), this, SLOT(newConnection())); + doWait = true; +diff -ruN --exclude='*~' libmeegotouch-0.23.9.orig/tests/ut_mappletserver/ut_mappletserver.cpp libmeegotouch-0.23.9/tests/ut_mappletserver/ut_mappletserver.cpp +--- libmeegotouch-0.23.9.orig/tests/ut_mappletserver/ut_mappletserver.cpp 2011-09-02 12:36:35.802794999 +0300 ++++ libmeegotouch-0.23.9/tests/ut_mappletserver/ut_mappletserver.cpp 2011-09-02 12:39:27.990563073 +0300 +@@ -24,6 +24,7 @@ + + #include <QtTest/QtTest> + #include <QLocalSocket> ++#include <QDir> + + void Ut_MAppletServer::init() + { +@@ -48,7 +49,7 @@ + + // Emulate being the process to connect to + socket = new QLocalSocket; +- socket->connectToServer("/var/run/moopwidget_1"); ++ socket->connectToServer(QDir::homePath() + "/moopwidget_1"); + + // Process events max. 100 times to enable Qt signal handling + for (int retries = 0; retries < 100 && !connected; retries++) { +@@ -76,7 +77,7 @@ + // Test that new connections can't be made + delete socket; + socket = new QLocalSocket; +- socket->connectToServer("/var/run/moopwidget_1"); ++ socket->connectToServer(QDir::homePath() + "/moopwidget_1"); + QCOMPARE(socket->waitForConnected(), false); + QCOMPARE(socket->error(), QLocalSocket::ServerNotFoundError); + QCOMPARE(m_subject->isConnected(), false); Index: arm_egl_visibility.patch =================================================================== --- arm_egl_visibility.patch (revision 0) +++ arm_egl_visibility.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,15 @@ +Description: fix ARM visibility EGL issue + EGL includes fix +Author: Miroslav Safr <[email protected]> +index a7a1435..5b89d41 100644 +--- a/demos/widgetsgallery/swaphook.h ++++ b/demos/widgetsgallery/swaphook.h +@@ -6,6 +6,9 @@ typedef unsigned long long timestamp; + + #ifdef __arm__ + #define EGL ++#define EGLAPI ++#define EGLAPIENTRY ++#define MESA_EGL_NO_X11_HEADERS + #include <EGL/egl.h> + # ifdef M_OS_MAEMO5 + # define EGLAPI Index: libmeegotouch-0.24.5.tar.bz2 =================================================================== Binary file libmeegotouch-0.24.5.tar.bz2 added Index: BMC_19732_MR_2318.patch =================================================================== --- BMC_19732_MR_2318.patch (revision 0) +++ BMC_19732_MR_2318.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,690 @@ +diff --git a/src/corelib/events/morientationtracker.cpp b/src/corelib/events/morientationtracker.cpp +index fad0889..02f8a03 100644 +--- a/src/corelib/events/morientationtracker.cpp ++++ b/src/corelib/events/morientationtracker.cpp +@@ -90,15 +90,12 @@ QVariant MContextProperty::value(const QVariant &def) const + #endif + + MOrientationTrackerPrivate::MOrientationTrackerPrivate(MOrientationTracker *controller) : +- currentAngle(0), +- currentIsCovered(false), + currentIsTvConnected(false), + currentIsKeyboardOpen(MKeyboardStateTracker::instance()->isOpen()) + #ifdef HAVE_CONTEXTSUBSCRIBER + , videoRouteProperty(new ContextProperty("com.nokia.policy.video_route")) + , topEdgeProperty(new ContextProperty("Screen.TopEdge")) + , remoteTopEdgeProperty(new ContextProperty("RemoteScreen.TopEdge")) +- , isCoveredProperty(new ContextProperty("Screen.IsCovered")) + , isFlatProperty(new ContextProperty("Position.IsFlat")) + , remoteTopEdgeListener(0) + , currentWindowAngleProperty(new MContextProperty("/Screen/CurrentWindow/OrientationAngle")) +@@ -117,13 +114,12 @@ MOrientationTrackerPrivate::MOrientationTrackerPrivate(MOrientationTracker *cont + #endif + + if (MComponentData::isOrientationForced()) { +- currentAngle = new M::OrientationAngle; +- *currentAngle = MComponentData::forcedOrientationAngle(); +- M::Orientation orientation = MDeviceProfile::instance()->orientationFromAngle(*currentAngle); ++ M::OrientationAngle currentAngle = MComponentData::forcedOrientationAngle(); ++ M::Orientation orientation = MDeviceProfile::instance()->orientationFromAngle(currentAngle); + + foreach(MWindow * window, MApplication::windows()) { + if (window->orientation() == orientation) +- window->setOrientationAngle(*currentAngle); ++ window->setOrientationAngle(currentAngle); + } + //orientation is fixed so we do not need to register for any signals + return; +@@ -133,27 +129,24 @@ MOrientationTrackerPrivate::MOrientationTrackerPrivate(MOrientationTracker *cont + videoRouteProperty->unsubscribe(); + topEdgeProperty->unsubscribe(); + remoteTopEdgeProperty->unsubscribe(); +- isCoveredProperty->unsubscribe(); + isFlatProperty->unsubscribe(); + Q_ASSERT(!currentWindowAngleProperty->isSubscribed()); + Q_ASSERT(!desktopAngleProperty->isSubscribed()); + + connect(topEdgeProperty, SIGNAL(valueChanged()), +- this, SLOT(updateOrientationAngle())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(remoteTopEdgeProperty, SIGNAL(valueChanged()), +- this, SLOT(updateOrientationAngle())); +- connect(isCoveredProperty, SIGNAL(valueChanged()), +- this, SLOT(isCoveredChanged())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(videoRouteProperty, SIGNAL(valueChanged()), + this, SLOT(videoRouteChanged())); + connect(isFlatProperty, SIGNAL(valueChanged()), +- this, SLOT(updateOrientationAngle())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(MKeyboardStateTracker::instance(), SIGNAL(stateChanged()), +- this, SLOT(updateOrientationAngle())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(remoteTopEdgeListener, SIGNAL(nameAppeared()), +- this, SLOT(updateOrientationAngle())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(remoteTopEdgeListener, SIGNAL(nameDisappeared()), +- this, SLOT(updateOrientationAngle())); ++ this, SLOT(updateOrientationAngleOfWindows())); + connect(currentWindowAngleProperty, SIGNAL(valueChanged()), + this, SLOT(handleCurrentAppWindowOrientationAngleChange())); + connect(desktopAngleProperty, SIGNAL(valueChanged()), +@@ -169,19 +162,16 @@ MOrientationTrackerPrivate::MOrientationTrackerPrivate(MOrientationTracker *cont + this, SLOT(enableRotations())); + #endif + +- isCoveredChanged(); + videoRouteChanged(); + } + + MOrientationTrackerPrivate::~MOrientationTrackerPrivate() + { +- delete currentAngle; + #ifdef HAVE_CONTEXTSUBSCRIBER + delete videoRouteProperty; + delete topEdgeProperty; + delete remoteTopEdgeListener; + delete remoteTopEdgeProperty; +- delete isCoveredProperty; + delete isFlatProperty; + delete currentWindowAngleProperty; + #endif +@@ -195,27 +185,7 @@ void MOrientationTrackerPrivate::videoRouteChanged() + + currentIsTvConnected = (value == "tvout" || + value == "builtinandtvout"); +- updateOrientationAngle(); +-#endif +-} +- +-void MOrientationTrackerPrivate::isCoveredChanged() +- +-{ +-#ifdef HAVE_CONTEXTSUBSCRIBER +- Q_Q(MOrientationTracker); +- +- bool isCovered = isCoveredProperty->value().toBool(); +- +- if (isCovered != currentIsCovered) { +- mDebug("MOrientationTracker") << "Covered:" << isCovered; +- +- currentIsCovered = isCovered; +- if (isCovered) +- emit q->faceFlippedDown(); +- else +- emit q->faceUp(); +- } ++ updateOrientationAngleOfWindows(); + #endif + } + +@@ -258,13 +228,13 @@ void MOrientationTrackerPrivate::reevaluateSubscriptionToSensorProperties() + + if (updatesRequired && !isSubscribedToSensorProperties) { + subscribeToSensorProperties(); +- updateOrientationAngle(); ++ updateOrientationAngleOfWindows(); + } else if (!updatesRequired && isSubscribedToSensorProperties) + unsubscribeFromSensorProperties(); + #endif + } + +-void MOrientationTrackerPrivate::updateOrientationAngle() ++void MOrientationTrackerPrivate::updateOrientationAngleOfWindows() + { + if (rotationsDisabled) { + pendingOrientationAngleUpdate = true; +@@ -280,8 +250,6 @@ void MOrientationTrackerPrivate::updateOrientationAngle() + + if ((remoteTopEdgeListener->isServicePresent() != MServiceListener::Present) || remoteTopEdge.isEmpty()) { + +- updateTrackerOrientationAngle(); +- + foreach(MWindow * window, MApplication::windows()) { + updateWindowOrientationAngle(window); + } +@@ -298,10 +266,37 @@ void MOrientationTrackerPrivate::updateOrientationAngle() + } + + #ifdef HAVE_CONTEXTSUBSCRIBER +-M::OrientationAngle MOrientationTrackerPrivate::updateOrientationAngle(M::OrientationAngle *currentAngle) ++ ++M::OrientationAngle MOrientationTrackerPrivate::updateOrientationAngleWithDeviceAngle( ++ M::OrientationAngle *currentAngle) const + { + M::OrientationAngle targetAngle = (M::OrientationAngle)-1; + M::OrientationAngle deviceAngle = angleForTopEdge(topEdgeProperty->value().toString()); ++ bool isKeyboardOpen = MKeyboardStateTracker::instance()->isOpen(); ++ ++ if (MDeviceProfile::instance()->orientationAngleIsSupported(deviceAngle, isKeyboardOpen)) { ++ // simple case. there's nothing stopping us from following the device orientation. ++ targetAngle = deviceAngle; ++ } else { ++ //it seems that orientation does not match allowed for current kybrd state. ++ //check if the previous one was ok: ++ if (currentAngle ++ && MDeviceProfile::instance()->orientationAngleIsSupported(*currentAngle, isKeyboardOpen)) { ++ //it was: let's just use an old angle ++ targetAngle = *currentAngle; ++ } else { ++ //it was not: let's use the closest allowed angle ++ targetAngle = findClosestAllowedAngle(deviceAngle, isKeyboardOpen); ++ } ++ } ++ ++ Q_ASSERT((int)targetAngle != -1); ++ return targetAngle; ++} ++ ++M::OrientationAngle MOrientationTrackerPrivate::updateOrientationAngle(M::OrientationAngle *currentAngle) const ++{ ++ M::OrientationAngle targetAngle = (M::OrientationAngle)-1; + bool isDeviceFlat = isFlatProperty->value().toBool(); + bool isKeyboardOpen = MKeyboardStateTracker::instance()->isOpen(); + +@@ -319,20 +314,23 @@ M::OrientationAngle MOrientationTrackerPrivate::updateOrientationAngle(M::Orient + } else { + targetAngle = M::Angle270; + } +- } else if (!MDeviceProfile::instance()->orientationAngleIsSupported(deviceAngle, isKeyboardOpen)) { +- //it seems that orientation does not match allowed for current kybrd state. +- //check if the previous one was ok: +- if (currentAngle +- && MDeviceProfile::instance()->orientationAngleIsSupported(*currentAngle, isKeyboardOpen)) { +- //it was: let's just use an old angle +- targetAngle = *currentAngle; ++ } else { ++ if (isDeviceFlat) { ++ // device orientation angle information is meaningless in this situation. ++ if (currentAngle) { ++ // therefore stay where we are. (490 more lines skipped) Index: libmeegotouch.spec =================================================================== --- libmeegotouch.spec (revision 0) +++ libmeegotouch.spec (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,1495 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.22 +# +# >> macros +# << macros + +Name: libmeegotouch +Summary: MeeGo Touch Framework +Version: 0.24.5 +Release: 1 +Group: System/Libraries +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/libmeegotouch +Source0: %{name}-%{version}.tar.bz2 +Source1: libmeegotouch.sh +Source2: mthemedaemon.desktop +Source100: libmeegotouch.yaml +Patch0: arm_egl_visibility.patch +Patch1: BMC_8268_show_statusbar_on_n900.patch +Patch2: BMC_4068_default_autodetect_conf.patch +Patch3: BMC_22845_move-var-run-to-home.patch +Patch4: revert-MPanRecognizerTouch-usage-on-arm.patch +Patch5: BMC_19732_MR_2318.patch +Patch6: buildfix_remove_warnings.patch +Patch7: temp_MR_2314_remove_prl_duplicates.patch +Requires: meegotouch-theme >= 0.20.79 +Requires: libmeegotouch-l10n-en +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(contextsubscriber-1.0) >= 0.5.25 +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-base-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xdamage) +BuildRequires: pkgconfig(libngf0) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: doxygen +BuildRequires: icu +BuildRequires: desktop-file-utils +BuildRequires: fdupes +Provides: libdui >= 0.20.0 +Obsoletes: libdui < 0.20.0 +Obsoletes: libmeegotouch < 0.20.89 + + +%description +Qt based MeeGo Touch Framework for developing touch based user interfaces. + + + +%package devel +Summary: MeeGo Touch Framework development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the files necessary to develop applications using +the Meego Touch Framework. + + +%package l10n-ar +Summary: Arabic (ar) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-ar +This package contains the Arabic translation for the MeeGo Touch Framework. + + +%package l10n-de +Summary: German (de) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-de +This package contains the German translation for the MeeGo Touch Framework. + + +%package l10n-en +Summary: English (en) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-en +This package contains the English translation for the MeeGo Touch Framework. + + +%package l10n-fi +Summary: Finnish (fi) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-fi +This package contains the Finnish translation for the MeeGo Touch Framework. + + +%package l10n-hu +Summary: Hungarian (hu) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-hu +This package contains the Hungarian translation for the MeeGo Touch Framework. + + +%package l10n-ur +Summary: Urdu (ur) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-ur +This package contains the Urdu translation for the MeeGo Touch Framework. + + +%package l10n-zhcn +Summary: Chinese Simplified (zh_CN) MeeGo Touch Framework translation +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description l10n-zhcn +This package contains the Chinese Simplified translation for the MeeGo Touch Framework. + + +%package benchmarks +Summary: Benchmark tests +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-demos + +%description benchmarks +This package contains benchmark tests for the MeeGo Touch Framework. + + +%package tests +Summary: Unit and functional tests +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gst-plugins-base +Requires: gst-plugins-good +Requires: libmeegotouch-l10n-fi + +%description tests +This package contains unit and functional tests for the MeeGo Touch Framework. + + +%package -n meegotouch-demos +Summary: MeeGo Touch Framework demos +Group: System/Libraries +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-demos-l10n + +%description -n meegotouch-demos +This package contains demos for the MeeGo Touch Framework. + + +%package -n meegotouch-demos-l10n +Summary: MeeGo Touch Framework demos translations +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description -n meegotouch-demos-l10n +This package contains the demos translations for the MeeGo Touch Framework. + + +%package -n meegotouch-demos-tests +Summary: MeeGo Touch Framework demos tests +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-demos + +%description -n meegotouch-demos-tests +This package contains demos tests for the MeeGo Touch Framework. + + + +%prep +%setup -q -n ./%{name}-%{version} + +# arm_egl_visibility.patch +%patch0 -p1 +# BMC_8268_show_statusbar_on_n900.patch +%patch1 -p1 +# BMC_4068_default_autodetect_conf.patch +%patch2 -p1 +# BMC_22845_move-var-run-to-home.patch +%patch3 -p1 +# revert-MPanRecognizerTouch-usage-on-arm.patch +%patch4 -p1 +# BMC_19732_MR_2318.patch +%patch5 -p1 +# buildfix_remove_warnings.patch +%patch6 -p1 +# temp_MR_2314_remove_prl_duplicates.patch +%patch7 -p1 (1295 more lines skipped) Index: libmeegotouch.yaml =================================================================== --- libmeegotouch.yaml (revision 0) +++ libmeegotouch.yaml (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,147 @@ +Name: libmeegotouch +Summary: MeeGo Touch Framework +Version: 0.24.5 +Release: 1 +Group: System/Libraries +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/libmeegotouch +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - arm_egl_visibility.patch + - BMC_8268_show_statusbar_on_n900.patch + - BMC_4068_default_autodetect_conf.patch + - BMC_22845_move-var-run-to-home.patch + - revert-MPanRecognizerTouch-usage-on-arm.patch + - BMC_19732_MR_2318.patch + - buildfix_remove_warnings.patch + - temp_MR_2314_remove_prl_duplicates.patch +Description: | + Qt based MeeGo Touch Framework for developing touch based user interfaces. +Requires: + - meegotouch-theme >= 0.20.79 + - libmeegotouch-l10n-en +PkgBR: + - doxygen + - icu +PkgConfigBR: + - QtOpenGL +# Do not build require Qt Mobility module to avoid OBS extra build cycles +# - QtServiceFramework + - contextsubscriber-1.0 >= 0.5.25 + - gconf-2.0 + - gstreamer-0.10 + - gstreamer-base-0.10 + - gstreamer-plugins-base-0.10 + - icu-uc + - x11 + - xcomposite + - xdamage + - libngf0 + - dbus-glib-1 +Provides: + - libdui >= 0.20.0 +Obsoletes: + - libdui < 0.20.0 + - libmeegotouch < 0.20.89 +Configure: none +Builder: none +ExtraSources: + - libmeegotouch.sh;%{_sysconfdir}/profile.d + - mthemedaemon.desktop;%{_sysconfdir}/xdg/autostart +RunFdupes: + - "%{_datadir}" +UseAsNeeded: no +SubPackages: + - Name: devel + Summary: MeeGo Touch Framework development files + Group: Development/Libraries + Description: | + This package contains the files necessary to develop applications using + the Meego Touch Framework. + + - Name: l10n-ar + Group: Development/Languages + Summary: Arabic (ar) MeeGo Touch Framework translation + Description: | + This package contains the Arabic translation for the MeeGo Touch Framework. + + - Name: l10n-de + Group: Development/Languages + Summary: German (de) MeeGo Touch Framework translation + Description: | + This package contains the German translation for the MeeGo Touch Framework. + + - Name: l10n-en + Group: Development/Languages + Summary: English (en) MeeGo Touch Framework translation + Description: | + This package contains the English translation for the MeeGo Touch Framework. + + - Name: l10n-fi + Group: Development/Languages + Summary: Finnish (fi) MeeGo Touch Framework translation + Description: | + This package contains the Finnish translation for the MeeGo Touch Framework. + + - Name: l10n-hu + Group: Development/Languages + Summary: Hungarian (hu) MeeGo Touch Framework translation + Description: | + This package contains the Hungarian translation for the MeeGo Touch Framework. + + - Name: l10n-ur + Group: Development/Languages + Summary: Urdu (ur) MeeGo Touch Framework translation + Description: | + This package contains the Urdu translation for the MeeGo Touch Framework. + + - Name: l10n-zhcn + Group: Development/Languages + Summary: Chinese Simplified (zh_CN) MeeGo Touch Framework translation + Description: | + This package contains the Chinese Simplified translation for the MeeGo Touch Framework. + + - Name: benchmarks + Summary: Benchmark tests + Group: Development/Libraries + Description: | + This package contains benchmark tests for the MeeGo Touch Framework. + Requires: + - meegotouch-demos + + - Name: tests + Summary: Unit and functional tests + Group: Development/Libraries + Description: | + This package contains unit and functional tests for the MeeGo Touch Framework. + Requires: + - gst-plugins-base + - gst-plugins-good + - libmeegotouch-l10n-fi + + - Name: meegotouch-demos + AsWholeName: yes + Summary: MeeGo Touch Framework demos + Group: System/Libraries + Description: | + This package contains demos for the MeeGo Touch Framework. + Requires: + - meegotouch-demos-l10n + + - Name: meegotouch-demos-l10n + AsWholeName: yes + Summary: MeeGo Touch Framework demos translations + Group: Development/Languages + Description: | + This package contains the demos translations for the MeeGo Touch Framework. + + - Name: meegotouch-demos-tests + AsWholeName: yes + Summary: MeeGo Touch Framework demos tests + Group: Development/Libraries + Description: | + This package contains demos tests for the MeeGo Touch Framework. + Requires: + - meegotouch-demos + Index: revert-MPanRecognizerTouch-usage-on-arm.patch =================================================================== --- revert-MPanRecognizerTouch-usage-on-arm.patch (revision 0) +++ revert-MPanRecognizerTouch-usage-on-arm.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,35 @@ +diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp +index 7c23aaf..d698d39 100644 +--- a/src/corelib/core/mcomponentdata.cpp ++++ b/src/corelib/core/mcomponentdata.cpp +@@ -50,13 +50,7 @@ + #include "mwindow.h" + #include "mapplicationwindow.h" + #include "mtapandholdrecognizer.h" +- +-#ifdef __arm__ +- #include <mpanrecognizertouch.h> +-#else +- #include <mpanrecognizer.h> +-#endif +- ++#include "mpanrecognizer.h" + #include "mswiperecognizer.h" + #include "msyslogclient.h" + #include <MDebug> +@@ -1417,11 +1411,11 @@ bool MComponentData::registerDefaultRecognizer(Qt::GestureType type) + // (which uses QMouseEvents). + // A better way to do it would be using QSystemDeviceInfo::inputMethodType(), + // but it's not worth bringing up this dependency just for this if{}else{} here. +-#ifdef __arm__ +- QGestureRecognizer::registerRecognizer(new MPanRecognizerTouch); +-#else ++//#ifdef __arm__ ++// QGestureRecognizer::registerRecognizer(new MPanRecognizerTouch); ++//#else + QGestureRecognizer::registerRecognizer(new MPanRecognizer()); +-#endif ++//#endif + break; + case Qt::TapAndHoldGesture: + QGestureRecognizer::registerRecognizer(new MTapAndHoldRecognizer()); Index: buildfix_remove_warnings.patch =================================================================== --- buildfix_remove_warnings.patch (revision 0) +++ buildfix_remove_warnings.patch (revision 8da08df0c1e8fb2e5f69ed7c056f6296) @@ -0,0 +1,28 @@ +diff --git a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp +index 7eb98be..30d3c2c 100644 +--- a/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp ++++ b/tests/ut_mtapandholdrecognizer/ut_mtapandholdrecognizer.cpp +@@ -182,6 +182,7 @@ void Ut_MTapAndHoldRecognizer::testUsingStyleTimeout() + { + QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(0,0), QPoint(0,0), Qt::LeftButton, Qt::LeftButton, 0); + QGestureRecognizer::Result currentState = recognizer->recognize(tapAndHoldGesture, 0, &pressEvent); ++ Q_UNUSED(currentState); + + // Verify that timeout from style is used when no timeout is set + QCOMPARE(startTimerInterval, MTapAndHoldStyleTimeout); +@@ -193,6 +194,7 @@ void Ut_MTapAndHoldRecognizer::testSetTimeout() + + QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(0,0), QPoint(0,0), Qt::LeftButton, Qt::LeftButton, 0); + QGestureRecognizer::Result currentState = recognizer->recognize(tapAndHoldGesture, 0, &pressEvent); ++ Q_UNUSED(currentState); + + // Verify that timeout that was set is used + QCOMPARE(startTimerInterval, MTapAndHoldSetTimeout); +@@ -207,6 +209,7 @@ void Ut_MTapAndHoldRecognizer::testResetTimeout() + + QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(0,0), QPoint(0,0), Qt::LeftButton, Qt::LeftButton, 0); + QGestureRecognizer::Result currentState = recognizer->recognize(tapAndHoldGesture, 0, &pressEvent); ++ Q_UNUSED(currentState); + + // Verify that as timeout was resetted then timeout from style is used + QCOMPARE(startTimerInterval, MTapAndHoldStyleTimeout);
