From a46b51f9025f086ee1db1207da97216e30921343 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Dec 2010 10:01:56 -0600 Subject: [PATCH] - 1.1.0 --- .gitignore | 2 +- ...-opensource-src-1.0.1-no_declarative.patch | 9 -- ...opensource-src-1.0.1-translationsdir.patch | 22 --- ...-opensource-src-1.1.0-pulseaudio-lib.patch | 11 ++ ...opensource-src-1.1.0-translationsdir.patch | 11 ++ qt-mobility.spec | 131 ++++++++++++++---- remove-need-for-qimportbase.pri.patch | 39 ------ ...d-for-qimportbase.pri-for-QML-plugin.patch | 38 ----- ...se-of-qimportbase.pri-for-QML-plugin.patch | 42 ------ sources | 2 +- 10 files changed, 129 insertions(+), 178 deletions(-) delete mode 100644 qt-mobility-opensource-src-1.0.1-no_declarative.patch delete mode 100644 qt-mobility-opensource-src-1.0.1-translationsdir.patch create mode 100644 qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch create mode 100644 qt-mobility-opensource-src-1.1.0-translationsdir.patch delete mode 100644 remove-need-for-qimportbase.pri.patch delete mode 100644 removed-need-for-qimportbase.pri-for-QML-plugin.patch delete mode 100644 removed-the-use-of-qimportbase.pri-for-QML-plugin.patch diff --git a/.gitignore b/.gitignore index db8be5b..731e663 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -qt-mobility-opensource-src-1.0.1.tar.gz +/qt-mobility-opensource-src-1.1.0.tar.gz diff --git a/qt-mobility-opensource-src-1.0.1-no_declarative.patch b/qt-mobility-opensource-src-1.0.1-no_declarative.patch deleted file mode 100644 index 43350fa..0000000 --- a/qt-mobility-opensource-src-1.0.1-no_declarative.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up qt-mobility-opensource-src-1.0.1/plugins/plugins.pro.no_declarative qt-mobility-opensource-src-1.0.1/plugins/plugins.pro ---- qt-mobility-opensource-src-1.0.1/plugins/plugins.pro.no_declarative 2010-06-15 22:28:59.000000000 -0500 -+++ qt-mobility-opensource-src-1.0.1/plugins/plugins.pro 2010-07-14 13:47:11.515951364 -0500 -@@ -6,4 +6,4 @@ contains(mobility_modules,contacts): SUB - contains(mobility_modules,multimedia): SUBDIRS += multimedia - contains(mobility_modules,sensors): SUBDIRS += sensors - --contains(QT_CONFIG,declarative): SUBDIRS += declarative -+#contains(QT_CONFIG,declarative): SUBDIRS += declarative diff --git a/qt-mobility-opensource-src-1.0.1-translationsdir.patch b/qt-mobility-opensource-src-1.0.1-translationsdir.patch deleted file mode 100644 index a1f0492..0000000 --- a/qt-mobility-opensource-src-1.0.1-translationsdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-mobility-opensource-src-1.0.1/translations/translations.pri.translationsdir qt-mobility-opensource-src-1.0.1/translations/translations.pri ---- qt-mobility-opensource-src-1.0.1/translations/translations.pri.translationsdir 2010-06-15 22:28:59.000000000 -0500 -+++ qt-mobility-opensource-src-1.0.1/translations/translations.pri 2010-07-14 08:58:27.524702160 -0500 -@@ -29,3 +29,6 @@ lupdate.commands = (cd $$QT_MOBILITY_SOU - -ts $$prependAll($$QT_MOBILITY_SOURCE_TREE/translations/qtmobility_,$$QTMOBILITY_TS,.ts)) - - QMAKE_EXTRA_TARGETS += lupdate -+ -+translations.path = $$[QT_INSTALL_TRANSLATIONS] -+ -diff -up qt-mobility-opensource-src-1.0.1/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.0.1/translations/translations.pro ---- qt-mobility-opensource-src-1.0.1/translations/translations.pro.translationsdir 2010-06-15 22:28:59.000000000 -0500 -+++ qt-mobility-opensource-src-1.0.1/translations/translations.pro 2010-07-14 08:52:58.381700881 -0500 -@@ -42,7 +42,7 @@ isEmpty(vcproj) { - QMAKE_EXTRA_COMPILERS += phony_src - } - --translations.path = $${QT_MOBILITY_PREFIX}/translations -+translations.path = $$[QT_INSTALL_TRANSLATIONS] - translations.files = $$TRANSLATIONS - translations.files ~= s,\\.ts$,.qm,g - translations.files ~= s,^,$$OUT_PWD/,g diff --git a/qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch b/qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch new file mode 100644 index 0000000..72e53c8 --- /dev/null +++ b/qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch @@ -0,0 +1,11 @@ +--- qt-mobility-opensource-src-1.1.0/src/multimedia/audio/audio.pri.orig 2010-09-08 19:07:17.624306462 -0300 ++++ qt-mobility-opensource-src-1.1.0/src/multimedia/audio/audio.pri 2010-09-08 19:07:32.694317010 -0300 +@@ -68,7 +68,7 @@ + SOURCES += audio/qaudiodeviceinfo_alsa_p.cpp \ + audio/qaudiooutput_alsa_p.cpp \ + audio/qaudioinput_alsa_p.cpp +- LIBS_PRIVATE += -lasound ++ LIBS_PRIVATE += -lasound -lpulse + } + } + } diff --git a/qt-mobility-opensource-src-1.1.0-translationsdir.patch b/qt-mobility-opensource-src-1.1.0-translationsdir.patch new file mode 100644 index 0000000..7808334 --- /dev/null +++ b/qt-mobility-opensource-src-1.1.0-translationsdir.patch @@ -0,0 +1,11 @@ +diff -up qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.1.0/translations/translations.pro +--- qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir 2010-11-01 01:36:10.000000000 -0500 ++++ qt-mobility-opensource-src-1.1.0/translations/translations.pro 2010-12-08 11:29:30.007096486 -0600 +@@ -97,6 +97,6 @@ isEmpty(vcproj) { + } + + qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm) +-qmfiles.path = $${QT_MOBILITY_PREFIX}/translations ++qmfiles.path = $$[QT_INSTALL_TRANSLATIONS] + qmfiles.CONFIG += no_check_exist + INSTALLS += qmfiles diff --git a/qt-mobility.spec b/qt-mobility.spec index 9a17b1b..abc343b 100644 --- a/qt-mobility.spec +++ b/qt-mobility.spec @@ -1,33 +1,33 @@ -Name: qt-mobility -Version: 1.0.1 -Release: 3%{?dist} +# options +#define examples 1 + +Name: qt-mobility +Version: 1.1.0 +Release: 1%{?dist} Summary: Qt Mobility Framework -Group: System Environment/Libraries +Group: System Environment/Libraries License: LGPLv2 with exceptions -URL: http://labs.trolltech.com/page/Projects/QtMobility -Source0: http://get.qt.nokia.com/qt/solutions/qt-mobility-opensource-src-%{version}.tar.gz +URL: http://qt.nokia.com/products/qt-addons/mobility +Source0: http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: qt4-mobility = %{version}-%{release} Provides: qt4-mobility%{?_isa} = %{version}-%{release} -# declarative plugin busted, uses private/precompiled header, -# qmetadatacontrolmetaobject_p.h:65:38: fatal error: QtCore/private/qobject_p.h: No such file or directory -Patch0: qt-mobility-opensource-src-1.0.1-no_declarative.patch - ## upstreamable patches -Patch50: qt-mobility-opensource-src-1.0.1-translationsdir.patch +Patch50: qt-mobility-opensource-src-1.1.0-translationsdir.patch ## upstream patches -Patch100: removed-need-for-qimportbase.pri-for-QML-plugin.patch -Patch101: removed-the-use-of-qimportbase.pri-for-QML-plugin.patch -Patch102: remove-need-for-qimportbase.pri.patch +Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel BuildRequires: chrpath +BuildRequires: NetworkManager-devel BuildRequires: pulseaudio-libs-devel +## under review, http://bugzilla.redhat.com/626122 +# BuildRequires: libqmf-devel >= 1.0 BuildRequires: qt4-devel qt4-webkit-devel %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} @@ -43,10 +43,20 @@ of these technologies, but has applicability beyond the mobile device arena. %package devel Summary: Qt Mobility Framework development files Group: Development/Libraries -Provides: qt4-mobility-devel = %{version}-%{release} -Provides: qt4-mobility-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt4-devel +Provides: qt4-mobility-devel = %{version}-%{release} +Provides: qt4-mobility-devel%{?_isa} = %{version}-%{release} +Provides: %{name}-messaging-devel = %{version}-%{release} +Provides: %{name}-bearer-devel = %{version}-%{release} +Provides: %{name}-versit-devel = %{version}-%{release} +Provides: %{name}-contacts-devel = %{version}-%{release} +Provides: %{name}-location-devel = %{version}-%{release} +Provides: %{name}-multimedia-devel = %{version}-%{release} +Provides: %{name}-publishsubscribe-devel = %{version}-%{release} +Provides: %{name}-sensors-devel = %{version}-%{release} +Provides: %{name}-serviceframework-devel = %{version}-%{release} +Provides: %{name}-systeminfo-devel = %{version}-%{release} %description devel %{summary}. @@ -58,15 +68,19 @@ BuildArch: noarch %description doc %{summary}. +%package examples +Summary: Qt Mobility Framework examples +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + %prep %setup -q -n %{name}-opensource-src-%{version} -%patch0 -p1 -b .no_declarative %patch50 -p1 -b .translationsdir -%patch100 -p1 -b .qmldir_0 -%patch101 -p1 -b .qmldir_1 -%patch102 -p1 -b .qmldir_2 +%patch101 -p1 -b .pulseaudio_lib %build @@ -77,7 +91,9 @@ PATH=%{_qt4_bindir}:$PATH; export PATH -bindir %{_bindir} \ -headerdir %{_qt4_headerdir} \ -libdir %{_qt4_libdir} \ - -plugindir %{_qt4_plugindir} + -plugindir %{_qt4_plugindir} \ + -qmake-exec %{_qt4_qmake} \ + %{?examples:-examples} make %{?_smp_mflags} @@ -92,12 +108,14 @@ install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobi mkdir -p %{buildroot}%{_qt4_docdir}/html/qtmobility cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/ -%find_lang %{name} --all-name --with-qt --without-mo +## WTF, translations went awol in 1.1.0 ? -- Rex +#find_lang %{name} --all-name --with-qt --without-mo # die rpath, die chrpath --delete %{buildroot}%{_bindir}/* ||: chrpath --delete %{buildroot}%{_qt4_libdir}/libQt*.so ||: chrpath --delete %{buildroot}%{_qt4_plugindir}/*/*.so ||: +chrpath --delete %{buildroot}%{_qt4_importdir}/*/*/*.so ||: %clean @@ -109,27 +127,38 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc LICENSE.LGPL LGPL_EXCEPTION.txt %doc changes* %{_qt4_libdir}/libQtBearer.so.1* %{_qt4_libdir}/libQtContacts.so.1* +%{_qt4_libdir}/libQtFeedback.so.1* +%{_qt4_libdir}/libQtGallery.so.1* %{_qt4_libdir}/libQtLocation.so.1* %{_qt4_libdir}/libQtMultimediaKit.so.1* +%{_qt4_libdir}/libQtOrganizer.so.1* %{_qt4_libdir}/libQtPublishSubscribe.so.1* %{_qt4_libdir}/libQtSensors.so.1* %{_qt4_libdir}/libQtServiceFramework.so.1* %{_qt4_libdir}/libQtSystemInfo.so.1* %{_qt4_libdir}/libQtVersit.so.1* +%{_qt4_libdir}/libQtVersitOrganizer.so.1* +%{_qt4_importdir}/QtMobility/ +%{_qt4_importdir}/QtMultimediaKit/ %{_qt4_plugindir}/* %files devel %defattr(-,root,root,-) -%{_bindir}/* -%{_qt4_prefix}/mkspecs/features/* +%{_bindir}/icheck +%{_bindir}/qcrmlgen +%{_bindir}/servicedbgen +%{_bindir}/servicefw +%{_bindir}/servicexmlgen +%{_bindir}/vsexplorer +%{_qt4_prefix}/mkspecs/features/mobility.prf +%{_qt4_prefix}/mkspecs/features/mobilityconfig.prf %{_qt4_headerdir}/Qt*/ -%{_qt4_headerdir}/qmobilityglobal.h %{_qt4_libdir}/libQt*.prl %{_qt4_libdir}/libQt*.so @@ -138,8 +167,58 @@ rm -rf %{buildroot} %{_qt4_docdir}/qch/qtmobility.qch %{_qt4_docdir}/html/qtmobility/ +%if 0%{?examples} +%files examples +%defattr(-,root,root,-) +%{_qt4_bindir}/arrowkeys +%{_qt4_bindir}/audiodevices +%{_qt4_bindir}/audioinput +%{_qt4_bindir}/audiooutput +%{_qt4_bindir}/audiorecorder +%{_qt4_bindir}/battery-publisher +%{_qt4_bindir}/battery-subscriber +%{_qt4_bindir}/bearercloud +%{_qt4_bindir}/bearermonitor +%{_qt4_bindir}/cubehouse +%{_qt4_bindir}/flickrdemo +%{_qt4_bindir}/grueapp +%{_qt4_bindir}/logfilepositionsource +%{_qt4_bindir}/metadata +%{_qt4_bindir}/nmealog.txt +%{_qt4_bindir}/orientation +%{_qt4_bindir}/publish-subscribe +%{_qt4_bindir}/radio +%{_qt4_bindir}/samplephonebook +%{_qt4_bindir}/satellitedialog +%{_qt4_bindir}/sensor_explorer +%{_qt4_bindir}/servicebrowser +%{_qt4_bindir}/sfw-notes +%{_qt4_bindir}/show_acceleration +%{_qt4_bindir}/show_als +%{_qt4_bindir}/show_compass +%{_qt4_bindir}/show_magneticflux +%{_qt4_bindir}/show_orientation +%{_qt4_bindir}/show_proximity +%{_qt4_bindir}/show_rotation +%{_qt4_bindir}/show_tap +%{_qt4_bindir}/simplelog.txt +%{_qt4_bindir}/slideshow +%{_qt4_bindir}/videographicsitem +%{_qt4_bindir}/videowidget +%{_qt4_bindir}/xmldata +%{_qt4_plugindir}/serviceframework/libserviceframework_voipdialerservice.so +%{_qt4_plugindir}/serviceframework/libserviceframework_landlinedialerservice.so +%{_qt4_plugindir}/serviceframework/libserviceframework_filemanagerplugin.so +%{_qt4_plugindir}/serviceframework/libserviceframework_bluetoothtransferplugin.so +%{_qt4_plugindir}/serviceframework/libserviceframework_notesmanagerplugin.so +%{_qt4_plugindir}/sensors/libqtsensors_grueplugin.so +%endif + %changelog +* Thu Dec 09 2010 Rex Dieter 1.1.0-1 +- 1.1.0 + * Wed Jul 14 2010 Rex Dieter 1.0.1-3 - License: LGPLv2 ... - -doc subpkg diff --git a/remove-need-for-qimportbase.pri.patch b/remove-need-for-qimportbase.pri.patch deleted file mode 100644 index 877b1bf..0000000 --- a/remove-need-for-qimportbase.pri.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7d8c5ed8f18ddd669f8f6c4d3ac7e74f6e06e9f0 Mon Sep 17 00:00:00 2001 -From: Alex -Date: Wed, 9 Jun 2010 13:54:59 +1000 -Subject: [PATCH 1/1] remove need for qimportbase.pri - (cherry picked from commit d80a5a89763d561ba9b704da7cd5f7fd5890cdbf) - ---- - .../serviceframework/serviceframework.pro | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/plugins/declarative/serviceframework/serviceframework.pro b/plugins/declarative/serviceframework/serviceframework.pro -index 0682b87..5b8fcd4 100644 ---- a/plugins/declarative/serviceframework/serviceframework.pro -+++ b/plugins/declarative/serviceframework/serviceframework.pro -@@ -1,9 +1,11 @@ - INCLUDEPATH += ../../../src/serviceframework - INCLUDEPATH += ../../../src/global - --TARGET = declarative_serviceframework -+TARGET = $$qtLibraryTarget(declarative_serviceframework) -+TEMPLATE = lib -+CONFIG += plugin - TARGETPATH = QtMobility/serviceframework --include(../../qimportbase.pri) -+PLUGIN_TYPE = declarative - include(../../../common.pri) - - QT += declarative -@@ -16,7 +18,6 @@ SOURCES += qdeclarativeservice.cpp \ - CONFIG += mobility - MOBILITY += serviceframework - --DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH - target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - - qmldir.files += $$PWD/qmldir --- -1.7.0.1 - diff --git a/removed-need-for-qimportbase.pri-for-QML-plugin.patch b/removed-need-for-qimportbase.pri-for-QML-plugin.patch deleted file mode 100644 index a636703..0000000 --- a/removed-need-for-qimportbase.pri-for-QML-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eb65a1d99aa09cca1d7946605782ae45f1026bb8 Mon Sep 17 00:00:00 2001 -From: Evan Nguyen -Date: Wed, 9 Jun 2010 14:34:43 +1000 -Subject: [PATCH 1/1] removed need for qimportbase.pri for QML plugin - ---- - .../publishsubscribe/publishsubscribe.pro | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/plugins/declarative/publishsubscribe/publishsubscribe.pro b/plugins/declarative/publishsubscribe/publishsubscribe.pro -index 642f6d2..0fc4113 100644 ---- a/plugins/declarative/publishsubscribe/publishsubscribe.pro -+++ b/plugins/declarative/publishsubscribe/publishsubscribe.pro -@@ -2,9 +2,11 @@ INCLUDEPATH += ../../../src/publishsubscribe - DEPENDPATH += ../../../src/publishsubscribe - INCLUDEPATH += ../../../src/global - --TARGET = declarative_publishsubscribe -+TARGET = $$qtLibraryTarget(declarative_publishsubscribe) -+TEMPLATE = lib -+CONFIG += plugin - TARGETPATH = QtMobility/publishsubscribe --include(../../qimportbase.pri) -+PLUGIN_TYPE = declarative - include(../../../common.pri) - - QT += declarative -@@ -14,7 +16,6 @@ SOURCES += publishsubscribe.cpp - CONFIG += mobility - MOBILITY += publishsubscribe - --DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH - target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - - qmldir.files += $$PWD/qmldir --- -1.7.0.1 - diff --git a/removed-the-use-of-qimportbase.pri-for-QML-plugin.patch b/removed-the-use-of-qimportbase.pri-for-QML-plugin.patch deleted file mode 100644 index 9438285..0000000 --- a/removed-the-use-of-qimportbase.pri-for-QML-plugin.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ea69978fbb9dcb8b63c46a3a1e36821359bb86ee Mon Sep 17 00:00:00 2001 -From: Evan Nguyen -Date: Wed, 9 Jun 2010 14:47:56 +1000 -Subject: [PATCH 1/1] removed the use of qimportbase.pri for QML plugin - ---- - plugins/declarative/multimedia/multimedia.pro | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/plugins/declarative/multimedia/multimedia.pro b/plugins/declarative/multimedia/multimedia.pro -index 7ee4f66..4834a5a 100644 ---- a/plugins/declarative/multimedia/multimedia.pro -+++ b/plugins/declarative/multimedia/multimedia.pro -@@ -1,13 +1,13 @@ --include(../../../staticconfig.pri) -- - INCLUDEPATH += ../../../src/multimedia \ - ../../../src/multimedia/effects \ - ../../../src/multimedia/video - INCLUDEPATH += ../../../src/global - --TARGET = declarative_multimedia -+TARGET = $$qtLibraryTarget(declarative_multimedia) -+TEMPLATE = lib -+CONFIG += plugin - TARGETPATH = Qt/multimedia --include(../../qimportbase.pri) -+PLUGIN_TYPE = declarative - include(../../../common.pri) - - QT += declarative -@@ -28,7 +28,6 @@ SOURCES += \ - CONFIG += mobility - MOBILITY += multimedia - --DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH - target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - - qmldir.files += $$PWD/qmldir --- -1.7.0.1 - diff --git a/sources b/sources index 07c5c9e..10ed3c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10d43efc0ed943a465e4e4f2dd8e328d qt-mobility-opensource-src-1.0.1.tar.gz +0bf8603493058735e16b35349da121df qt-mobility-opensource-src-1.1.0.tar.gz