diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/libqxp/android-workaround.patch.1 | |
parent | Initial commit. (diff) | |
download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | external/libqxp/android-workaround.patch.1 | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/external/libqxp/android-workaround.patch.1 b/external/libqxp/android-workaround.patch.1 new file mode 100644 index 000000000..5c7529c20 --- /dev/null +++ b/external/libqxp/android-workaround.patch.1 @@ -0,0 +1,49 @@ +--- libqxp.orig/src/lib/QXP4Parser.cpp 2017-08-28 10:12:26.009868397 +0200 ++++ libqxp/src/lib/QXP4Parser.cpp 2017-08-28 10:12:39.577681705 +0200 +@@ -16,6 +16,7 @@ + #include "QXP4Header.h" + #include "QXPCollector.h" + #include "QXPMemoryStream.h" ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/QXPParser.cpp 2017-08-28 10:11:14.074858068 +0200 ++++ libqxp/src/lib/QXPParser.cpp 2017-08-28 10:18:04.849203430 +0200 +@@ -14,6 +14,7 @@ + + #include <cmath> + #include <memory> ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/QXPTypes.cpp 2017-08-26 08:38:40.000000000 +0200 ++++ libqxp/src/lib/QXPTypes.cpp 2017-08-28 10:18:37.784749714 +0200 +@@ -11,6 +11,7 @@ + + #include <boost/math/constants/constants.hpp> + #include <cmath> ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/android-compat.h 1970-01-01 01:00:00.000000000 +0100 ++++ libqxp/src/lib/android-compat.h 2017-08-28 10:21:36.766283262 +0200 +@@ -0,0 +1,16 @@ ++#if defined(__ANDROID__) ++namespace std ++{ ++template<typename T> ++T round(T x) ++{ ++ return ::round(x); ++} ++ ++template<typename T> ++T hypot(T x, T y) ++{ ++ return ::hypot(x, y); ++} ++} ++#endif |