[Libreoffice-commits] core.git: external/libmwaw external/libwps

[Libreoffice Gerrit user]

 external/libmwaw/UnpackedTarball_libmwaw.mk                 |    6 --
 external/libmwaw/libmwaw_android_arm.patch.1                |   20 -------
 external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 |   34 ------------
 external/libwps/UnpackedTarball_libwps.mk                   |    6 --
 4 files changed, 66 deletions(-)

New commits:
commit 6619fa914fed096326bd88d970660d40bbfae729
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jan 15 14:47:30 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jan 15 22:31:02 2019 +0100

    Revert "Fix nan is not a member of std when building android"
    
    This reverts commit cc2bc0bf3cf75307aaa04f4dc8ddce8db678b450.  As discussed at
    <https://gerrit.libreoffice.org/#/c/55783/> "Fix nan is not a member of std when
    building android":
    
    Stephan: "with exactly what architecture and toolchain did that failure happen;
    is this commit still relevant after <https://gerrit.libreoffice.org/plugins/
    gitiles/core/+/312eeeee42cb4a1e356943e17305555e41afc4ef%5E!/> 'Switch Android
    armeabi-v7a to libc++/libc++abi/libunwind too'?"
    
    Tomaž: "It was a consequence of that limited Bionic libstdc++ that was used in
    ANdorid. libc++ should be a modern up-to-date replacements so I guess this
    workaraunds are now obsolete and irrelevant."
    
    (And a --with-distro=LibreOfficeAndroid build against NDK r16b indeed succeeded
    for me with this revert.)
    
    Conflicts:
            external/libwps/UnpackedTarball_libwps.mk
    
    Change-Id: I2dba64e5712b20fa07f6374ae01c226025c52d8b
    Reviewed-on: https://gerrit.libreoffice.org/66390
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 56b723a3dd16..bb39a27382b9 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -41,10 +41,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
 	external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
 ))
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-    external/libmwaw/libmwaw_android_arm.patch.1 \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw_android_arm.patch.1 b/external/libmwaw/libmwaw_android_arm.patch.1
deleted file mode 100644
index 23582dd1535e..000000000000
--- a/external/libmwaw/libmwaw_android_arm.patch.1
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/lib/MultiplanParser.cxx
-+++ b/src/lib/MultiplanParser.cxx
-@@ -747,7 +747,7 @@ bool MultiplanParser::readSharedData(int pos, int cellType, MWAWVec2i const &cel
-         f << "Nan" << input->readULong(1) << ",";
-         input->seek(7, librevenge::RVNG_SEEK_CUR);
-         content.m_contentType=content.C_NUMBER;
--        content.setValue(std::nan(""));
-+        content.setValue(nan(""));
-       }
-       break;
-     case 3:
-@@ -1594,7 +1594,7 @@ bool MultiplanParser::sendCell(MWAWVec2i const &cellPos, int p)
-     f << name << ",";
-   }
-   else if ((type&0x3)==2 && dSz==8) {
--    content.setValue(std::nan(""));
-+    content.setValue(nan(""));
-     f << "Nan" << input->readULong(1) << ",";
-     input->seek(7, librevenge::RVNG_SEEK_CUR);
-   }
diff --git a/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 b/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
deleted file mode 100644
index f668a5251eba..000000000000
--- a/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
+++ /dev/null
@@ -1,34 +0,0 @@
-From 11d84de5628a6afaebdf85e09791221888e641f4 Mon Sep 17 00:00:00 2001
-From: Mert Tumer <merttumer at outlook.com>
-Date: Wed, 13 Jun 2018 17:32:15 -0700
-Subject: Fix nan is not a member of std
-
----
- src/lib/Multiplan.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 26ceca3..11f83c8 100644
---- a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -2222,7 +2222,7 @@ bool MultiplanParser::readSharedData(int pos, int cellType, Vec2i const &cellPos
- 				f << "Nan" << libwps::readU8(input) << ",";
- 				input->seek(7, librevenge::RVNG_SEEK_CUR);
- 				content.m_contentType=content.C_NUMBER;
--				content.setValue(std::nan(""));
-+				content.setValue(nan(""));
- 			}
- 			break;
- 		case 3:
-@@ -2622,7 +2622,7 @@ bool MultiplanParser::sendCell(Vec2i const &cellPos, int p)
- 	}
- 	else if (type==2 && dSz==8)
- 	{
--		content.setValue(std::nan(""));
-+		content.setValue(nan(""));
- 		f << "Nan" << int(libwps::readU8(input)) << ",";
- 		input->seek(7, librevenge::RVNG_SEEK_CUR);
- 	}
--- 
-2.17.1
-
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index f982c778a218..d712f25406bd 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,10 +35,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
 endif
 endif
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
-    external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 \
-))
-endif
-
 # vim: set noet sw=4 ts=4: