summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/dyson-MathExtras.h.patch34
-rw-r--r--debian/patches/dyson-yield.patch13
-rw-r--r--debian/patches/series2
4 files changed, 51 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a002a5b..59805c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtwebkit (2.2.1-7+dyson1) UNRELEASED; urgency=low
* Package for Dyson
* Added dyson-solaris-use-system-malloc.patch
+ * Added dyson-yield.patch
+ * Added dyson-MathExtras.h.patch
-- Igor Pashev <pashev.igor@gmail.com> Tue, 03 Dec 2013 23:54:22 +0400
diff --git a/debian/patches/dyson-MathExtras.h.patch b/debian/patches/dyson-MathExtras.h.patch
new file mode 100644
index 0000000..0fedbd7
--- /dev/null
+++ b/debian/patches/dyson-MathExtras.h.patch
@@ -0,0 +1,34 @@
+Index: qtwebkit/Source/JavaScriptCore/wtf/MathExtras.h
+===================================================================
+--- qtwebkit.orig/Source/JavaScriptCore/wtf/MathExtras.h 2011-12-25 23:12:15.000000000 +0400
++++ qtwebkit/Source/JavaScriptCore/wtf/MathExtras.h 2013-12-04 08:14:27.896528418 +0400
+@@ -81,20 +81,6 @@
+
+ #endif
+
+-#if OS(SOLARIS)
+-
+-#ifndef isfinite
+-inline bool isfinite(double x) { return finite(x) && !isnand(x); }
+-#endif
+-#ifndef isinf
+-inline bool isinf(double x) { return !finite(x) && !isnand(x); }
+-#endif
+-#ifndef signbit
+-inline bool signbit(double x) { return copysign(1.0, x) < 0; }
+-#endif
+-
+-#endif
+-
+ #if OS(OPENBSD)
+
+ #ifndef isfinite
+@@ -248,7 +234,7 @@
+ return static_cast<int>(std::min(value, static_cast<unsigned>(std::numeric_limits<int>::max())));
+ }
+
+-#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
++#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SYMBIAN)
+ using std::isfinite;
+ using std::isinf;
+ using std::isnan;
diff --git a/debian/patches/dyson-yield.patch b/debian/patches/dyson-yield.patch
new file mode 100644
index 0000000..ea2382d
--- /dev/null
+++ b/debian/patches/dyson-yield.patch
@@ -0,0 +1,13 @@
+Index: qtwebkit/Source/JavaScriptCore/wtf/Threading.h
+===================================================================
+--- qtwebkit.orig/Source/JavaScriptCore/wtf/Threading.h 2011-12-25 23:12:15.000000000 +0400
++++ qtwebkit/Source/JavaScriptCore/wtf/Threading.h 2013-12-04 00:02:08.543936471 +0400
+@@ -113,6 +113,8 @@
+ using WTF::currentThread;
+ using WTF::detachThread;
+ using WTF::waitForThreadCompletion;
++#if !OS(SOLARIS)
+ using WTF::yield;
++#endif
+
+ #endif // Threading_h
diff --git a/debian/patches/series b/debian/patches/series
index 4717e52..53305bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,5 @@ hurd.diff
webkit_qt_hide_symbols.diff
ignore-unused-local-typedefs_error.diff
dyson-solaris-use-system-malloc.patch
+dyson-yield.patch
+dyson-MathExtras.h.patch