diff options
author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-07-02 10:51:34 -0300 |
---|---|---|
committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-07-02 10:51:34 -0300 |
commit | b33c89057406348bc0eedfeb6ef634dba1637f85 (patch) | |
tree | 793a1fed6dfc4fb9e2626919481aed431de5f92d | |
parent | fea4c822377468da9e57a4ef855969299d4fc3cf (diff) | |
download | qt5webkit-b33c89057406348bc0eedfeb6ef634dba1637f85.tar.gz |
Add hppa_wtf-dtoa-utils.diff to solve a FTBFS in HPPA.
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/patches/hppa_wtf-dtoa-utils.diff | 45 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aa4086c..3900ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qtwebkit-opensource-src (5.3.1+dfsg-2) UNRELEASED; urgency=medium + [ Lisandro Damián Nicanor Pérez Meyer ] + * Add hppa_wtf-dtoa-utils.diff to solve a FTBFS in HPPA (Closes: #753409). + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 02 Jul 2014 10:17:21 -0300 qtwebkit-opensource-src (5.3.1+dfsg-1) unstable; urgency=medium diff --git a/debian/patches/hppa_wtf-dtoa-utils.diff b/debian/patches/hppa_wtf-dtoa-utils.diff new file mode 100644 index 0000000..e063ea9 --- /dev/null +++ b/debian/patches/hppa_wtf-dtoa-utils.diff @@ -0,0 +1,45 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + qtwebkit-opensource-src (5.3.1+dfsg-1) unstable; urgency=medium + . + [ Lisandro Damián Nicanor Pérez Meyer ] + * New upstream release. + * Bump Qt build dependencies, using qtbase-private-dev >= 5.3.1 to get + qtbase-abi-5-3-1. + * Update symbols files with buildds' logs. + * Switch amd64's debugging symbols to stabs again. I can't build dwarf + symbols anymore due to lack of RAM, and I doubt our buildds could too. + . + [ Alf Gaida ] + * Fix QML module's install file. +Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- 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)
\ No newline at end of file diff --git a/debian/patches/series b/debian/patches/series index e56edc3..56ad92f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ reduce_memory_usage.patch no_gc_sections.diff hurd.diff webkit_qt_hide_symbols.diff +hppa_wtf-dtoa-utils.diff |