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

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3d1275e86d4ea57f9ddbfdda4b92f0f44bc0f3de
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 7 00:03:54 2015 -0300

    Add check_system_double-conversion.patch to use the system's lib.
---
 debian/changelog                                   |  4 +
 debian/control                                     |  1 +
 .../patches/check_system_double-conversion.patch   | 93 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 99 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cecda90..b5c830e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtdeclarative-opensource-src (5.4.0-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add check_system_double-conversion.patch to use the system's lib.
+    - Build depend upon libdouble-conversion-dev.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Feb 2015 21:48:11 -0300
 
 qtdeclarative-opensource-src (5.4.0-4) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index cf70812..813d47d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
+               libdouble-conversion-dev,
                libqt5xmlpatterns5-private-dev (>= 5.4.0~),
                pkg-kde-tools (>= 0.15.12~),
                python,
diff --git a/debian/patches/check_system_double-conversion.patch b/debian/patches/check_system_double-conversion.patch
new file mode 100644
index 0000000..a63c13c
--- /dev/null
+++ b/debian/patches/check_system_double-conversion.patch
@@ -0,0 +1,93 @@
+Description: detect and use the system's libdouble-conversion
+ This patch makes qtdeclarative look for libdouble-conversion. If
+ it finds it it will use the system provided version instead of the embedded
+ one.
+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(-)
+
+--- /dev/null
++++ b/config.tests/double-conversion/double-conversion.pro
+@@ -0,0 +1,6 @@
++CONFIG -= qt
++CONFIG += console
++
++SOURCES += main.cpp
++
++LIBS += -ldouble-conversion
+--- /dev/null
++++ b/config.tests/double-conversion/main.cpp
+@@ -0,0 +1,9 @@
++#include <double-conversion/bignum.h>
++
++using namespace double_conversion;
++
++int main(int, char**)
++{
++    Bignum num;
++    return 0;
++}
+--- a/qtdeclarative.pro
++++ b/qtdeclarative.pro
+@@ -1,3 +1,9 @@
+ CONFIG += tests_need_tools examples_need_tools
++
++linux {
++    load(configure)
++    qtCompileTest(double-conversion)
++}
++
+ load(qt_parts)
+ 
+--- a/src/qml/jsruntime/jsruntime.pri
++++ b/src/qml/jsruntime/jsruntime.pri
+@@ -111,4 +111,9 @@ valgrind {
+ 
+ ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
+ 
+-include(../../3rdparty/double-conversion/double-conversion.pri)
++config_double-conversion {
++    DEFINES += SYSTEM_DOUBLECONVERSION
++    LIBS += -ldouble-conversion
++} else {
++    include(../../3rdparty/double-conversion/double-conversion.pri)
++}
+--- a/src/qml/jsruntime/qv4numberobject.cpp
++++ b/src/qml/jsruntime/qv4numberobject.cpp
+@@ -36,7 +36,12 @@
+ #include <QtCore/qmath.h>
+ #include <QtCore/QDebug>
+ #include <cassert>
++
++#ifdef SYSTEM_DOUBLECONVERSION
++#include <double-conversion/double-conversion.h>
++#else
+ #include <double-conversion.h>
++#endif
+ 
+ using namespace QV4;
+ 
+--- a/src/qml/jsruntime/qv4runtime.cpp
++++ b/src/qml/jsruntime/qv4runtime.cpp
+@@ -58,7 +58,11 @@
+ #include <typeinfo>
+ #include <stdlib.h>
+ 
+-#include "../../3rdparty/double-conversion/double-conversion.h"
++#ifdef SYSTEM_DOUBLECONVERSION
++#include <double-conversion/double-conversion.h>
++#else
++#include <double-conversion.h>
++#endif
+ 
+ QT_BEGIN_NAMESPACE
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f53cb32
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+check_system_double-conversion.patch

-- 
qtdeclarative packaging