[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.0-2-12-g4459ce0

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=4459ce0

The following commit has been merged in the experimental branch:
commit 4459ce0d176b99a8aaca7d096e6fc82a7c77c74f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Feb 8 12:55:55 2015 -0300

    Update the patch.
---
 .../patches/check_system_double-conversion.patch   | 57 +++++++++++++++++-----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/debian/patches/check_system_double-conversion.patch b/debian/patches/check_system_double-conversion.patch
index a63c13c..a2a43f0 100644
--- a/debian/patches/check_system_double-conversion.patch
+++ b/debian/patches/check_system_double-conversion.patch
@@ -5,15 +5,14 @@ Description: detect and use the system's libdouble-conversion
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Forwarded: https://codereview.qt-project.org/#/c/105650/
 
-
 ---
- config.tests/double-conversion/double-conversion.pro |    6 ++++++
- config.tests/double-conversion/main.cpp              |    9 +++++++++
- qtdeclarative.pro                                    |    6 ++++++
- src/qml/jsruntime/jsruntime.pri                      |    7 ++++++-
- src/qml/jsruntime/qv4numberobject.cpp                |    5 +++++
- src/qml/jsruntime/qv4runtime.cpp                     |    6 +++++-
- 6 files changed, 37 insertions(+), 2 deletions(-)
+ config.tests/double-conversion/double-conversion.pro |    6 ++
+ config.tests/double-conversion/main.cpp              |   43 +++++++++++++++++++
+ qtdeclarative.pro                                    |    6 ++
+ src/qml/jsruntime/jsruntime.pri                      |    7 ++-
+ src/qml/jsruntime/qv4numberobject.cpp                |    5 ++
+ src/qml/jsruntime/qv4runtime.cpp                     |    6 ++
+ 6 files changed, 71 insertions(+), 2 deletions(-)
 
 --- /dev/null
 +++ b/config.tests/double-conversion/double-conversion.pro
@@ -26,14 +25,48 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
 +LIBS += -ldouble-conversion
 --- /dev/null
 +++ b/config.tests/double-conversion/main.cpp
-@@ -0,0 +1,9 @@
-+#include <double-conversion/bignum.h>
+@@ -0,0 +1,43 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 Lisandro Damián Nicanor Pérez Meyer
++**                    <perezmeyer at gmail.com>
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the QtQml module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** 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 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include <double-conversion/double-conversion.h>
 +
 +using namespace double_conversion;
 +
 +int main(int, char**)
 +{
-+    Bignum num;
++    DoubleToStringConverter(0,"inf","nan",'e',-2,5,3,3);
 +    return 0;
 +}
 --- a/qtdeclarative.pro
@@ -57,7 +90,7 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
 -include(../../3rdparty/double-conversion/double-conversion.pri)
 +config_double-conversion {
 +    DEFINES += SYSTEM_DOUBLECONVERSION
-+    LIBS += -ldouble-conversion
++    LIBS_PRIVATE += -ldouble-conversion
 +} else {
 +    include(../../3rdparty/double-conversion/double-conversion.pri)
 +}

-- 
qtdeclarative packaging