[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-1-8-g6c1214b

Tue Jan 3 10:41:58 UTC 2012

The following commit has been merged in the master branch:
commit 6c1214b171c14cf1b7a5aa94543db68f781f6ade
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jan 3 12:41:20 2012 +0200

    Add a set of patches, cherry-picked upstream, to fix build with Qt 4.8.
---
 debian/changelog                                   |    5 +
 .../patches/Fix_4.8_4.7_linux_build-f9c87a7.patch  |   21 +
 .../Fix_4.8_and_4.7_build_for_linux-eff4af5.patch  |11837 ++++++++++++++++++++
 ...tbuilder_build_errors_4.8_and_4.7-f102053.patch | 5606 +++++++++
 ...-790_subdirs_for_serviceframework-b90cee3.patch |  891 ++
 debian/patches/series                              |    4 +
 6 files changed, 18364 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0564f2..ca84cdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,11 @@ qtmobility (1.2.0-2) experimental; urgency=low
     - update installed files to multiarch paths.
     - add support for DEB_HOST_MULTIARCH, needed for libdir and plugindir.
   * Update debian/control: build depends on gdb >= 7.3 for gdb_dwarf_index.
+  * Add a set of patches, cherry-picked upstream, to fix build with Qt 4.8:
+    - QTMOBILITY-790_subdirs_for_serviceframework-b90cee3.patch
+    - Fix_metaobjectbuilder_build_errors_4.8_and_4.7-f102053.patch
+    - Fix_4.8_and_4.7_build_for_linux-eff4af5.patch
+    - Fix_4.8_4.7_linux_build-f9c87a7.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Sep 2011 09:29:49 +0300
 
diff --git a/debian/patches/Fix_4.8_4.7_linux_build-f9c87a7.patch b/debian/patches/Fix_4.8_4.7_linux_build-f9c87a7.patch
new file mode 100644
index 0000000..196cf0b
--- /dev/null
+++ b/debian/patches/Fix_4.8_4.7_linux_build-f9c87a7.patch
@@ -0,0 +1,21 @@
+commit f9c87a7e68fac52ed92c430b2360827438f2e33b
+Author: Wolfgang Beck <wolfgang.beck at nokia.com>
+Date:   Wed May 18 12:41:39 2011 +1000
+
+    Fix 4.8 4.7 linux build
+
+---
+ src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
++++ b/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
+@@ -39,7 +39,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include "qmetaobjectbuilder_47_p.h"
++#include "qmetaobjectbuilder_p.h"
+ #include <QDebug>
+ 
+ #ifndef Q_OS_WIN
diff --git a/debian/patches/Fix_4.8_and_4.7_build_for_linux-eff4af5.patch b/debian/patches/Fix_4.8_and_4.7_build_for_linux-eff4af5.patch
new file mode 100644
index 0000000..b2ebee2
--- /dev/null
+++ b/debian/patches/Fix_4.8_and_4.7_build_for_linux-eff4af5.patch
@@ -0,0 +1,11837 @@
+commit eff4af570e315afd89b52f949cbce7949ff504ef
+Author: Wolfgang Beck <wolfgang.beck at nokia.com>
+Date:   Wed May 18 12:13:01 2011 +1000
+
+    Fix 4.8 and 4.7 build for linux
+
+---
+ src/serviceframework/ipc/metaobjectbuilder.pri                      |   16 
+ src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder.cpp   | 2611 ++++++++++
+ src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder_p.h   |  342 +
+ src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp | 2583 +++++++++
+ src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder_p.h |  338 +
+ src/serviceframework/ipc/qmetaobjectbuilder.cpp                     | 2611 ----------
+ src/serviceframework/ipc/qmetaobjectbuilder_47.cpp                  | 2583 ---------
+ src/serviceframework/ipc/qmetaobjectbuilder_47_p.h                  |  338 -
+ src/serviceframework/ipc/qmetaobjectbuilder_p.h                     |  342 -
+ tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro                |    2 
+ tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp         |    2 
+ 11 files changed, 5885 insertions(+), 5883 deletions(-)
+
+--- a/src/serviceframework/ipc/metaobjectbuilder.pri
++++ b/src/serviceframework/ipc/metaobjectbuilder.pri
+@@ -1,12 +1,12 @@
+ #check version for 4.7 ...
+ contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 8) {
+-  OBJECTBUILDER_INCLUDEPATH += ipc
+-  OBJECTBUILDER_DEPENDPATH += ipc
+-  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_47_p.h
+-  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder_47.cpp
++  OBJECTBUILDER_INCLUDEPATH += ipc/metaobjectbuilder47
++  OBJECTBUILDER_DEPENDPATH += ipc/metaobjectbuilder47
++  OBJECTBUILDER_HEADERS += ipc/metaobjectbuilder47/qmetaobjectbuilder_p.h
++  OBJECTBUILDER_SOURCES += ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
+ } else {
+-  OBJECTBUILDER_INCLUDEPATH += ipc
+-  OBJECTBUILDER_DEPENDPATH += ipc
+-  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_p.h
+-  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder.cpp
++  OBJECTBUILDER_INCLUDEPATH += ipc/metaobjectbuilder
++  OBJECTBUILDER_DEPENDPATH += ipc/metaobjectbuilder
++  OBJECTBUILDER_HEADERS += ipc/metaobjectbuilder/qmetaobjectbuilder_p.h
++  OBJECTBUILDER_SOURCES += ipc/metaobjectbuilder/qmetaobjectbuilder.cpp
+ }
+--- /dev/null
++++ b/src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder.cpp
+@@ -0,0 +1,2611 @@
++/****************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (qt-info at nokia.com)
++**
++** This file is part of the QtDeclarative module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** No Commercial Usage
++** This file contains pre-release code and may not be distributed.
++** You may use this file in accordance with the terms and conditions
++** contained in the Technology Preview License Agreement accompanying
++** this package.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Nokia gives you certain additional
++** rights.  These rights are described in the Nokia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at qt-info at nokia.com.
++**
++**
++**
++**
++**
++**
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qmetaobjectbuilder_p.h"
++#include <QDebug>
++
++#ifndef Q_OS_WIN
++#include <stdint.h>
++#endif
++
++QTM_BEGIN_NAMESPACE
++
++/*!
++    
-- 
Qt Mobility packaging

