diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-09-17 00:22:14 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-09-17 00:22:14 -0300 |
| commit | 1e9b5ce971e967278835c7207818cd48f0a3cd2c (patch) | |
| tree | 40d4aadd7e0b02cafa11279efa1efb10db085277 | |
| parent | 6792bb2177f09309bb7d1f920d4123609624483f (diff) | |
| download | qt5webkit-1e9b5ce971e967278835c7207818cd48f0a3cd2c.tar.gz | |
Remove hppa_wtf-dtoa-utils.diff, applied upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/hppa_wtf-dtoa-utils.diff | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index f9902ca..8d5ec82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ qtwebkit-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium * New upstream release. * Bump Qt build dependencies. * Refresh patches. + * Remove hppa_wtf-dtoa-utils.diff, applied upstream. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 07 Sep 2014 16:03:34 +0400 diff --git a/debian/patches/hppa_wtf-dtoa-utils.diff b/debian/patches/hppa_wtf-dtoa-utils.diff deleted file mode 100644 index e8ae202..0000000 --- a/debian/patches/hppa_wtf-dtoa-utils.diff +++ /dev/null @@ -1,19 +0,0 @@ -Description: Add HPPA to the list of archs that define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS -Author: John David Anglin <dave.anglin@bell.net> -Forwarded: https://codereview.qt-project.org/88932 -Bug-Debian: http://bugs.debian.org/753409 -Reviewed-By: Lisandro Damián Nicanor Pérez Meyer <lisandro@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) || CPU(MIPS64) || CPU(AARCH64) -+#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/series b/debian/patches/series index ffb1f9e..2f363ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,4 @@ reduce_memory_usage.patch no_gc_sections.diff hurd.diff webkit_qt_hide_symbols.diff -hppa_wtf-dtoa-utils.diff fix_nonlinux_glibc_linkage.diff |