sync w/devel, import
This commit is contained in:
Rex Dieter
parent
16293ea55e
commit
66b1f5064a
|
|
@ -0,0 +1 @@
|
|||
qt-mobility-opensource-src-1.0.1.tar.gz
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,149 @@
|
|||
|
||||
Name: qt-mobility
|
||||
Version: 1.0.1
|
||||
Release: 3%{?dist}
|
||||
Summary: Qt Mobility Framework
|
||||
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
|
||||
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
|
||||
|
||||
## 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
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: bluez-libs-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: pulseaudio-libs-devel
|
||||
BuildRequires: qt4-devel qt4-webkit-devel
|
||||
|
||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||
|
||||
%description
|
||||
Qt Mobility Project delivers a set of new APIs to Qt with features that are well
|
||||
known from the mobile device world, in particular phones. However, 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. The framework not
|
||||
only improves many aspects of a mobile experience, because it improves the use
|
||||
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
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
Group: Documentation
|
||||
Requires: qt4
|
||||
BuildArch: noarch
|
||||
%description doc
|
||||
%{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
|
||||
|
||||
|
||||
%build
|
||||
PATH=%{_qt4_bindir}:$PATH; export PATH
|
||||
|
||||
./configure \
|
||||
-prefix %{_qt4_prefix} \
|
||||
-bindir %{_bindir} \
|
||||
-headerdir %{_qt4_headerdir} \
|
||||
-libdir %{_qt4_libdir} \
|
||||
-plugindir %{_qt4_plugindir}
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install INSTALL_ROOT=%{buildroot}
|
||||
|
||||
# manually install docs
|
||||
install -p -m644 -D doc/qch/qtmobility.qch %{buildroot}%{_qt4_docdir}/qch/qtmobility.qch
|
||||
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
|
||||
|
||||
# die rpath, die
|
||||
chrpath --delete %{buildroot}%{_bindir}/* ||:
|
||||
chrpath --delete %{buildroot}%{_qt4_libdir}/libQt*.so ||:
|
||||
chrpath --delete %{buildroot}%{_qt4_plugindir}/*/*.so ||:
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE.LGPL LGPL_EXCEPTION.txt
|
||||
%doc changes*
|
||||
%{_qt4_libdir}/libQtBearer.so.1*
|
||||
%{_qt4_libdir}/libQtContacts.so.1*
|
||||
%{_qt4_libdir}/libQtLocation.so.1*
|
||||
%{_qt4_libdir}/libQtMultimediaKit.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_plugindir}/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/*
|
||||
%{_qt4_prefix}/mkspecs/features/*
|
||||
%{_qt4_headerdir}/Qt*/
|
||||
%{_qt4_headerdir}/qmobilityglobal.h
|
||||
%{_qt4_libdir}/libQt*.prl
|
||||
%{_qt4_libdir}/libQt*.so
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%{_qt4_docdir}/qch/qtmobility.qch
|
||||
%{_qt4_docdir}/html/qtmobility/
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 14 2010 Rex Dieter <rdieter@fedoraproject.org> 1.0.1-3
|
||||
- License: LGPLv2 ...
|
||||
- -doc subpkg
|
||||
|
||||
* Wed Jul 14 2010 Rex Dieter <rdieter@fedoraproject.org> 1.0.1-2
|
||||
- 1.0.1 (first try, based on work by heliocastro)
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
From 7d8c5ed8f18ddd669f8f6c4d3ac7e74f6e06e9f0 Mon Sep 17 00:00:00 2001
|
||||
From: Alex <qt-info@nokia.com>
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From eb65a1d99aa09cca1d7946605782ae45f1026bb8 Mon Sep 17 00:00:00 2001
|
||||
From: Evan Nguyen <evan.nguyen@nokia.com>
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From ea69978fbb9dcb8b63c46a3a1e36821359bb86ee Mon Sep 17 00:00:00 2001
|
||||
From: Evan Nguyen <evan.nguyen@nokia.com>
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue