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

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Sep 29 19:55:37 UTC 2014


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

The following commit has been merged in the master branch:
commit debbe81d144930c1306773de53395fcd18560f37
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 16:55:07 2014 -0300

    Remove double_conversion_correct_double_operations.patch
    
    Applied upstream.
---
 debian/changelog                                   |  4 +++-
 ...uble_conversion_correct_double_operations.patch | 22 ----------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6430f14..881a0b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
   * Respect the number of parralel builds specified in DEB_BUILD_OPTIONS
     (Closes: #761821).
     - Remove bound_cpu_usage.patch as this is now not needed.
-  * Remove upstream_changeset_119798.diff, already present in this version.
+  * Remove patches already present in this version.
+    - upstream_changeset_119798.diff
+    - double_conversion_correct_double_operations.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Sep 2014 11:20:39 -0300
 
diff --git a/debian/patches/double_conversion_correct_double_operations.patch b/debian/patches/double_conversion_correct_double_operations.patch
deleted file mode 100644
index 60bdcc9..0000000
--- a/debian/patches/double_conversion_correct_double_operations.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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)

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list