[meego-commits] 8110: Changes to Trunk:Testing/qt-mobility
Fathi Boudra
no_reply at build.meego.com
Wed Oct 6 08:24:37 UTC 2010
Hi,
I have made the following changes to qt-mobility in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Fathi Boudra
[This message was auto-generated]
---
Request #8110:
submit: devel:qt-mtf/qt-mobility(r91) -> Trunk:Testing/qt-mobility
Message:
* Mon Oct 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.1.0~beta2
- Update to Qt Mobility 1.1.0~beta2
- Update patches to apply against Qt Mobility 1.1.0~beta2
- Disable default_subtitle_loading.patch - need some rework
- Add patches:
use_isabspath.patch, use isAbsPath() for MeeGo instead of pathhelper.
pathhelper uses abs_path and returns undef for non-existent path.
qmf_2010w36_support.patch, fix build with QMF >= 2010w36 caused by library
renaming (qtopiamail -> qmfclient)
- Add new APIs: Feedback, Document Gallery, Organizer and Versit (Organizer)
- Cleanup build requirements:
replace qtopiamail -> qmfclient
replace sensorfw-devel -> pkgconfig(sensord)
remove QtWebKit
add xrandr, xrender and qt-devel-tools
- Update QMF_INCLUDEDIR: qtopiamail -> qmfclient
- Add demosdir and examplesdir configure options
- Update modules list passed to configure
- Update %files
State: new 2010-10-06T01:24:36 boudra
Comment: None
changes files:
--------------
--- qt-mobility.changes
+++ qt-mobility.changes
@@ -0,0 +1,20 @@
+* Mon Oct 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.1.0~beta2
+- Update to Qt Mobility 1.1.0~beta2
+- Update patches to apply against Qt Mobility 1.1.0~beta2
+- Disable default_subtitle_loading.patch - need some rework
+- Add patches:
+ use_isabspath.patch, use isAbsPath() for MeeGo instead of pathhelper.
+ pathhelper uses abs_path and returns undef for non-existent path.
+ qmf_2010w36_support.patch, fix build with QMF >= 2010w36 caused by library
+ renaming (qtopiamail -> qmfclient)
+- Add new APIs: Feedback, Document Gallery, Organizer and Versit (Organizer)
+- Cleanup build requirements:
+ replace qtopiamail -> qmfclient
+ replace sensorfw-devel -> pkgconfig(sensord)
+ remove QtWebKit
+ add xrandr, xrender and qt-devel-tools
+- Update QMF_INCLUDEDIR: qtopiamail -> qmfclient
+- Add demosdir and examplesdir configure options
+- Update modules list passed to configure
+- Update %files
+
old:
----
0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch
01_qtcontacts_api_1.1.0_tp1.patch.bz2
02_no_rpath.patch
02_qtcontacts_api_1.1.0~git20100825.patch.bz2
03_ftbfs_synthesizedDisplayLabel.patch
04_ftbfs_multimedia_examples.patch
05_fix_translations_install_path.patch
06_enable_sensorfw_support.patch
07_add_location_api_meego_implementation_using_geoclue.patch
add-meego-build-flag.patch
qt-enable-playbin2.patch
qt-mobility-opensource-src-1.0.2.tar.gz
qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
new:
----
GL_CLAMP_TO_EDGE_of_video_texture.patch
add_location_api_meego_implementation_using_geoclue.patch
add_meego_build_flag.patch
enable_pkgconfig_support.patch
enable_sensorfw_support.patch
enable_tracker_contacts_engine.patch
fix_translations_install_path.patch
ftbfs_multimedia_examples.patch
no_rpath.patch
qmf_2010w36_support.patch
qt-mobility-opensource-src-1.1.0-beta2.tar.gz
use_isabspath.patch
spec files:
-----------
--- qt-mobility.spec
+++ qt-mobility.spec
@@ -1,44 +1,45 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.19
+# Generated by: spectacle version 0.20
#
# >> macros
# << macros
Name: qt-mobility
Summary: APIs for mobile device functionality
-Version: 1.0.2
+Version: 1.1.0~beta2
Release: 1
Group: System/Libraries
License: LGPLv2.1 with exception or GPLv3
URL: http://qt.gitorious.org/qt-mobility
-Source0: http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-%{version}.tar.gz
+Source0: http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-1.1.0-beta2.tar.gz
Source100: qt-mobility.yaml
-Patch0: 02_no_rpath.patch
-Patch1: 04_ftbfs_multimedia_examples.patch
-Patch2: 05_fix_translations_install_path.patch
-Patch3: qt-enable-playbin2.patch
-Patch4: qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
-Patch5: default_subtitle_loading.patch
-Patch6: add-meego-build-flag.patch
-Patch7: 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
-Patch8: 01_qtcontacts_api_1.1.0_tp1.patch.bz2
-Patch9: 02_qtcontacts_api_1.1.0~git20100825.patch.bz2
-Patch10: 03_ftbfs_synthesizedDisplayLabel.patch
-Patch11: 06_enable_sensorfw_support.patch
-Patch12: 07_add_location_api_meego_implementation_using_geoclue.patch
+Patch0: no_rpath.patch
+Patch1: ftbfs_multimedia_examples.patch
+Patch2: fix_translations_install_path.patch
+Patch3: GL_CLAMP_TO_EDGE_of_video_texture.patch
+Patch4: add_meego_build_flag.patch
+Patch5: enable_pkgconfig_support.patch
+Patch6: enable_tracker_contacts_engine.patch
+Patch7: enable_sensorfw_support.patch
+Patch8: add_location_api_meego_implementation_using_geoclue.patch
+Patch9: use_isabspath.patch
+Patch10: qmf_2010w36_support.patch
Requires: libqtcontacts1 = %{version}
+Requires: libqtfeedback1 = %{version}
+Requires: libqtgallery1 = %{version}
Requires: libqtlocation1 = %{version}
Requires: libqtmessaging1 = %{version}
Requires: libqtmultimediakit1 = %{version}
+Requires: libqtorganizer1 = %{version}
Requires: libqtpublishsubscribe1 = %{version}
Requires: libqtsensors1 = %{version}
Requires: libqtserviceframework1 = %{version}
Requires: libqtsysteminfo1 = %{version}
Requires: libqtversit1 = %{version}
+Requires: libqtversitorganizer1 = %{version}
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(QtOpenGL)
-BuildRequires: pkgconfig(QtWebKit)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(contextsubscriber-1.0)
@@ -47,12 +48,15 @@
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(gypsy)
BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(qtopiamail)
BuildRequires: pkgconfig(qttracker)
+BuildRequires: pkgconfig(qmfclient)
+BuildRequires: pkgconfig(sensord)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xv)
-BuildRequires: sensorfw-devel
+BuildRequires: qt-devel-tools
BuildRequires: fdupes
@@ -90,6 +94,34 @@
local or remote backends.
+%package -n libqtfeedback1
+Summary: Qt Mobility Feedback module
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtfeedback1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Feedback API. It enables a client to control
+the vibration of the device or the piezo feedback from the screen.
+
+
+%package -n libqtgallery1
+Summary: Qt Mobility Document Gallery module
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtgallery1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API for accessing collections of documents and media
+and their meta-data.
+
+
%package -n libqtlocation1
Summary: Qt Mobility Location module
Group: System/Libraries
@@ -132,6 +164,22 @@
collection of media content.
+%package -n libqtorganizer1
+Summary: Qt Mobility Organizer module
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtorganizer1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API for management of calendar, scheduling and
+personal data from local or remote backends. It includes the ability to create,
+edit, list, delete and lookup organizer information whether it is stored
+locally or remotely.
+
+
%package -n libqtpublishsubscribe1
Summary: Qt Mobility Publish and Subscribe module
Group: System/Libraries
@@ -191,7 +239,7 @@
%package -n libqtversit1
-Summary: Qt Mobility Versit module
+Summary: Qt Mobility Versit (vCard) module
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
Requires(post): /sbin/ldconfig
@@ -200,7 +248,22 @@
%description -n libqtversit1
Qt Mobility delivers a set of new APIs for mobile device functionality.
-This package contains an API to manage Versit documents.
+This package contains an API to manage Versit documents, such as vCards.
+
+
+%package -n libqtversitorganizer1
+Summary: Qt Mobility Versit (Organizer) module
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtversitorganizer1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API to manage Versit documents, such as iCalendar
+documents. It interfaces the Organizer API and uses the same framework as for
+vCards.
%package -n libdeclarative-contacts
@@ -214,6 +277,39 @@
This package contains the Contacts QML plugin for QtDeclarative.
+%package -n libdeclarative-gallery
+Summary: Qt Mobility Document Gallery QML plugin
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n libdeclarative-gallery
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Document Gallery QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-location
+Summary: Qt Mobility Location QML plugin
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n libdeclarative-location
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Location QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-messaging
+Summary: Qt Mobility Messaging QML plugin
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n libdeclarative-messaging
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Messaging QML plugin for QtDeclarative.
+
+
%package -n libdeclarative-multimedia
Summary: Qt Mobility Multimedia QML plugin
Group: System/Libraries
@@ -258,6 +354,17 @@
This package contains the Service Framework QML plugin for QtDeclarative.
+%package -n libdeclarative-systeminfo
+Summary: Qt Mobility System Information QML plugin
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n libdeclarative-systeminfo
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the System Information QML plugin for QtDeclarative.
+
+
%package -n servicefw
Summary: Qt Mobility Service Framework tool
Group: Development/Tools
@@ -274,6 +381,8 @@
Summary: Qt Mobility examples
Group: System/X11
Requires: %{name} = %{version}-%{release}
+Requires(post): /bin/touch
+Requires(post): gtk2
%description examples
Qt Mobility delivers a set of new APIs for mobile device functionality.
@@ -294,41 +403,37 @@
%prep
-%setup -q -n %{name}-opensource-src-%{version}
+%setup -q -n %{name}-opensource-src-1.1.0-beta2
-# 02_no_rpath.patch
+# no_rpath.patch
%patch0 -p1
-# 04_ftbfs_multimedia_examples.patch
+# ftbfs_multimedia_examples.patch
%patch1 -p1
-# 05_fix_translations_install_path.patch
+# fix_translations_install_path.patch
%patch2 -p1
-# qt-enable-playbin2.patch
+# GL_CLAMP_TO_EDGE_of_video_texture.patch
%patch3 -p1
-# qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
+# add_meego_build_flag.patch
%patch4 -p1
-# default_subtitle_loading.patch
+# enable_pkgconfig_support.patch
%patch5 -p1
-# add-meego-build-flag.patch
+# enable_tracker_contacts_engine.patch
%patch6 -p1
-# 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
+# enable_sensorfw_support.patch
%patch7 -p1
-# 01_qtcontacts_api_1.1.0_tp1.patch.bz2
+# add_location_api_meego_implementation_using_geoclue.patch
%patch8 -p1
-# 02_qtcontacts_api_1.1.0~git20100825.patch.bz2
+# use_isabspath.patch
%patch9 -p1
-# 03_ftbfs_synthesizedDisplayLabel.patch
+# qmf_2010w36_support.patch
%patch10 -p1
-# 06_enable_sensorfw_support.patch
-%patch11 -p1
-# 07_add_location_api_meego_implementation_using_geoclue.patch
-%patch12 -p1
# >> setup
# << setup
%build
# >> build pre
# QMF environment variables should be set
-export QMF_INCLUDEDIR=%{_includedir}/qtopiamail
+export QMF_INCLUDEDIR=%{_includedir}/qmfclient
export QMF_LIBDIR=%{_libdir}
./configure \
-prefix "%{_prefix}" \
@@ -336,8 +441,11 @@
-libdir "%{_libdir}" \
-bindir "%{_bindir}" \
-plugindir "%{_libdir}/qt4/plugins" \
+-demosdir "%{_libdir}/qtmobility/demos" \
+-examplesdir "%{_libdir}/qtmobility/examples" \
-examples \
--modules "location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors" \
+-demos \
+-modules "location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery organizer feedback" \
-meego
make %{?_smp_mflags}
# << build pre
@@ -355,14 +463,7 @@
%qmake_install
# Fix wrong path in pkgconfig files
find %{buildroot}%{_libdir}/pkgconfig -type f -name '*.pc' \
--exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-%{version}/?\S+,,g" {} \;
-# Remove unpackaged files (examples install is broken)
-rm -f %{buildroot}%{_bindir}/*.txt
-rm -rf %{buildroot}%{_bindir}/battery-subscriber
-rm -rf %{buildroot}%{_bindir}/declarative-sfw-dialer
-rm -rf %{buildroot}%{_bindir}/declarative-sfw-notes
-rm -rf %{buildroot}%{_bindir}/qmlcontacts
-rm -rf %{buildroot}%{_bindir}/xmldata
+-exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-1.1.0-beta2/?\S+,,g" {} \;
# << install post
%fdupes %{buildroot}/%{_includedir}
@@ -380,6 +481,16 @@
%postun -n libqtcontacts1 -p /sbin/ldconfig
+%post -n libqtfeedback1 -p /sbin/ldconfig
+
+%postun -n libqtfeedback1 -p /sbin/ldconfig
+
+
+%post -n libqtgallery1 -p /sbin/ldconfig
+
+%postun -n libqtgallery1 -p /sbin/ldconfig
+
+
%post -n libqtlocation1 -p /sbin/ldconfig
%postun -n libqtlocation1 -p /sbin/ldconfig
@@ -395,6 +506,11 @@
%postun -n libqtmultimediakit1 -p /sbin/ldconfig
+%post -n libqtorganizer1 -p /sbin/ldconfig
+
+%postun -n libqtorganizer1 -p /sbin/ldconfig
+
+
%post -n libqtpublishsubscribe1 -p /sbin/ldconfig
%postun -n libqtpublishsubscribe1 -p /sbin/ldconfig
@@ -420,6 +536,13 @@
%postun -n libqtversit1 -p /sbin/ldconfig
+%post -n libqtversitorganizer1 -p /sbin/ldconfig
+
+%postun -n libqtversitorganizer1 -p /sbin/ldconfig
+
+
+
+
@@ -443,6 +566,24 @@
+
+
+
+
+
+%post examples
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+ --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+%postun examples
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+ --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+
+
+
%files
%defattr(-,root,root,-)
# >> files
@@ -463,6 +604,7 @@
%{_includedir}/QtContacts/QContactActionDescriptor
%{_includedir}/QtContacts/QContactActionFactory
%{_includedir}/QtContacts/QContactActionFilter
+%{_includedir}/QtContacts/QContactActionTarget
%{_includedir}/QtContacts/QContactAddress
%{_includedir}/QtContacts/QContactAnniversary
%{_includedir}/QtContacts/QContactAvatar
@@ -480,6 +622,7 @@
%{_includedir}/QtContacts/QContactDisplayLabel
%{_includedir}/QtContacts/QContactEmailAddress
%{_includedir}/QtContacts/QContactFamily
+%{_includedir}/QtContacts/QContactFavorite
%{_includedir}/QtContacts/QContactFetchHint
%{_includedir}/QtContacts/QContactFetchRequest
%{_includedir}/QtContacts/QContactFilter
@@ -524,6 +667,7 @@
%{_includedir}/QtContacts/qcontactactiondescriptor.h
%{_includedir}/QtContacts/qcontactactionfactory.h
%{_includedir}/QtContacts/qcontactactionfilter.h
+%{_includedir}/QtContacts/qcontactactiontarget.h
%{_includedir}/QtContacts/qcontactaddress.h
%{_includedir}/QtContacts/qcontactanniversary.h
%{_includedir}/QtContacts/qcontactavatar.h
@@ -542,6 +686,7 @@
%{_includedir}/QtContacts/qcontactdisplaylabel.h
%{_includedir}/QtContacts/qcontactemailaddress.h
%{_includedir}/QtContacts/qcontactfamily.h
+%{_includedir}/QtContacts/qcontactfavorite.h
%{_includedir}/QtContacts/qcontactfetchhint.h
%{_includedir}/QtContacts/qcontactfetchrequest.h
%{_includedir}/QtContacts/qcontactfilter.h
@@ -584,19 +729,195 @@
%{_includedir}/QtContacts/qcontacturl.h
%{_includedir}/QtContacts/qtcontacts.h
%{_includedir}/QtContacts/qtcontactsglobal.h
+%{_includedir}/QtFeedback/QFeedbackActuator
+%{_includedir}/QtFeedback/QFeedbackEffect
+%{_includedir}/QtFeedback/QFeedbackFileEffect
+%{_includedir}/QtFeedback/QFeedbackFileInterface
+%{_includedir}/QtFeedback/QFeedbackHapticsEffect
+%{_includedir}/QtFeedback/QFeedbackHapticsInterface
+%{_includedir}/QtFeedback/QFeedbackInterface
+%{_includedir}/QtFeedback/QFeedbackThemeInterface
+%{_includedir}/QtFeedback/qfeedbackactuator.h
+%{_includedir}/QtFeedback/qfeedbackeffect.h
+%{_includedir}/QtFeedback/qfeedbackplugininterfaces.h
+%{_includedir}/QtGallery/QAbstractGallery
+%{_includedir}/QtGallery/QDocumentGallery
+%{_includedir}/QtGallery/QGalleryAbstractRequest
+%{_includedir}/QtGallery/QGalleryAbstractResponse
+%{_includedir}/QtGallery/QGalleryFilter
+%{_includedir}/QtGallery/QGalleryIntersectionFilter
+%{_includedir}/QtGallery/QGalleryItemRequest
+%{_includedir}/QtGallery/QGalleryMetaDataFilter
+%{_includedir}/QtGallery/QGalleryProperty
+%{_includedir}/QtGallery/QGalleryQueryModel
+%{_includedir}/QtGallery/QGalleryQueryRequest
+%{_includedir}/QtGallery/QGalleryRemoveRequest
+%{_includedir}/QtGallery/QGalleryResource
+%{_includedir}/QtGallery/QGalleryResultSet
+%{_includedir}/QtGallery/QGalleryType
+%{_includedir}/QtGallery/QGalleryTypeRequest
+%{_includedir}/QtGallery/QGalleryUnionFilter
+%{_includedir}/QtGallery/qabstractgallery.h
+%{_includedir}/QtGallery/qdocumentgallery.h
+%{_includedir}/QtGallery/qgalleryabstractrequest.h
+%{_includedir}/QtGallery/qgalleryabstractresponse.h
+%{_includedir}/QtGallery/qgalleryfilter.h
+%{_includedir}/QtGallery/qgalleryitemrequest.h
+%{_includedir}/QtGallery/qgalleryproperty.h
+%{_includedir}/QtGallery/qgalleryquerymodel.h
+%{_includedir}/QtGallery/qgalleryqueryrequest.h
+%{_includedir}/QtGallery/qgalleryremoverequest.h
+%{_includedir}/QtGallery/qgalleryresource.h
+%{_includedir}/QtGallery/qgalleryresultset.h
+%{_includedir}/QtGallery/qgallerytype.h
+%{_includedir}/QtGallery/qgallerytyperequest.h
+%{_includedir}/QtLocation/QGeoAddress
%{_includedir}/QtLocation/QGeoAreaMonitor
+%{_includedir}/QtLocation/QGeoBoundingArea
+%{_includedir}/QtLocation/QGeoBoundingBox
+%{_includedir}/QtLocation/QGeoBoundingCircle
%{_includedir}/QtLocation/QGeoCoordinate
+%{_includedir}/QtLocation/QGeoInstruction
+%{_includedir}/QtLocation/QGeoMapCircleObject
+%{_includedir}/QtLocation/QGeoMapData
+%{_includedir}/QtLocation/QGeoMapObject
+%{_includedir}/QtLocation/QGeoMapObjectInfo
+%{_includedir}/QtLocation/QGeoMapOverlay
+%{_includedir}/QtLocation/QGeoMapPixmapObject
+%{_includedir}/QtLocation/QGeoMapPolygonObject
+%{_includedir}/QtLocation/QGeoMapPolylineObject
+%{_includedir}/QtLocation/QGeoMapRectangleObject
+%{_includedir}/QtLocation/QGeoMapRouteObject
+%{_includedir}/QtLocation/QGeoMapTextObject
+%{_includedir}/QtLocation/QGeoMappingManager
+%{_includedir}/QtLocation/QGeoMappingManagerEngine
+%{_includedir}/QtLocation/QGeoPlace
%{_includedir}/QtLocation/QGeoPositionInfo
%{_includedir}/QtLocation/QGeoPositionInfoSource
+%{_includedir}/QtLocation/QGeoRoute
+%{_includedir}/QtLocation/QGeoRouteReply
+%{_includedir}/QtLocation/QGeoRouteRequest
+%{_includedir}/QtLocation/QGeoRouteSegment
+%{_includedir}/QtLocation/QGeoRoutingManager
+%{_includedir}/QtLocation/QGeoRoutingManagerEngine
%{_includedir}/QtLocation/QGeoSatelliteInfo
%{_includedir}/QtLocation/QGeoSatelliteInfoSource
+%{_includedir}/QtLocation/QGeoSearchManager
+%{_includedir}/QtLocation/QGeoSearchManagerEngine
+%{_includedir}/QtLocation/QGeoSearchReply
+%{_includedir}/QtLocation/QGeoServiceProvider
+%{_includedir}/QtLocation/QGeoServiceProviderFactory
+%{_includedir}/QtLocation/QGeoTiledMapData
+%{_includedir}/QtLocation/QGeoTiledMapReply
+%{_includedir}/QtLocation/QGeoTiledMapRequest
+%{_includedir}/QtLocation/QGeoTiledMappingManagerEngine
+%{_includedir}/QtLocation/QGraphicsGeoMap
+%{_includedir}/QtLocation/QLandmark
+%{_includedir}/QtLocation/QLandmarkAbstractRequest
+%{_includedir}/QtLocation/QLandmarkAttributeFilter
+%{_includedir}/QtLocation/QLandmarkBoxFilter
+%{_includedir}/QtLocation/QLandmarkCategory
+%{_includedir}/QtLocation/QLandmarkCategoryFetchByIdRequest
+%{_includedir}/QtLocation/QLandmarkCategoryFetchRequest
+%{_includedir}/QtLocation/QLandmarkCategoryFilter
+%{_includedir}/QtLocation/QLandmarkCategoryId
+%{_includedir}/QtLocation/QLandmarkCategoryIdFetchRequest
+%{_includedir}/QtLocation/QLandmarkCategoryRemoveRequest
+%{_includedir}/QtLocation/QLandmarkCategorySaveRequest
+%{_includedir}/QtLocation/QLandmarkCodec
+%{_includedir}/QtLocation/QLandmarkCodecPlugin
+%{_includedir}/QtLocation/QLandmarkExportRequest
+%{_includedir}/QtLocation/QLandmarkFetchByIdRequest
+%{_includedir}/QtLocation/QLandmarkFetchRequest
+%{_includedir}/QtLocation/QLandmarkFilter
+%{_includedir}/QtLocation/QLandmarkId
+%{_includedir}/QtLocation/QLandmarkIdFetchRequest
+%{_includedir}/QtLocation/QLandmarkIdFilter
+%{_includedir}/QtLocation/QLandmarkImportRequest
+%{_includedir}/QtLocation/QLandmarkIntersectionFilter
+%{_includedir}/QtLocation/QLandmarkManager
+%{_includedir}/QtLocation/QLandmarkManagerEngine
+%{_includedir}/QtLocation/QLandmarkManagerEngineFactory
+%{_includedir}/QtLocation/QLandmarkNameFilter
+%{_includedir}/QtLocation/QLandmarkNameSort
+%{_includedir}/QtLocation/QLandmarkProximityFilter
+%{_includedir}/QtLocation/QLandmarkRemoveRequest
+%{_includedir}/QtLocation/QLandmarkSaveRequest
+%{_includedir}/QtLocation/QLandmarkSortOrder
+%{_includedir}/QtLocation/QLandmarkUnionFilter
%{_includedir}/QtLocation/QNmeaPositionInfoSource
+%{_includedir}/QtLocation/qgeoaddress.h
%{_includedir}/QtLocation/qgeoareamonitor.h
+%{_includedir}/QtLocation/qgeoboundingarea.h
+%{_includedir}/QtLocation/qgeoboundingbox.h
+%{_includedir}/QtLocation/qgeoboundingcircle.h
%{_includedir}/QtLocation/qgeocoordinate.h
+%{_includedir}/QtLocation/qgeoinstruction.h
+%{_includedir}/QtLocation/qgeomapcircleobject.h
+%{_includedir}/QtLocation/qgeomapdata.h
+%{_includedir}/QtLocation/qgeomapobject.h
+%{_includedir}/QtLocation/qgeomapobjectinfo.h
+%{_includedir}/QtLocation/qgeomapoverlay.h
+%{_includedir}/QtLocation/qgeomappingmanager.h
+%{_includedir}/QtLocation/qgeomappingmanagerengine.h
+%{_includedir}/QtLocation/qgeomappixmapobject.h
+%{_includedir}/QtLocation/qgeomappolygonobject.h
+%{_includedir}/QtLocation/qgeomappolylineobject.h
+%{_includedir}/QtLocation/qgeomaprectangleobject.h
+%{_includedir}/QtLocation/qgeomaprouteobject.h
+%{_includedir}/QtLocation/qgeomaptextobject.h
+%{_includedir}/QtLocation/qgeoplace.h
%{_includedir}/QtLocation/qgeopositioninfo.h
%{_includedir}/QtLocation/qgeopositioninfosource.h
+%{_includedir}/QtLocation/qgeoroute.h
+%{_includedir}/QtLocation/qgeoroutereply.h
+%{_includedir}/QtLocation/qgeorouterequest.h
+%{_includedir}/QtLocation/qgeoroutesegment.h
+%{_includedir}/QtLocation/qgeoroutingmanager.h
+%{_includedir}/QtLocation/qgeoroutingmanagerengine.h
%{_includedir}/QtLocation/qgeosatelliteinfo.h
%{_includedir}/QtLocation/qgeosatelliteinfosource.h
+%{_includedir}/QtLocation/qgeosearchmanager.h
+%{_includedir}/QtLocation/qgeosearchmanagerengine.h
+%{_includedir}/QtLocation/qgeosearchreply.h
+%{_includedir}/QtLocation/qgeoserviceprovider.h
+%{_includedir}/QtLocation/qgeoserviceproviderfactory.h
+%{_includedir}/QtLocation/qgeotiledmapdata.h
+%{_includedir}/QtLocation/qgeotiledmappingmanagerengine.h
+%{_includedir}/QtLocation/qgeotiledmapreply.h
+%{_includedir}/QtLocation/qgeotiledmaprequest.h
+%{_includedir}/QtLocation/qgraphicsgeomap.h
+%{_includedir}/QtLocation/qlandmark.h
+%{_includedir}/QtLocation/qlandmarkabstractrequest.h
+%{_includedir}/QtLocation/qlandmarkattributefilter.h
+%{_includedir}/QtLocation/qlandmarkboxfilter.h
+%{_includedir}/QtLocation/qlandmarkcategory.h
+%{_includedir}/QtLocation/qlandmarkcategoryfetchbyidrequest.h
+%{_includedir}/QtLocation/qlandmarkcategoryfetchrequest.h
+%{_includedir}/QtLocation/qlandmarkcategoryfilter.h
+%{_includedir}/QtLocation/qlandmarkcategoryid.h
+%{_includedir}/QtLocation/qlandmarkcategoryidfetchrequest.h
+%{_includedir}/QtLocation/qlandmarkcategoryremoverequest.h
+%{_includedir}/QtLocation/qlandmarkcategorysaverequest.h
+%{_includedir}/QtLocation/qlandmarkexportrequest.h
+%{_includedir}/QtLocation/qlandmarkfetchbyidrequest.h
+%{_includedir}/QtLocation/qlandmarkfetchrequest.h
+%{_includedir}/QtLocation/qlandmarkfilter.h
+%{_includedir}/QtLocation/qlandmarkid.h
+%{_includedir}/QtLocation/qlandmarkidfetchrequest.h
+%{_includedir}/QtLocation/qlandmarkidfilter.h
+%{_includedir}/QtLocation/qlandmarkimportrequest.h
+%{_includedir}/QtLocation/qlandmarkintersectionfilter.h
+%{_includedir}/QtLocation/qlandmarkmanager.h
+%{_includedir}/QtLocation/qlandmarkmanagerengine.h
+%{_includedir}/QtLocation/qlandmarkmanagerenginefactory.h
+%{_includedir}/QtLocation/qlandmarknamefilter.h
+%{_includedir}/QtLocation/qlandmarknamesort.h
+%{_includedir}/QtLocation/qlandmarkproximityfilter.h
+%{_includedir}/QtLocation/qlandmarkremoverequest.h
+%{_includedir}/QtLocation/qlandmarksaverequest.h
+%{_includedir}/QtLocation/qlandmarksortorder.h
+%{_includedir}/QtLocation/qlandmarkunionfilter.h
%{_includedir}/QtLocation/qnmeapositioninfosource.h
%{_includedir}/QtMessaging/QMessage
%{_includedir}/QtMessaging/QMessageAccount
@@ -606,6 +927,7 @@
%{_includedir}/QtMessaging/QMessageAddress
%{_includedir}/QtMessaging/QMessageContentContainer
%{_includedir}/QtMessaging/QMessageContentContainerId
+%{_includedir}/QtMessaging/QMessageDataComparator
%{_includedir}/QtMessaging/QMessageFilter
%{_includedir}/QtMessaging/QMessageFolder
%{_includedir}/QtMessaging/QMessageFolderFilter
@@ -635,11 +957,15 @@
%{_includedir}/QtMessaging/qmessagemanager.h
%{_includedir}/QtMessaging/qmessageservice.h
%{_includedir}/QtMessaging/qmessagesortorder.h
+%{_includedir}/QtMobility/QLatin1Constant
+%{_includedir}/QtMobility/qlatin1constant.h
+%{_includedir}/QtMobility/qmobilityglobal.h
%{_includedir}/QtMultimediaKit/QAbstractAudioDeviceInfo
%{_includedir}/QtMultimediaKit/QAbstractAudioInput
%{_includedir}/QtMultimediaKit/QAbstractAudioOutput
%{_includedir}/QtMultimediaKit/QAbstractVideoBuffer
%{_includedir}/QtMultimediaKit/QAbstractVideoSurface
+%{_includedir}/QtMultimediaKit/QAudio
%{_includedir}/QtMultimediaKit/QAudioCaptureSource
%{_includedir}/QtMultimediaKit/QAudioDeviceInfo
%{_includedir}/QtMultimediaKit/QAudioEncoderControl
@@ -649,6 +975,20 @@
%{_includedir}/QtMultimediaKit/QAudioInput
%{_includedir}/QtMultimediaKit/QAudioOutput
%{_includedir}/QtMultimediaKit/QAudioSystemPlugin
+%{_includedir}/QtMultimediaKit/QCamera
+%{_includedir}/QtMultimediaKit/QCameraControl
+%{_includedir}/QtMultimediaKit/QCameraExposure
+%{_includedir}/QtMultimediaKit/QCameraExposureControl
+%{_includedir}/QtMultimediaKit/QCameraFlashControl
+%{_includedir}/QtMultimediaKit/QCameraFocus
+%{_includedir}/QtMultimediaKit/QCameraFocusControl
+%{_includedir}/QtMultimediaKit/QCameraFocusZone
+%{_includedir}/QtMultimediaKit/QCameraImageCapture
+%{_includedir}/QtMultimediaKit/QCameraImageCaptureControl
+%{_includedir}/QtMultimediaKit/QCameraImageProcessing
+%{_includedir}/QtMultimediaKit/QCameraImageProcessingControl
+%{_includedir}/QtMultimediaKit/QCameraLocksControl
+%{_includedir}/QtMultimediaKit/QCameraViewfinder
%{_includedir}/QtMultimediaKit/QGraphicsVideoItem
%{_includedir}/QtMultimediaKit/QImageEncoderControl
%{_includedir}/QtMultimediaKit/QImageEncoderSettings
@@ -706,6 +1046,19 @@
%{_includedir}/QtMultimediaKit/qaudiooutput.h
%{_includedir}/QtMultimediaKit/qaudiosystem.h
%{_includedir}/QtMultimediaKit/qaudiosystemplugin.h
+%{_includedir}/QtMultimediaKit/qcamera.h
+%{_includedir}/QtMultimediaKit/qcameracontrol.h
+%{_includedir}/QtMultimediaKit/qcameraexposure.h
+%{_includedir}/QtMultimediaKit/qcameraexposurecontrol.h
+%{_includedir}/QtMultimediaKit/qcameraflashcontrol.h
+%{_includedir}/QtMultimediaKit/qcamerafocus.h
+%{_includedir}/QtMultimediaKit/qcamerafocuscontrol.h
+%{_includedir}/QtMultimediaKit/qcameraimagecapture.h
+%{_includedir}/QtMultimediaKit/qcameraimagecapturecontrol.h
+%{_includedir}/QtMultimediaKit/qcameraimageprocessing.h
+%{_includedir}/QtMultimediaKit/qcameraimageprocessingcontrol.h
+%{_includedir}/QtMultimediaKit/qcameralockscontrol.h
+%{_includedir}/QtMultimediaKit/qcameraviewfinder.h
%{_includedir}/QtMultimediaKit/qgraphicsvideoitem.h
%{_includedir}/QtMultimediaKit/qimageencodercontrol.h
%{_includedir}/QtMultimediaKit/qimagevideobuffer_p.h
@@ -748,6 +1101,135 @@
%{_includedir}/QtMultimediaKit/qvideowidget.h
%{_includedir}/QtMultimediaKit/qvideowidgetcontrol.h
%{_includedir}/QtMultimediaKit/qvideowindowcontrol.h
+%{_includedir}/QtOrganizer/QOrganizerCollection
+%{_includedir}/QtOrganizer/QOrganizerCollectionFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerCollectionId
+%{_includedir}/QtOrganizer/QOrganizerCollectionLocalIdFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerCollectionRemoveRequest
+%{_includedir}/QtOrganizer/QOrganizerCollectionSaveRequest
+%{_includedir}/QtOrganizer/QOrganizerEvent
+%{_includedir}/QtOrganizer/QOrganizerEventOccurrence
+%{_includedir}/QtOrganizer/QOrganizerEventTimeRange
+%{_includedir}/QtOrganizer/QOrganizerItem
+%{_includedir}/QtOrganizer/QOrganizerItemAbstractRequest
+%{_includedir}/QtOrganizer/QOrganizerItemAudibleReminder
+%{_includedir}/QtOrganizer/QOrganizerItemChangeLogFilter
+%{_includedir}/QtOrganizer/QOrganizerItemChangeSet
+%{_includedir}/QtOrganizer/QOrganizerItemCollectionFilter
+%{_includedir}/QtOrganizer/QOrganizerItemComment
+%{_includedir}/QtOrganizer/QOrganizerItemDateTimePeriodFilter
+%{_includedir}/QtOrganizer/QOrganizerItemDescription
+%{_includedir}/QtOrganizer/QOrganizerItemDetail
+%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinition
+%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionRemoveRequest
+%{_includedir}/QtOrganizer/QOrganizerItemDetailDefinitionSaveRequest
+%{_includedir}/QtOrganizer/QOrganizerItemDetailFieldDefinition
+%{_includedir}/QtOrganizer/QOrganizerItemDetailFilter
+%{_includedir}/QtOrganizer/QOrganizerItemDetailRangeFilter
+%{_includedir}/QtOrganizer/QOrganizerItemDisplayLabel
+%{_includedir}/QtOrganizer/QOrganizerItemEmailReminder
+%{_includedir}/QtOrganizer/QOrganizerItemFetchHint
+%{_includedir}/QtOrganizer/QOrganizerItemFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemFilter
+%{_includedir}/QtOrganizer/QOrganizerItemGuid
+%{_includedir}/QtOrganizer/QOrganizerItemId
+%{_includedir}/QtOrganizer/QOrganizerItemInstanceFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemInstanceOrigin
+%{_includedir}/QtOrganizer/QOrganizerItemIntersectionFilter
+%{_includedir}/QtOrganizer/QOrganizerItemInvalidFilter
+%{_includedir}/QtOrganizer/QOrganizerItemLocalIdFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemLocalIdFilter
+%{_includedir}/QtOrganizer/QOrganizerItemLocation
+%{_includedir}/QtOrganizer/QOrganizerItemManager
+%{_includedir}/QtOrganizer/QOrganizerItemManagerEngine
+%{_includedir}/QtOrganizer/QOrganizerItemManagerEngineFactory
+%{_includedir}/QtOrganizer/QOrganizerItemPriority
+%{_includedir}/QtOrganizer/QOrganizerItemRecurrence
+%{_includedir}/QtOrganizer/QOrganizerItemRecurrenceRule
+%{_includedir}/QtOrganizer/QOrganizerItemReminder
+%{_includedir}/QtOrganizer/QOrganizerItemRemoveRequest
+%{_includedir}/QtOrganizer/QOrganizerItemSaveRequest
+%{_includedir}/QtOrganizer/QOrganizerItemSortOrder
+%{_includedir}/QtOrganizer/QOrganizerItemTimestamp
+%{_includedir}/QtOrganizer/QOrganizerItemType
+%{_includedir}/QtOrganizer/QOrganizerItemUnionFilter
+%{_includedir}/QtOrganizer/QOrganizerItemVisualReminder
+%{_includedir}/QtOrganizer/QOrganizerJournal
+%{_includedir}/QtOrganizer/QOrganizerJournalTimeRange
+%{_includedir}/QtOrganizer/QOrganizerNote
+%{_includedir}/QtOrganizer/QOrganizerTodo
+%{_includedir}/QtOrganizer/QOrganizerTodoOccurrence
+%{_includedir}/QtOrganizer/QOrganizerTodoProgress
+%{_includedir}/QtOrganizer/QOrganizerTodoTimeRange
+%{_includedir}/QtOrganizer/qorganizercollection.h
+%{_includedir}/QtOrganizer/qorganizercollectionfetchrequest.h
+%{_includedir}/QtOrganizer/qorganizercollectionid.h
+%{_includedir}/QtOrganizer/qorganizercollectionlocalidfetchrequest.h
+%{_includedir}/QtOrganizer/qorganizercollectionremoverequest.h
+%{_includedir}/QtOrganizer/qorganizercollectionsaverequest.h
+%{_includedir}/QtOrganizer/qorganizerevent.h
+%{_includedir}/QtOrganizer/qorganizereventoccurrence.h
+%{_includedir}/QtOrganizer/qorganizereventtimerange.h
+%{_includedir}/QtOrganizer/qorganizeritem.h
+%{_includedir}/QtOrganizer/qorganizeritemabstractrequest.h
+%{_includedir}/QtOrganizer/qorganizeritemaudiblereminder.h
+%{_includedir}/QtOrganizer/qorganizeritemchangelogfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemchangeset.h
+%{_includedir}/QtOrganizer/qorganizeritemcollectionfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemcomment.h
+%{_includedir}/QtOrganizer/qorganizeritemdatetimeperiodfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemdescription.h
+%{_includedir}/QtOrganizer/qorganizeritemdetail.h
+%{_includedir}/QtOrganizer/qorganizeritemdetaildefinition.h
+%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionfetchrequest.h
+%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionremoverequest.h
+%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionsaverequest.h
+%{_includedir}/QtOrganizer/qorganizeritemdetailfielddefinition.h
+%{_includedir}/QtOrganizer/qorganizeritemdetailfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemdetailrangefilter.h
+%{_includedir}/QtOrganizer/qorganizeritemdetails.h
+%{_includedir}/QtOrganizer/qorganizeritemdisplaylabel.h
+%{_includedir}/QtOrganizer/qorganizeritememailreminder.h
+%{_includedir}/QtOrganizer/qorganizeritemfetchhint.h
+%{_includedir}/QtOrganizer/qorganizeritemfetchrequest.h
+%{_includedir}/QtOrganizer/qorganizeritemfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemfilters.h
+%{_includedir}/QtOrganizer/qorganizeritemguid.h
+%{_includedir}/QtOrganizer/qorganizeritemid.h
+%{_includedir}/QtOrganizer/qorganizeriteminstancefetchrequest.h
+%{_includedir}/QtOrganizer/qorganizeriteminstanceorigin.h
+%{_includedir}/QtOrganizer/qorganizeritemintersectionfilter.h
+%{_includedir}/QtOrganizer/qorganizeriteminvalidfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemlocalidfetchrequest.h
+%{_includedir}/QtOrganizer/qorganizeritemlocalidfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemlocation.h
+%{_includedir}/QtOrganizer/qorganizeritemmanager.h
+%{_includedir}/QtOrganizer/qorganizeritemmanagerengine.h
+%{_includedir}/QtOrganizer/qorganizeritemmanagerenginefactory.h
+%{_includedir}/QtOrganizer/qorganizeritempriority.h
+%{_includedir}/QtOrganizer/qorganizeritemrecurrence.h
+%{_includedir}/QtOrganizer/qorganizeritemrecurrencerule.h
+%{_includedir}/QtOrganizer/qorganizeritemreminder.h
+%{_includedir}/QtOrganizer/qorganizeritemremoverequest.h
+%{_includedir}/QtOrganizer/qorganizeritemrequests.h
+%{_includedir}/QtOrganizer/qorganizeritems.h
+%{_includedir}/QtOrganizer/qorganizeritemsaverequest.h
+%{_includedir}/QtOrganizer/qorganizeritemsortorder.h
+%{_includedir}/QtOrganizer/qorganizeritemtimestamp.h
+%{_includedir}/QtOrganizer/qorganizeritemtype.h
+%{_includedir}/QtOrganizer/qorganizeritemunionfilter.h
+%{_includedir}/QtOrganizer/qorganizeritemvisualreminder.h
+%{_includedir}/QtOrganizer/qorganizerjournal.h
+%{_includedir}/QtOrganizer/qorganizerjournaltimerange.h
+%{_includedir}/QtOrganizer/qorganizernote.h
+%{_includedir}/QtOrganizer/qorganizertodo.h
+%{_includedir}/QtOrganizer/qorganizertodooccurrence.h
+%{_includedir}/QtOrganizer/qorganizertodoprogress.h
+%{_includedir}/QtOrganizer/qorganizertodotimerange.h
+%{_includedir}/QtOrganizer/qtorganizer.h
+%{_includedir}/QtOrganizer/qtorganizerglobal.h
+%{_includedir}/QtPublishSubscribe/QValueSpace
%{_includedir}/QtPublishSubscribe/QValueSpacePublisher
%{_includedir}/QtPublishSubscribe/QValueSpaceSubscriber
%{_includedir}/QtPublishSubscribe/qvaluespace.h
@@ -798,12 +1280,17 @@
%{_includedir}/QtSensors/qtapsensor.h
%{_includedir}/QtSensors/qtimestamp
%{_includedir}/QtServiceFramework/QAbstractSecuritySession
+%{_includedir}/QtServiceFramework/QRemoteServiceClassRegister
+%{_includedir}/QtServiceFramework/QRemoteServiceControl
+%{_includedir}/QtServiceFramework/QService
%{_includedir}/QtServiceFramework/QServiceContext
%{_includedir}/QtServiceFramework/QServiceFilter
%{_includedir}/QtServiceFramework/QServiceInterfaceDescriptor
%{_includedir}/QtServiceFramework/QServiceManager
%{_includedir}/QtServiceFramework/QServicePluginInterface
%{_includedir}/QtServiceFramework/qabstractsecuritysession.h
+%{_includedir}/QtServiceFramework/qremoteserviceclassregister.h
+%{_includedir}/QtServiceFramework/qremoteservicecontrol.h
%{_includedir}/QtServiceFramework/qservice.h
%{_includedir}/QtServiceFramework/qservicecontext.h
%{_includedir}/QtServiceFramework/qservicefilter.h
@@ -816,11 +1303,21 @@
%{_includedir}/QtSystemInfo/QSystemNetworkInfo
%{_includedir}/QtSystemInfo/QSystemScreenSaver
%{_includedir}/QtSystemInfo/QSystemStorageInfo
+%{_includedir}/QtSystemInfo/qsystemdeviceinfo.h
+%{_includedir}/QtSystemInfo/qsystemdisplayinfo.h
+%{_includedir}/QtSystemInfo/qsystemgeneralinfo.h
%{_includedir}/QtSystemInfo/qsysteminfo.h
+%{_includedir}/QtSystemInfo/qsystemnetworkinfo.h
+%{_includedir}/QtSystemInfo/qsystemscreensaver.h
+%{_includedir}/QtSystemInfo/qsystemstorageinfo.h
%{_includedir}/QtVersit/QVersitContactExporter
%{_includedir}/QtVersit/QVersitContactExporterDetailHandler
+%{_includedir}/QtVersit/QVersitContactExporterDetailHandlerV2
+%{_includedir}/QtVersit/QVersitContactHandler
+%{_includedir}/QtVersit/QVersitContactHandlerFactory
%{_includedir}/QtVersit/QVersitContactImporter
%{_includedir}/QtVersit/QVersitContactImporterPropertyHandler
+%{_includedir}/QtVersit/QVersitContactImporterPropertyHandlerV2
%{_includedir}/QtVersit/QVersitDefaultResourceHandler
%{_includedir}/QtVersit/QVersitDocument
%{_includedir}/QtVersit/QVersitProperty
@@ -828,21 +1325,38 @@
%{_includedir}/QtVersit/QVersitResourceHandler
%{_includedir}/QtVersit/QVersitWriter
%{_includedir}/QtVersit/qversitcontactexporter.h
+%{_includedir}/QtVersit/qversitcontacthandler.h
%{_includedir}/QtVersit/qversitcontactimporter.h
%{_includedir}/QtVersit/qversitdocument.h
%{_includedir}/QtVersit/qversitproperty.h
%{_includedir}/QtVersit/qversitreader.h
%{_includedir}/QtVersit/qversitresourcehandler.h
%{_includedir}/QtVersit/qversitwriter.h
-%{_includedir}/qmobilityglobal.h
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerExporter
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerExporterDetailHandler
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerHandler
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerHandlerFactory
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerImporter
+%{_includedir}/QtVersitOrganizer/QVersitOrganizerImporterPropertyHandler
+%{_includedir}/QtVersitOrganizer/QVersitTimeZoneHandler
+%{_includedir}/QtVersitOrganizer/qversitorganizerexporter.h
+%{_includedir}/QtVersitOrganizer/qversitorganizerhandler.h
+%{_includedir}/QtVersitOrganizer/qversitorganizerimporter.h
+%{_includedir}/QtVersitOrganizer/qversittimezonehandler.h
%{_libdir}/libQtContacts.prl
%{_libdir}/libQtContacts.so
+%{_libdir}/libQtFeedback.prl
+%{_libdir}/libQtFeedback.so
+%{_libdir}/libQtGallery.prl
+%{_libdir}/libQtGallery.so
%{_libdir}/libQtLocation.prl
%{_libdir}/libQtLocation.so
%{_libdir}/libQtMessaging.prl
%{_libdir}/libQtMessaging.so
%{_libdir}/libQtMultimediaKit.prl
%{_libdir}/libQtMultimediaKit.so
+%{_libdir}/libQtOrganizer.prl
+%{_libdir}/libQtOrganizer.so
%{_libdir}/libQtPublishSubscribe.prl
%{_libdir}/libQtPublishSubscribe.so
%{_libdir}/libQtSensors.prl
@@ -853,8 +1367,11 @@
%{_libdir}/libQtSystemInfo.so
%{_libdir}/libQtVersit.prl
%{_libdir}/libQtVersit.so
+%{_libdir}/libQtVersitOrganizer.prl
+%{_libdir}/libQtVersitOrganizer.so
%{_libdir}/pkgconfig/QtContacts.pc
%{_libdir}/pkgconfig/QtVersit.pc
+%{_libdir}/pkgconfig/QtVersitOrganizer.pc
%{_datadir}/qt4/mkspecs/features/mobility.prf
%{_datadir}/qt4/mkspecs/features/mobilityconfig.prf
# << files devel
@@ -863,12 +1380,27 @@
%defattr(-,root,root,-)
# >> files libqtcontacts1
%{_libdir}/libQtContacts.so.*
+%{_libdir}/qt4/plugins/contacts/libqtcontacts_serviceactionmanager.so
# << files libqtcontacts1
+%files -n libqtfeedback1
+%defattr(-,root,root,-)
+# >> files libqtfeedback1
+%{_libdir}/libQtFeedback.so.*
+# << files libqtfeedback1
+
+%files -n libqtgallery1
+%defattr(-,root,root,-)
+# >> files libqtgallery1
+%{_libdir}/libQtGallery.so.*
+# << files libqtgallery1
+
%files -n libqtlocation1
%defattr(-,root,root,-)
# >> files libqtlocation1
%{_libdir}/libQtLocation.so.*
+%{_libdir}/qt4/plugins/geoservices/libqtgeoservices_nokia.so
+%{_libdir}/qt4/plugins/landmarks/libqtlandmarks_sqlite.so
# << files libqtlocation1
%files -n libqtmessaging1
@@ -886,6 +1418,13 @@
%{_libdir}/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
# << files libqtmultimediakit1
+%files -n libqtorganizer1
+%defattr(-,root,root,-)
+# >> files libqtorganizer1
+%{_libdir}/libQtOrganizer.so.*
+%{_libdir}/qt4/plugins/organizer/libqtorganizer_skeleton.so
+# << files libqtorganizer1
+
%files -n libqtpublishsubscribe1
%defattr(-,root,root,-)
# >> files libqtpublishsubscribe1
@@ -895,6 +1434,7 @@
%files -n libqtsensors1
%defattr(-,root,root,-)
# >> files libqtsensors1
+%config %{_sysconfdir}/xdg/Nokia/Sensors.conf
%{_libdir}/libQtSensors.so.*
%{_libdir}/qt4/plugins/sensors/libqtsensors_generic.so
%{_libdir}/qt4/plugins/sensors/libqtsensors_maemo6.so
@@ -916,8 +1456,15 @@
%defattr(-,root,root,-)
# >> files libqtversit1
%{_libdir}/libQtVersit.so.*
+%{_libdir}/qt4/plugins/versit/libqtversit_backuphandler.so
# << files libqtversit1
+%files -n libqtversitorganizer1
+%defattr(-,root,root,-)
+# >> files libqtversitorganizer1
+%{_libdir}/libQtVersitOrganizer.so.*
+# << files libqtversitorganizer1
+
%files -n libdeclarative-contacts
%defattr(-,root,root,-)
# >> files libdeclarative-contacts
@@ -925,6 +1472,27 @@
%{_libdir}/qt4/imports/QtMobility/contacts/qmldir
# << files libdeclarative-contacts
+%files -n libdeclarative-gallery
+%defattr(-,root,root,-)
+# >> files libdeclarative-gallery
+%{_libdir}/qt4/imports/QtMobility/gallery/libdeclarative_gallery.so
+%{_libdir}/qt4/imports/QtMobility/gallery/qmldir
+# << files libdeclarative-gallery
+
+%files -n libdeclarative-location
+%defattr(-,root,root,-)
+# >> files libdeclarative-location
+%{_libdir}/qt4/imports/QtMobility/location/libdeclarative_location.so
+%{_libdir}/qt4/imports/QtMobility/location/qmldir
+# << files libdeclarative-location
+
+%files -n libdeclarative-messaging
+%defattr(-,root,root,-)
+# >> files libdeclarative-messaging
+%{_libdir}/qt4/imports/QtMobility/messaging/libdeclarative_messaging.so
+%{_libdir}/qt4/imports/QtMobility/messaging/qmldir
+# << files libdeclarative-messaging
+
%files -n libdeclarative-multimedia
%defattr(-,root,root,-)
# >> files libdeclarative-multimedia
@@ -953,6 +1521,13 @@
%{_libdir}/qt4/imports/QtMobility/serviceframework/qmldir
# << files libdeclarative-serviceframework
+%files -n libdeclarative-systeminfo
+%defattr(-,root,root,-)
+# >> files libdeclarative-systeminfo
+%{_libdir}/qt4/imports/QtMobility/systeminfo/libdeclarative_systeminfo.so
+%{_libdir}/qt4/imports/QtMobility/systeminfo/qmldir
+# << files libdeclarative-systeminfo
+
%files -n servicefw
%defattr(-,root,root,-)
# >> files servicefw
@@ -962,50 +1537,104 @@
%files examples
%defattr(-,root,root,-)
# >> files examples
-%{_bindir}/accel
-%{_bindir}/arrowkeys
-%{_bindir}/audiodevices
-%{_bindir}/audioinput
-%{_bindir}/audiooutput
-%{_bindir}/audiorecorder
-%{_bindir}/battery-publisher
-%{_bindir}/cubehouse
-%{_bindir}/grueapp
-%{_bindir}/keepintouch
-%{_bindir}/logfilepositionsource
-%{_bindir}/metadata
-%{_bindir}/orientation
-%{_bindir}/player
-%{_bindir}/publish-subscribe
-%{_bindir}/qsysinfo
-%{_bindir}/querymessages
-%{_bindir}/radio
-%{_bindir}/reading_perf
-%{_bindir}/samplephonebook
-%{_bindir}/satellitedialog
-%{_bindir}/sensor_explorer
-%{_bindir}/serviceactions
-%{_bindir}/servicebrowser
-%{_bindir}/sfw-notes
-%{_bindir}/show_acceleration
-%{_bindir}/show_als
-%{_bindir}/show_compass
-%{_bindir}/show_magneticflux
-%{_bindir}/show_orientation
-%{_bindir}/show_proximity
-%{_bindir}/show_rotation
-%{_bindir}/show_tap
-%{_bindir}/slideshow
-%{_bindir}/smallsensors
-%{_bindir}/videographicsitem
-%{_bindir}/videowidget
-%{_bindir}/writemessage
%{_libdir}/qt4/plugins/sensors/libqtsensors_grueplugin.so
%{_libdir}/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
%{_libdir}/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
%{_libdir}/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
%{_libdir}/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
%{_libdir}/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
+%{_libdir}/qtmobility/demos/player
+%{_libdir}/qtmobility/demos/qmlcontacts/contacts.qml
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/MediaButton.qml
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/ScrollBar.qml
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/default.svg
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/example.vcf
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/pics/button-pressed.png
+%{_libdir}/qtmobility/demos/qmlcontacts/contents/pics/button.png
+%{_libdir}/qtmobility/demos/qmlcontacts/qmlcontacts.qmlproject
+%{_libdir}/qtmobility/demos/serviceactions
+%{_libdir}/qtmobility/demos/smallsensors
+%{_libdir}/qtmobility/examples/GeoServiceDemo
+%{_libdir}/qtmobility/examples/MapViewer
+%{_libdir}/qtmobility/examples/accel
+%{_libdir}/qtmobility/examples/arrowkeys
+%{_libdir}/qtmobility/examples/audiodevices
+%{_libdir}/qtmobility/examples/audioinput
+%{_libdir}/qtmobility/examples/audiooutput
+%{_libdir}/qtmobility/examples/audiorecorder
+%{_libdir}/qtmobility/examples/battery-publisher
+%{_libdir}/qtmobility/examples/battery-subscriber/battery-subscriber.qml
+%{_libdir}/qtmobility/examples/battery-subscriber/content/bubble.png
+%{_libdir}/qtmobility/examples/calendardemo
+%{_libdir}/qtmobility/examples/camera
+%{_libdir}/qtmobility/examples/cubehouse
+%{_libdir}/qtmobility/examples/declarative-music-browser
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/README
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialButton.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialScreen.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialerList.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/call.png
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/hangup.png
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/qmldir
+%{_libdir}/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/README
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/Button.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/Dialog.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/InputDialog.qml
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/addIcon.png
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/deleteIcon.png
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/nextIcon.png
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/prevIcon.png
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/searchIcon.png
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/qmldir
+%{_libdir}/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml
+%{_libdir}/qtmobility/examples/documentproperties
+%{_libdir}/qtmobility/examples/grueapp
+%{_libdir}/qtmobility/examples/hapticsplayer
+%{_libdir}/qtmobility/examples/hapticsquare
+%{_libdir}/qtmobility/examples/keepintouch
+%{_libdir}/qtmobility/examples/landmarkbrowser
+%{_libdir}/qtmobility/examples/logfilepositionsource
+%{_libdir}/qtmobility/examples/mediabrowser
+%{_libdir}/qtmobility/examples/metadata
+%{_libdir}/qtmobility/examples/metadata2
+%{_libdir}/qtmobility/examples/moreplaces.lmx
+%{_libdir}/qtmobility/examples/orientation
+%{_libdir}/qtmobility/examples/places.gpx
+%{_libdir}/qtmobility/examples/publish-subscribe
+%{_libdir}/qtmobility/examples/qml_landmarkmap
+%{_libdir}/qtmobility/examples/qml_location_flickr
+%{_libdir}/qtmobility/examples/qml_mapviewer
+%{_libdir}/qtmobility/examples/qsysinfo
+%{_libdir}/qtmobility/examples/querymessages
+%{_libdir}/qtmobility/examples/radio
+%{_libdir}/qtmobility/examples/reading_perf
+%{_libdir}/qtmobility/examples/samplephonebook
+%{_libdir}/qtmobility/examples/satellitedialog
+%{_libdir}/qtmobility/examples/sensor_explorer
+%{_libdir}/qtmobility/examples/servicebrowser
+%{_libdir}/qtmobility/examples/sfw-notes
+%{_libdir}/qtmobility/examples/sfwecho_client
+%{_libdir}/qtmobility/examples/sfwecho_service
+%{_libdir}/qtmobility/examples/show_acceleration
+%{_libdir}/qtmobility/examples/show_als
+%{_libdir}/qtmobility/examples/show_compass
+%{_libdir}/qtmobility/examples/show_magneticflux
+%{_libdir}/qtmobility/examples/show_orientation
+%{_libdir}/qtmobility/examples/show_proximity
+%{_libdir}/qtmobility/examples/show_rotation
+%{_libdir}/qtmobility/examples/show_tap
+%{_libdir}/qtmobility/examples/simplelog.txt
+%{_libdir}/qtmobility/examples/slideshow
+%{_libdir}/qtmobility/examples/videographicsitem
+%{_libdir}/qtmobility/examples/videowidget
+%{_libdir}/qtmobility/examples/writemessage
+%{_libdir}/qtmobility/examples/xmldata/bluetoothtransferservice.xml
+%{_libdir}/qtmobility/examples/xmldata/filemanagerservice.xml
+%{_libdir}/qtmobility/examples/xmldata/landlinedialerservice.xml
+%{_libdir}/qtmobility/examples/xmldata/notesmanagerservice.xml
+%{_libdir}/qtmobility/examples/xmldata/sfwechoservice.xml
+%{_libdir}/qtmobility/examples/xmldata/voipdialerservice.xml
# << files examples
%files l10n
other changes:
--------------
++++++ GL_CLAMP_TO_EDGE_of_video_texture.patch (new)
--- GL_CLAMP_TO_EDGE_of_video_texture.patch
+++ GL_CLAMP_TO_EDGE_of_video_texture.patch
+Description: improve video playback performance
+Author: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+--- a/src/multimedia/qpaintervideosurface.cpp
++++ b/src/multimedia/qpaintervideosurface.cpp
+@@ -362,8 +362,8 @@ QAbstractVideoSurface::Error QVideoSurfa
+ m_frame.bits() + m_textureOffsets[i]);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
++ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ }
+ m_frame.unmap();
+ } else if (m_handleType != QAbstractVideoBuffer::QPixmapHandle && m_frame.isValid()) {
++++++ add_location_api_meego_implementation_using_geoclue.patch (new)
--- add_location_api_meego_implementation_using_geoclue.patch
+++ add_location_api_meego_implementation_using_geoclue.patch
+Description: Add Location API Meego implementation using Geoclue
+Author: John Chen <zhang.z.chen at intel.com>
+Date: Mon, 4 Oct 2010
+--- a/common.pri
++++ b/common.pri
+@@ -142,6 +142,9 @@ maemo6 {
+ maemo5 {
+ DEFINES+= Q_WS_MAEMO_5
+ }
++meego {
++ DEFINES+= Q_WS_MEEGO
++}
+
+ wince* {
+ ### Bearer Management
+--- a/src/location/location.pro
++++ b/src/location/location.pro
+@@ -75,6 +75,15 @@ wince* {
+ qgeoinfothread_wince.cpp
+ LIBS += -lgpsapi
+ }
++meego {
++ CONFIG += qdbus link_pkgconfig
++ PKGCONFIG += geoclue gypsy gconf-2.0
++ SOURCES += qgeopositioninfosource_meego.cpp \
++ qgeosatelliteinfosource_meego.cpp \
++
++ HEADERS += qgeopositioninfosource_meego_p.h \
++ qgeosatelliteinfosource_meego_p.h
++}
+
+ maemo6 {
+ CONFIG += qdbus link_pkgconfig
+--- a/src/location/qgeopositioninfosource.cpp
++++ b/src/location/qgeopositioninfosource.cpp
+@@ -56,6 +56,8 @@
+ # include "qgeopositioninfosource_maemo_p.h"
+ #elif defined(Q_WS_MAEMO_5)
+ # include "qgeopositioninfosource_maemo5_p.h"
++#elif defined(Q_WS_MEEGO)
++# include "qgeopositioninfosource_meego_p.h"
+ #endif
+
+ QTM_BEGIN_NAMESPACE
+@@ -227,9 +229,17 @@ QGeoPositionInfoSource *QGeoPositionInfo
+ delete source;
+ return 0;
+ }
+-
++ return source;
++#elif (defined(Q_WS_MEEGO))
++ QGeoPositionInfoSourceMeego *source = new QGeoPositionInfoSourceMeego(parent);
++ int status = source->init();
++ if (status == -1) {
++ delete source;
++ return 0;
++ }
+ return source;
+ #else
++ qWarning("QGeoPositionInfoSource: no default source available for the platform.");
+ Q_UNUSED(parent);
+ return 0;
+ #endif
+--- /dev/null
++++ b/src/location/qgeopositioninfosource_meego.cpp
+@@ -0,0 +1,157 @@
++#include <QtCore>
++
++#ifdef Q_LOCATION_GEOCLUE_DEBUG
++#include <QDebug>
++#endif
++
++#include "qgeopositioninfosource_meego_p.h"
++
++QTM_BEGIN_NAMESPACE
++
++// Callback for position-changed -signal
++static void position_changed (GeocluePosition *position,
++ GeocluePositionFields fields,
++ int timestamp,
++ double latitude,
++ double longitude,
++ double altitude,
++ GeoclueAccuracy *accuracy,
++ gpointer userdata) // Ptr to this
++{
++#ifdef Q_LOCATION_GEOCLUE_DEBUG
++ qDebug() << "Position update from GeoClue, lat, lon, alt, time: " << latitude << longitude << altitude << time;
++#endif
++ ((QGeoPositionInfoSourceMeego*)userdata)->positionChanged(
++ position, fields, timestamp, latitude, longitude, altitude, accuracy);
++}
++
++void QGeoPositionInfoSourceMeego::positionChanged(GeocluePosition *position,
++ GeocluePositionFields fields,
++ int timestamp,
++ double latitude,
++ double longitude,
++ double altitude,
++ GeoclueAccuracy *accuracy)
++{
++ QGeoCoordinate coordinate(latitude, longitude);
++ QDateTime dateTime = QDateTime();
++ dateTime.setTime_t(timestamp);
++ QGeoPositionInfo info(coordinate, dateTime);
++ if (info.isValid()) {
++ lastPosition = info;
++ emit positionUpdated(info);
++ }
++}
++
++QGeoPositionInfoSourceMeego::QGeoPositionInfoSourceMeego(QObject *parent)
++ : QGeoPositionInfoSource(parent), client(0), pos(0)
++{
++}
++
++int QGeoPositionInfoSourceMeego::init()
++{
++ GeoclueMaster *master;
++ GError *error = NULL;
++
++ g_type_init ();
++
++ master = geoclue_master_get_default ();
++ client = geoclue_master_create_client (master, NULL, &error);
++ g_object_unref (master);
++
++ if (!client) {
++ qCritical ("QGeoPositionInfoSourceMeego error creating GeoclueMasterClient: %s\n", error->message);
++ g_error_free (error);
++ return -1;
++ }
++
++ if (!geoclue_master_client_set_requirements (client,
++ GEOCLUE_ACCURACY_LEVEL_NONE,
++ 0, TRUE,
++ GEOCLUE_RESOURCE_ALL,
++ &error)){
++ qCritical ("QGeoPositionInfoSourceMeego geoclue set_requirements failed: %s", error->message);
++ g_error_free (error);
++ g_object_unref (client);
++ return -1;
++
++ }
++
++ pos = geoclue_master_client_create_position (client, NULL);
++ if (!pos) {
++ qCritical("QGeoPositionInfoSourceMeego failed to get a position object");
++ g_object_unref (client);
++ return -1;
++ }
++
++ return 0;
++}
++
++QGeoPositionInfo QGeoPositionInfoSourceMeego::lastKnownPosition
++(bool /*fromSatellitePositioningMethodsOnly*/) const
++{
++ return lastPosition;
++}
++
++QGeoPositionInfoSourceMeego::PositioningMethods QGeoPositionInfoSourceMeego::supportedPositioningMethods() const
++{
++ return AllPositioningMethods;
++}
++
++void QGeoPositionInfoSourceMeego::startUpdates()
++{
++ g_signal_connect (G_OBJECT (pos), "position-changed",
++ G_CALLBACK (position_changed),this);
++
++}
++int QGeoPositionInfoSourceMeego::minimumUpdateInterval() const{
++ return 0;
++}
++void QGeoPositionInfoSourceMeego::stopUpdates()
++{
++ g_signal_handlers_disconnect_by_func(G_OBJECT(pos), (void*)position_changed,
++ NULL);
++}
++
++void QGeoPositionInfoSourceMeego::requestUpdate(int /*timeout*/)
++{
++ GeocluePositionFields fields;
++ int timestamp;
++ double latitude;
++ double longitude;
++ double altitude;
++ GeoclueAccuracy *accuracy;
++ GError *error = NULL;
++ fields = geoclue_position_get_position (pos, ×tamp,
++ &latitude, &longitude, &altitude,
++ &accuracy, &error);
++ if (error) {
++ qCritical ("QGeoPositionInfoSourceMeego Error in geoclue_position_get_position: %s.\n",
++ error->message);
++ g_error_free (error);
++ error = NULL;
(272 more lines skipped)
++++++ add_meego_build_flag.patch (new)
--- add_meego_build_flag.patch
+++ add_meego_build_flag.patch
+--- a/common.pri
++++ b/common.pri
+@@ -128,6 +128,11 @@ contains(build_unit_tests, yes) {
+
+ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
+
++meego {
++ contains(TEMPLATE,.*app.*): QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
++ QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
++ QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
++}
+ maemo6 {
+ DEFINES+= Q_WS_MAEMO_6
+ contains(TEMPLATE,.*app.*): QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
+--- a/configure
++++ b/configure
+@@ -155,6 +155,7 @@ usage()
+ echo " Modules should be separated by a space and surrounded"
+ echo " by double quotation. If a selected module depends on other modules"
+ echo " those modules (and their dependencies) will automatically be enabled."
++ echo "-meego ............ Build Qt Mobility for MeeGo."
+ echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
+ echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Fremantle)."
+ echo "-sdk <sdk> ........ Build using Apple provided SDK <path/to/sdk>."
+@@ -231,6 +232,9 @@ while [ "$#" -gt 0 ]; do
+ -silent)
+ BUILD_SILENT=yes
+ ;;
++ -meego)
++ LINUX_TARGET=meego
++ ;;
+ -maemo5)
+ LINUX_TARGET=maemo5
+ ;;
+@@ -347,6 +351,8 @@ if [ -n "$LINUX_TARGET" ]; then
+ echo "CONFIG+=maemo5" >> "$CONFIG_IN"
+ elif [ "$LINUX_TARGET" = "maemo6" ]; then
+ echo "CONFIG+=maemo6" >> "$CONFIG_IN"
++ elif [ "$LINUX_TARGET" = "meego" ]; then
++ echo "CONFIG+=meego" >> "$CONFIG_IN"
+ fi
+ fi
+
++++++ default_subtitle_loading.patch
--- default_subtitle_loading.patch
+++ default_subtitle_loading.patch
@@ -5,45 +5,43 @@
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
-@@ -310,6 +310,35 @@ void QGstreamerPlayerControl::setMedia(c
+@@ -304,6 +304,33 @@ void QGstreamerPlayerControl::setMedia(c
}
- if (!url.isEmpty()) {
-+ QString subtitle_file = ".srt";
-+ QFileInfo fi(url.toLocalFile ());
-+ subtitle_file.prepend(fi.baseName());
-+ subtitle_file.prepend("/");
-+ subtitle_file.prepend(fi.absolutePath());
-+ QFile file(subtitle_file);
-+ if (file.exists()) {
-+ subtitle_file.prepend("file://");
-+ m_session->set_sub_encoding("UTF");
-+ m_session->set_sub_font_desc("san bold 20");
-+ m_session->load_subtitle(QUrl(subtitle_file));
-+ }
-+ else {
-+ QString subtitle_file = ".smi";
-+ QFileInfo fi(url.toLocalFile ());
-+ subtitle_file.prepend(fi.baseName());
-+ subtitle_file.prepend("/");
-+ subtitle_file.prepend(fi.absolutePath());
-+ QFile file(subtitle_file);
-+ if (file.exists()) {
-+ subtitle_file.prepend("file://");
-+ m_session->set_sub_encoding("UTF");
-+ m_session->set_sub_font_desc("san bold 20");
-+ m_session->load_subtitle(QUrl(subtitle_file));
-+ }
-+ }
-+
-+
-+
+ if (!request.url().isEmpty()) {
++ QString subtitle_file = ".srt";
++ QFileInfo fi(url.toLocalFile ());
++ subtitle_file.prepend(fi.baseName());
++ subtitle_file.prepend("/");
++ subtitle_file.prepend(fi.absolutePath());
++ QFile file(subtitle_file);
++ if (file.exists()) {
++ subtitle_file.prepend("file://");
++ m_session->set_sub_encoding("UTF");
++ m_session->set_sub_font_desc("san bold 20");
++ m_session->load_subtitle(QUrl(subtitle_file));
++ }
++ else {
++ QString subtitle_file = ".smi";
++ QFileInfo fi(url.toLocalFile ());
++ subtitle_file.prepend(fi.baseName());
++ subtitle_file.prepend("/");
++ subtitle_file.prepend(fi.absolutePath());
++ QFile file(subtitle_file);
++ if (file.exists()) {
++ subtitle_file.prepend("file://");
++ m_session->set_sub_encoding("UTF");
++ m_session->set_sub_font_desc("san bold 20");
++ m_session->load_subtitle(QUrl(subtitle_file));
++ }
++ }
++
if (m_mediaStatus != QMediaPlayer::LoadingMedia)
emit mediaStatusChanged(m_mediaStatus = QMediaPlayer::LoadingMedia);
m_session->pause();
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
-@@ -155,6 +155,26 @@ void QGstreamerPlayerSession::load(const
+@@ -205,6 +205,26 @@ void QGstreamerPlayerSession::load(const
}
}
@@ -72,12 +70,12 @@
return m_duration;
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
-@@ -108,7 +108,10 @@ public:
+@@ -104,7 +104,10 @@ public:
public slots:
- void load(const QUrl &url);
+ void load(const QNetworkRequest &url);
-
-+ void load_subtitle(const QUrl &url);
++ void load_subtitle(const QUrl &url);
+ void set_sub_encoding(const QString &encoding_String);
+ void set_sub_font_desc(const QString &font_desc_String);
+
++++++ enable_pkgconfig_support.patch (new)
--- enable_pkgconfig_support.patch
+++ enable_pkgconfig_support.patch
+Description: Enable pkconfig support and fix install path
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+--- a/src/contacts/contacts.pro
++++ b/src/contacts/contacts.pro
+@@ -90,9 +90,16 @@ maemo6 {
+ isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=tracker
+ }
+
+-maemo5|maemo6 {
++CONFIG += app
++include(../../features/deploy.pri)
++
++maemo5|maemo6|meego {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Contacts API
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$headers.path
++ QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
+ pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
+ pkgconfig.files = QtContacts.pc
+
+@@ -129,6 +136,3 @@ simulator {
+ }
+
+ !isEmpty(CONTACTS_DEFAULT_ENGINE): DEFINES += Q_CONTACTS_DEFAULT_ENGINE=$$CONTACTS_DEFAULT_ENGINE
+-
+-CONFIG += app
+-include(../../features/deploy.pri)
+--- a/src/versit/versit.pro
++++ b/src/versit/versit.pro
+@@ -80,14 +80,18 @@ symbian {
+ DEPLOYMENT += VERSIT_DEPLOYMENT
+ }
+
+-maemo5|maemo6 {
++CONFIG += app
++include(../../features/deploy.pri)
++
++maemo5|maemo6|meego {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Versit API
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$headers.path
++ QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
+ pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
+ pkgconfig.files = QtVersit.pc
+
+ INSTALLS += pkgconfig
+ }
+-
+-CONFIG += app
+-include(../../features/deploy.pri)
+--- a/src/versitorganizer/versitorganizer.pro
++++ b/src/versitorganizer/versitorganizer.pro
+@@ -59,14 +59,18 @@ symbian {
+ DEPLOYMENT += VERSIT_ORGANIZER_DEPLOYMENT
+ }
+
+-maemo5|maemo6 {
++CONFIG += app
++include(../../features/deploy.pri)
++
++maemo5|maemo6|meego {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Versit API for Organizer
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$headers.path
++ QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
+ pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
+ pkgconfig.files = QtVersitOrganizer.pc
+
+ INSTALLS += pkgconfig
+ }
+-
+-CONFIG += app
+-include(../../features/deploy.pri)
++++++ enable_sensorfw_support.patch (new)
--- enable_sensorfw_support.patch
+++ enable_sensorfw_support.patch
+Description: Enable support for sensorfw
+Author: Kalle Lampila <kalle.lampila at cybercom.com>
+--- a/configure
++++ b/configure
+@@ -560,7 +560,7 @@ compileTest "Maemo5 contacts dependencie
+ compileTest "Maemo5 organizer dependencies" maemo5-calendar
+ compileTest "Bluez" bluez
+ compileTest "Gstreamer Photography" gstreamer-photography
+-if [ "$LINUX_TARGET" = maemo6 ]; then
++if [ "$LINUX_TARGET" = maemo6 ] || [ "$LINUX_TARGET" = meego ]; then
+ compileTest sensord sensord
+ else
+ echo "sensord_enabled = no" >> "$CONFIG_IN"
+--- a/plugins/sensors/sensors.pro
++++ b/plugins/sensors/sensors.pro
+@@ -6,7 +6,7 @@ maemo5 {
+ SUBDIRS += n900
+ }
+
+-maemo6 {
++maemo6|meego {
+ equals(sensord_enabled,yes) {
+ SUBDIRS += maemo6
+ } else {
++++++ enable_tracker_contacts_engine.patch (new)
--- enable_tracker_contacts_engine.patch
+++ enable_tracker_contacts_engine.patch
+--- a/src/contacts/contacts.pro
++++ b/src/contacts/contacts.pro
+@@ -86,7 +86,7 @@ maemo5 {
+ isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=maemo5
+ }
+
+-maemo6 {
++maemo6|meego {
+ isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=tracker
+ }
+
++++++ fix_translations_install_path.patch (new)
--- fix_translations_install_path.patch
+++ fix_translations_install_path.patch
+Description: install translations in /usr/share/qtmobility/translations/
+ instead of /usr/translations/
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -42,7 +42,7 @@ isEmpty(vcproj) {
+ QMAKE_EXTRA_COMPILERS += phony_src
+ }
+
+-translations.path = $${QT_MOBILITY_PREFIX}/translations
++translations.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
+ translations.files = $$TRANSLATIONS
+ translations.files ~= s,\\.ts$,.qm,g
+ translations.files ~= s,^,$$OUT_PWD/,g
++++++ ftbfs_multimedia_examples.patch (new)
--- ftbfs_multimedia_examples.patch
+++ ftbfs_multimedia_examples.patch
+Description: Fix multimediakit examples link failure (undefined reference to pulseaudio functions)
+
+QT_CFLAGS_PULSEAUDIO and QT_LIBS_PULSEAUDIO are defined by Qt's configure.
+Qt Mobility's confgure should defined them.
+As a workaround, define a 'standard' value.
+
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/src/multimedia/effects/effects.pri
++++ b/src/multimedia/effects/effects.pri
+@@ -5,8 +5,8 @@ unix:!mac:!symbian {
+ DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+ PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
+ SOURCES += effects/qsoundeffect_pulse_p.cpp
+- QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
+- LIBS += $$QT_LIBS_PULSEAUDIO
++ QMAKE_CXXFLAGS += -D_REENTRANT
++ LIBS += -lpulse
+ } else {
+ DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+ PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
++++++ no_rpath.patch (new)
--- no_rpath.patch
+++ no_rpath.patch
+--- a/common.pri
++++ b/common.pri
+@@ -114,7 +114,6 @@ contains(build_unit_tests, yes) {
+ MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
+ RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
+ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
+- QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
+ } else {
+ # Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
+ QT *= testlib
+@@ -125,7 +124,6 @@ contains(build_unit_tests, yes) {
+ MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
+ RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
+ UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
+- QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+ }
+
+ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
+--- a/examples/audiodevices/audiodevices.pro
++++ b/examples/audiodevices/audiodevices.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audiodevices.h
+
+ SOURCES = audiodevices.cpp \
+--- a/examples/audioinput/audioinput.pro
++++ b/examples/audioinput/audioinput.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audioinput.h
+
+ SOURCES = audioinput.cpp \
+--- a/examples/audiooutput/audiooutput.pro
++++ b/examples/audiooutput/audiooutput.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audiooutput.h
+
+ SOURCES = audiooutput.cpp \
+--- a/examples/audiorecorder/audiorecorder.pro
++++ b/examples/audiorecorder/audiorecorder.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ audiorecorder.h
+
+--- a/examples/radio/radio.pro
++++ b/examples/radio/radio.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ radio.h
+
+--- a/examples/videographicsitem/videographicsitem.pro
++++ b/examples/videographicsitem/videographicsitem.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ contains(QT_CONFIG, opengl): QT += opengl
+
+ HEADERS += videoplayer.h \
+--- a/examples/videowidget/videowidget.pro
++++ b/examples/videowidget/videowidget.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ videoplayer.h \
+ videowidget.h \
+--- a/features/basic_examples_setup.pri
++++ b/features/basic_examples_setup.pri
+@@ -24,7 +24,6 @@ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART
+ OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
+ mac:LIBS+= -F$$OUTPUT_DIR/lib
+ LIBS+= -L$$OUTPUT_DIR/lib
+-QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
+ INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
+
+ maemo6 {
+--- a/features/mobility.prf.template
++++ b/features/mobility.prf.template
+@@ -12,7 +12,6 @@
+ mac: LIBS += -F$${MOBILITY_LIB}
+
+ LIBS+= -L$${MOBILITY_LIB}
+-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
+
+ # versit depends on contacts
+ contains(MOBILITY, versit) {
++++++ qmf_2010w36_support.patch (new)
--- qmf_2010w36_support.patch
+++ qmf_2010w36_support.patch
+Description: fix build with QMF >= 2010w36
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+--- a/plugins/declarative/messaging/messaging.pro
++++ b/plugins/declarative/messaging/messaging.pro
+@@ -35,9 +35,9 @@ INSTALLS += qmldir
+ simulator|contains(qmf_enabled, yes) {
+ mac {
+ QMAKE_LFLAGS += -F$$(QMF_LIBDIR)
+- LIBS += -framework qtopiamail
++ LIBS += -framework qmfclient
+ } else {
+- LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qtopiamail)
++ LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qmfclient)
+ }
+ }
+
++++++ qt-mobility-opensource-src-1.1.0-beta2.tar.gz (new)
++++++ qt-mobility.yaml
--- qt-mobility.yaml
+++ qt-mobility.yaml
@@ -1,44 +1,46 @@
Name: qt-mobility
Summary: APIs for mobile device functionality
-Version: 1.0.2
+Version: 1.1.0~beta2
Release: 1
Group: System/Libraries
License: LGPLv2.1 with exception or GPLv3
URL: http://qt.gitorious.org/qt-mobility
Sources:
- - http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-%{version}.tar.gz
+ - http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-1.1.0-beta2.tar.gz
Patches:
- - 02_no_rpath.patch
- - 04_ftbfs_multimedia_examples.patch
- - 05_fix_translations_install_path.patch
- - qt-enable-playbin2.patch
- - qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
- - default_subtitle_loading.patch
- - add-meego-build-flag.patch
- - 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
- - 01_qtcontacts_api_1.1.0_tp1.patch.bz2
- - 02_qtcontacts_api_1.1.0~git20100825.patch.bz2
- - 03_ftbfs_synthesizedDisplayLabel.patch
- - 06_enable_sensorfw_support.patch
- - 07_add_location_api_meego_implementation_using_geoclue.patch
+ - no_rpath.patch
+ - ftbfs_multimedia_examples.patch
+ - fix_translations_install_path.patch
+ - GL_CLAMP_TO_EDGE_of_video_texture.patch
+# - default_subtitle_loading.patch
+ - add_meego_build_flag.patch
+ - enable_pkgconfig_support.patch
+ - enable_tracker_contacts_engine.patch
+ - enable_sensorfw_support.patch
+ - add_location_api_meego_implementation_using_geoclue.patch
+ - use_isabspath.patch
+ - qmf_2010w36_support.patch
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality. These
APIs allow the developer to use these features with ease from one framework and
apply them to phones, netbooks and non-mobile personal computers.
Requires:
- libqtcontacts1 = %{version}
+ - libqtfeedback1 = %{version}
+ - libqtgallery1 = %{version}
- libqtlocation1 = %{version}
- libqtmessaging1 = %{version}
- libqtmultimediakit1 = %{version}
+ - libqtorganizer1 = %{version}
- libqtpublishsubscribe1 = %{version}
- libqtsensors1 = %{version}
- libqtserviceframework1 = %{version}
- libqtsysteminfo1 = %{version}
- libqtversit1 = %{version}
+ - libqtversitorganizer1 = %{version}
PkgConfigBR:
- QtGui
- QtOpenGL
- - QtWebKit
- alsa
- bluez
- contextsubscriber-1.0
@@ -47,13 +49,16 @@
- gstreamer-plugins-base-0.10
- gypsy
- libpulse
- - qtopiamail
- qttracker
+ - qmfclient
+ - sensord
- x11
- xext
+ - xrandr
+ - xrender
- xv
PkgBR:
- - sensorfw-devel
+ - qt-devel-tools
Configure: none
Builder: none
RunFdupes: "%{_includedir}"
@@ -79,6 +84,26 @@
This package contains an API enabling clients to request contact data from
local or remote backends.
+ - Name: libqtfeedback1
+ AsWholeName: yes
+ Summary: Qt Mobility Feedback module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Feedback API. It enables a client to control
+ the vibration of the device or the piezo feedback from the screen.
+
+ - Name: libqtgallery1
+ AsWholeName: yes
+ Summary: Qt Mobility Document Gallery module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains an API for accessing collections of documents and media
+ and their meta-data.
+
- Name: libqtlocation1
AsWholeName: yes
Summary: Qt Mobility Location module
@@ -109,6 +134,18 @@
This package contains a set of APIs to play and record media, and manage a
collection of media content.
+ - Name: libqtorganizer1
+ AsWholeName: yes
+ Summary: Qt Mobility Organizer module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains an API for management of calendar, scheduling and
+ personal data from local or remote backends. It includes the ability to create,
+ edit, list, delete and lookup organizer information whether it is stored
+ locally or remotely.
+
- Name: libqtpublishsubscribe1
AsWholeName: yes
Summary: Qt Mobility Publish and Subscribe module
@@ -154,12 +191,23 @@
- Name: libqtversit1
AsWholeName: yes
- Summary: Qt Mobility Versit module
+ Summary: Qt Mobility Versit (vCard) module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains an API to manage Versit documents, such as vCards.
+
+ - Name: libqtversitorganizer1
+ AsWholeName: yes
+ Summary: Qt Mobility Versit (Organizer) module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
- This package contains an API to manage Versit documents.
+ This package contains an API to manage Versit documents, such as iCalendar
+ documents. It interfaces the Organizer API and uses the same framework as for
+ vCards.
- Name: libdeclarative-contacts
AsWholeName: yes
@@ -170,6 +218,33 @@
This package contains the Contacts QML plugin for QtDeclarative.
+ - Name: libdeclarative-gallery
+ AsWholeName: yes
+ Summary: Qt Mobility Document Gallery QML plugin
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Document Gallery QML plugin for QtDeclarative.
+
+ - Name: libdeclarative-location
+ AsWholeName: yes
+ Summary: Qt Mobility Location QML plugin
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Location QML plugin for QtDeclarative.
+
+ - Name: libdeclarative-messaging
+ AsWholeName: yes
+ Summary: Qt Mobility Messaging QML plugin
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Messaging QML plugin for QtDeclarative.
+
- Name: libdeclarative-multimedia
AsWholeName: yes
Summary: Qt Mobility Multimedia QML plugin
@@ -206,6 +281,15 @@
This package contains the Service Framework QML plugin for QtDeclarative.
+ - Name: libdeclarative-systeminfo
+ AsWholeName: yes
+ Summary: Qt Mobility System Information QML plugin
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
(6 more lines skipped)
++++++ use_isabspath.patch (new)
--- use_isabspath.patch
+++ use_isabspath.patch
+Description: use isAbsPath() for MeeGo instead of pathhelper.
+pathhelper uses abs_path and returns undef for non-existent path.
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+--- a/configure
++++ b/configure
+@@ -64,7 +64,7 @@ isAbsPath() {
+ # maemo we do not want to follow symbolic links that are
+ # introduced by scratchbox
+ absPath() {
+- if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
++ if [ "$2" = "maemo5" -o "$2" = "maemo6" -o "$2" = "meego" ]; then
+ if [ `isAbsPath $1` = '1' ]; then
+ echo $1;
+ else
++++++ deleted files:
--- 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
--- 0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch
--- 01_qtcontacts_api_1.1.0_tp1.patch.bz2
--- 02_no_rpath.patch
--- 02_qtcontacts_api_1.1.0~git20100825.patch.bz2
--- 03_ftbfs_synthesizedDisplayLabel.patch
--- 04_ftbfs_multimedia_examples.patch
--- 05_fix_translations_install_path.patch
--- 06_enable_sensorfw_support.patch
--- 07_add_location_api_meego_implementation_using_geoclue.patch
--- add-meego-build-flag.patch
--- qt-enable-playbin2.patch
--- qt-mobility-opensource-src-1.0.2.tar.gz
--- qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
More information about the MeeGo-commits
mailing list