[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-1-4-g407e3df

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=407e3df

The following commit has been merged in the master branch:
commit 407e3df593d0d219c3ab73b638bf4ef773e8be90
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 3 09:28:05 2014 -0300

    Added some other patches used in qt5webkit.
---
 debian/changelog                                   |  3 +++
 ...uble_conversion_correct_double_operations.patch | 22 ++++++++++++++++++++++
 debian/patches/fix_nonlinux_glibc_linkage.diff     | 14 ++++++++++++++
 debian/patches/reduce_memory_usage.patch           | 19 +++++++++++++++++++
 debian/patches/series                              |  3 +++
 5 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e95cf4..f051b8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtwebkit (2.3.2.dfsg-2) UNRELEASED; urgency=medium
   * Update patches from qtwebkit-opensource-src, we are having the same
     codebase here.
     - Updated no_gc_sections.diff.
+    - Added fix_nonlinux_glibc_linkage.diff,
+      double_conversion_correct_double_operations.patch and
+      reduce_memory_usage.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Sep 2014 09:04:23 -0300
 
diff --git a/debian/patches/double_conversion_correct_double_operations.patch b/debian/patches/double_conversion_correct_double_operations.patch
new file mode 100644
index 0000000..60bdcc9
--- /dev/null
+++ b/debian/patches/double_conversion_correct_double_operations.patch
@@ -0,0 +1,22 @@
+Description: Add archs to the list of archs that define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
+ This patch is an acumulative of all the archs that need to specify this flag.
+ The works is based on various patches.
+Author: John David Anglin <dave.anglin at bell.net>
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://codereview.qt-project.org/88932
+Bug-Debian: http://bugs.debian.org/753409
+Reviewed-By: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+
+---
+
+--- qtwebkit-opensource-src-5.3.1+dfsg.orig/Source/WTF/wtf/dtoa/utils.h
++++ qtwebkit-opensource-src-5.3.1+dfsg/Source/WTF/wtf/dtoa/utils.h
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) || CPU(HPPA)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff --git a/debian/patches/fix_nonlinux_glibc_linkage.diff b/debian/patches/fix_nonlinux_glibc_linkage.diff
new file mode 100644
index 0000000..09f6c05
--- /dev/null
+++ b/debian/patches/fix_nonlinux_glibc_linkage.diff
@@ -0,0 +1,14 @@
+Author: Sune Vuorela
+Description: Ensures we link with rt on all the platforms where we 
+have glibc. Not yet upstreamed. Requires a upstreamming of the gnukfreebsd patch
+--- a/Source/WebKit2/WebKit2.pri
++++ b/Source/WebKit2/WebKit2.pri
+@@ -71,7 +71,7 @@ INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Sourc
+ 
+ INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
+ 
+-linux-*: {
++linux-*:!android|hurd-*|gnukfreebsd-* {
+     # -lrt is required for shm_open and shm_unlink.
+     LIBS += -lrt
+ }
diff --git a/debian/patches/reduce_memory_usage.patch b/debian/patches/reduce_memory_usage.patch
new file mode 100644
index 0000000..5ebde22
--- /dev/null
+++ b/debian/patches/reduce_memory_usage.patch
@@ -0,0 +1,19 @@
+Description: force ld to not cache symbols tables.
+ This patch, wich should be considered Debian-only (in other words, it should
+ not be pushed upstream), forces ld to not cache the symbol tables of input
+ files in memory to avoid memory exhaustion during the linking phase.
+ .
+ This might make linking slower but reducing the overall memory consumption.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-03-05
+
+--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
++++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -44,3 +44,6 @@ isEqual(QT_ARCH,i386):CONFIG(debug, debu
+ }
+ 
+ load(default_post)
++
++# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
++QMAKE_LFLAGS += -Wl,--no-keep-memory
diff --git a/debian/patches/series b/debian/patches/series
index e99cc08..4a5a255 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,6 @@ ignore-unused-local-typedefs_error.diff
 gstreamer-1.0.diff
 hide_wtf_symbols.diff
 hide_jsc_symbols.diff
+fix_nonlinux_glibc_linkage.diff
+double_conversion_correct_double_operations.patch
+reduce_memory_usage.patch

-- 
QtWebKit packaging