[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.1-2-9-g2ba2908
Fathi Boudra
fabo at alioth.debian.org
Sun Aug 22 07:56:20 UTC 2010
The following commit has been merged in the master branch:
commit 2ba2908f7380fc0a241d32104a318564cab4617b
Author: Fathi Boudra <fabo at debian.org>
Date: Sun Aug 22 10:55:40 2010 +0300
- 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
It fixes ftbfs against Qt 4.7.0 rc1.
- bump Qt build dependencies to 4:4.7.0~rc1
- bump Standards-Version to 3.9.1 (no changes needed).
---
debian/changelog | 5 +
debian/control | 4 +-
...use_imageprovider.h_in_declarative_plugin.patch | 81 ++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a820ff1..36b2382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,12 +10,17 @@ qtmobility (1.0.2-1) UNRELEASED; urgency=low
- 03_ftbfs_multimedia_plugin.diff
- 0001_rename_smallsensors.diff
- 0002_rename_sysinfo.diff
+ * Add patches:
+ - 0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
+ It fixes ftbfs against Qt 4.7.0 rc1.
* Update debian/control:
- add libgstreamer-plugins-base0.10-dev, libxext-dev and libxv-dev build
dependencies.
- add libqt4-sql-sqlite dependency to libqtsensors1 package.
- add hal dependency to libqtserviceframework1 package.
- add libdeclarative-contacts and libdeclarative-sensors packages.
+ - bump Qt build dependencies to 4:4.7.0~rc1
+ - bump Standards-Version to 3.9.1 (no changes needed).
* Update debian/rules:
- remove more leftover files and directories.
* Update debian/*.install files.
diff --git a/debian/control b/debian/control
index 25685be..39e50d2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>
Build-Depends: debhelper (>= 7.4.15), pkg-kde-tools (>= 0.6.4),
- libqt4-dev (>= 4:4.7.0~beta2), libqt4-opengl-dev (>= 4:4.7.0~beta2),
+ libqt4-dev (>= 4:4.7.0~rc1), libqt4-opengl-dev (>= 4:4.7.0~rc1),
libqtwebkit-dev (>= 2.0~week27), libasound2-dev, libbluetooth-dev,
libgstreamer-plugins-base0.10-dev, libpulse-dev, libx11-dev, libxext-dev,
libxv-dev, network-manager-dev, qmf-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Section: libs
Homepage: http://labs.trolltech.com/page/Projects/QtMobility
Vcs-Git: git://git.debian.org/pkg-kde/qt/qtmobility.git
diff --git a/debian/patches/0001_do_not_use_imageprovider.h_in_declarative_plugin.patch b/debian/patches/0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
new file mode 100644
index 0000000..a1a6ab2
--- /dev/null
+++ b/debian/patches/0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
@@ -0,0 +1,81 @@
+From 0f24eddbcc7d63e843f598ae0296cdfdf47d123f Mon Sep 17 00:00:00 2001
+From: Chris Adams <christopher.adams at nokia.com>
+Date: Thu, 22 Jul 2010 11:31:36 +1000
+Subject: [PATCH] Don't use imageprovider.h in declarative plugin due to source break
+
+This is basically the same as 35a460a533fdbbcb4bc1d2659aed37414fa3e985
+but applied to the 1.0 branch.
+---
+ examples/qmlcontacts/contents/example.vcf | 1 +
+ plugins/declarative/contacts/contacts.pro | 7 +++++--
+ plugins/declarative/contacts/plugin.cpp | 5 +++--
+ plugins/declarative/contacts/qmlcontactmodel.cpp | 3 ++-
+ 4 files changed, 11 insertions(+), 5 deletions(-)
+
+--- a/examples/qmlcontacts/contents/example.vcf
++++ b/examples/qmlcontacts/contents/example.vcf
+@@ -69,6 +69,7 @@ VERSION:2.1
+ N:Edie;David;
+ FN:Mr. David Edie
+ ORG:Example;
++PHOTO:http://qt.nokia.com/logo.png
+ TITLE:Manager
+ NOTE:
+ TEL;WORK;VOICE:(07) 3245-2323
+--- a/plugins/declarative/contacts/contacts.pro
++++ b/plugins/declarative/contacts/contacts.pro
+@@ -31,16 +31,19 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$
+
+ # Input
+ HEADERS += qmlcontactmodel.h \
+- imageprovider.h \
+ qmlcontact.h \
+ qmlcontactdetail.h \
+ qmlcontactdetailfield.h
+
+ SOURCES += plugin.cpp \
+ qmlcontactmodel.cpp \
+- imageprovider.cpp \
+ qmlcontact.cpp \
+ qmlcontactdetail.cpp \
+ qmlcontactdetailfield.cpp
+
++# Qt 4.7.0b2 and 4.7.0rc1 have a source break for declarativeimageprovider, so don't
++# compile them for now.
++# HEADERS += imageprovider.h
++# SOURCES += imageprovider.cpp
++
+ INSTALLS += target qmldir
+--- a/plugins/declarative/contacts/plugin.cpp
++++ b/plugins/declarative/contacts/plugin.cpp
+@@ -47,7 +47,8 @@
+ #include "qmlcontact.h"
+ #include "qmlcontactdetail.h"
+ #include "qmlcontactdetailfield.h"
+-#include "imageprovider.h"
++// Qt 4.7.0b2 and rc1 have a source break - turn off for now
++// #include "imageprovider.h"
+
+ QT_USE_NAMESPACE
+
+@@ -67,7 +68,7 @@ public:
+
+ void initializeEngine(QDeclarativeEngine *engine, const char *uri) {
+ Q_UNUSED(uri);
+- engine->addImageProvider("thumbnail", new ContactThumbnailImageProvider);
++ //engine->addImageProvider("thumbnail", new ContactThumbnailImageProvider);//due to source break
+ }
+ };
+
+--- a/plugins/declarative/contacts/qmlcontactmodel.cpp
++++ b/plugins/declarative/contacts/qmlcontactmodel.cpp
+@@ -270,7 +270,8 @@ QVariant QMLContactModel::data(const QMo
+ return c.localId();
+ case AvatarRole:
+ //Just let the imager provider deal with it
+- return QString("image://thumbnail/%1.%2").arg(manager()).arg(c.localId());
++ //return QString("image://thumbnail/%1.%2").arg(manager()).arg(c.localId()); //imageprovider.h
++ return c.detail<QContactAvatar>().imageUrl();
+ case Qt::DecorationRole:
+ {
+ QContactThumbnail t = c.detail<QContactThumbnail>();
diff --git a/debian/patches/series b/debian/patches/series
index d8dab65..8d6cb9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001_do_not_use_imageprovider.h_in_declarative_plugin.patch
# merged for 1.0.2
# 0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff
02_no_rpath.diff
--
Qt Mobility packaging
More information about the pkg-kde-commits
mailing list