download.lst | 4
external/libqxp/0001-WaE-narrowing-conversion.patch.1 | 28
---
external/libqxp/0001-add-missing-includes.patch.1 | 37
----
external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1 | 89
----------
external/libqxp/ExternalProject_libqxp.mk | 5
external/libqxp/UnpackedTarball_libqxp.mk | 5
6 files changed, 4 insertions(+), 164 deletions(-)
New commits:
commit e6ae294d1d283783eaa9e537091d6fa648821fb0
Author: David Tardon <dtar...@redhat.com>
Date: Tue Jan 2 13:43:18 2018 +0100
upload libqxp 0.0.1
Change-Id: I44f94ea59e2b7a7f9fb5c2c74268fbe4601936b3
Reviewed-on: https://gerrit.libreoffice.org/47258
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit c576312aa60c8ffbae7628ad1a86155a96266356)
Reviewed-on: https://gerrit.libreoffice.org/47353
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/download.lst b/download.lst
index 1ee0c025237c..945fa24b65a8 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export POSTGRESQL_SHA256SUM :=
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f0
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
export PYTHON_SHA256SUM :=
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
export PYTHON_TARBALL := Python-3.5.4.tgz
-export QXP_SHA256SUM :=
0dd32afbf1c889debc28848b260c1bdc0eba5f57504476b787e164f7c59776d5
-export QXP_TARBALL := libqxp-0.0.0.tar.xz
+export QXP_SHA256SUM :=
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
+export QXP_TARBALL := libqxp-0.0.1.tar.xz
export RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
export RASQAL_SHA256SUM :=
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/libqxp/0001-WaE-narrowing-conversion.patch.1
b/external/libqxp/0001-WaE-narrowing-conversion.patch.1
deleted file mode 100644
index 0c73c0501f3c..000000000000
--- a/external/libqxp/0001-WaE-narrowing-conversion.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d0b78eb855dc3797e614a72019afbebbebc536a Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Mon, 28 Aug 2017 08:58:10 +0200
-Subject: [PATCH] WaE: narrowing conversion
-
-error C2398: Element '3': conversion from 'unsigned __int64' to 'unsigned
long' requires a narrowing conversion
----
- src/lib/QXPContentCollector.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/QXPContentCollector.cpp b/src/lib/QXPContentCollector.cpp
-index 6a227a6..9c3076d 100644
---- a/src/lib/QXPContentCollector.cpp
-+++ b/src/lib/QXPContentCollector.cpp
-@@ -943,7 +943,9 @@ void QXPContentCollector::drawText(const
std::shared_ptr<Text> &text, const Link
- break;
- }
-
-- const unsigned long spanTextEnd = std::min<unsigned long>({
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(),
textEnd });
-+ const auto spanTextEnd = static_cast<unsigned long>(
-+ std::min<uint64_t>({
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(),
textEnd })
-+ );
-
- if (charFormat.format->isControlChars)
- {
---
-2.13.0
-
diff --git a/external/libqxp/0001-add-missing-includes.patch.1
b/external/libqxp/0001-add-missing-includes.patch.1
deleted file mode 100644
index c5dbeb535fdf..000000000000
--- a/external/libqxp/0001-add-missing-includes.patch.1
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5658a197de7dd7827e6cb2ba9acd8ed7934e9e83 Mon Sep 17 00:00:00 2001
-From: Aleksas Pantechovskis <alex.pan...@gmail.com>
-Date: Sun, 27 Aug 2017 22:55:00 +0300
-Subject: [PATCH] add missing includes
-
----
- src/lib/QXPBlockParser.cpp | 1 +
- src/lib/QXPContentCollector.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/lib/QXPBlockParser.cpp b/src/lib/QXPBlockParser.cpp
-index a9a8c9b..d0a58e7 100644
---- a/src/lib/QXPBlockParser.cpp
-+++ b/src/lib/QXPBlockParser.cpp
-@@ -13,6 +13,7 @@
- #include <algorithm>
- #include <memory>
- #include <vector>
-+#include <iterator>
-
- #include "QXPHeader.h"
- #include "QXPMemoryStream.h"
-diff --git a/src/lib/QXPContentCollector.cpp b/src/lib/QXPContentCollector.cpp
-index 0a5a2c9..6a227a6 100644
---- a/src/lib/QXPContentCollector.cpp
-+++ b/src/lib/QXPContentCollector.cpp
-@@ -11,6 +11,7 @@
-
- #include <algorithm>
- #include <utility>
-+#include <iterator>
-
- #include <boost/range/adaptor/reversed.hpp>
- #include <boost/variant.hpp>
---
-2.7.4
-
diff --git
a/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
b/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
deleted file mode 100644
index 40e4ee179ac8..000000000000
--- a/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
+++ /dev/null
@@ -1,89 +0,0 @@
-From 4118cfa23d2e251278a55f7fd44c246c84c41ab5 Mon Sep 17 00:00:00 2001
-From: Aleksas Pantechovskis <alex.pan...@gmail.com>
-Date: Sun, 27 Aug 2017 19:39:37 +0300
-Subject: [PATCH] don't use RVNGStringStream in the main lib
-
-librevenge-stream is not used in libreoffice
----
- src/lib/QXP4Parser.cpp | 4 ++--
- src/lib/QXPBlockParser.cpp | 6 +++---
- src/lib/QXPParser.cpp | 1 -
- 3 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/lib/QXP4Parser.cpp b/src/lib/QXP4Parser.cpp
-index c748e3e..3e31951 100644
---- a/src/lib/QXP4Parser.cpp
-+++ b/src/lib/QXP4Parser.cpp
-@@ -15,11 +15,11 @@
- #include "QXP4Deobfuscator.h"
- #include "QXP4Header.h"
- #include "QXPCollector.h"
-+#include "QXPMemoryStream.h"
-
- namespace libqxp
- {
-
--using librevenge::RVNGStringStream;
- using std::make_shared;
- using std::shared_ptr;
-
-@@ -123,7 +123,7 @@ bool QXP4Parser::parsePages(const
std::shared_ptr<librevenge::RVNGInputStream> &
- void QXP4Parser::parseColors(const
std::shared_ptr<librevenge::RVNGInputStream> &docStream)
- {
- unsigned length = readU32(docStream, be);
-- auto stream = make_shared<RVNGStringStream>(readNBytes(docStream, length),
length);
-+ auto stream = make_shared<QXPMemoryStream>(readNBytes(docStream, length),
length);
-
- try
- {
-diff --git a/src/lib/QXPBlockParser.cpp b/src/lib/QXPBlockParser.cpp
-index 58cecb9..a9a8c9b 100644
---- a/src/lib/QXPBlockParser.cpp
-+++ b/src/lib/QXPBlockParser.cpp
-@@ -15,12 +15,12 @@
- #include <vector>
-
- #include "QXPHeader.h"
-+#include "QXPMemoryStream.h"
-
- namespace libqxp
- {
-
- using librevenge::RVNGInputStream;
--using librevenge::RVNGStringStream;
- using std::make_shared;
- using std::vector;
-
-@@ -36,7 +36,7 @@ std::shared_ptr<RVNGInputStream>
QXPBlockParser::getBlock(const uint32_t index)
- {
- seek(m_input, (index - 1) * m_blockLength);
- auto block = readNBytes(m_input, m_blockLength);
-- return make_shared<RVNGStringStream>(block, m_blockLength);
-+ return make_shared<QXPMemoryStream>(block, m_blockLength);
- }
-
- std::shared_ptr<RVNGInputStream> QXPBlockParser::getChain(const uint32_t
index)
-@@ -59,7 +59,7 @@ std::shared_ptr<RVNGInputStream>
QXPBlockParser::getChain(const uint32_t index)
- isBig = nextVal < 0;
- next = abs(nextVal);
- }
-- return make_shared<RVNGStringStream>(chain.data(), chain.size());
-+ return make_shared<QXPMemoryStream>(chain.data(), chain.size());
- }
-
- }
-diff --git a/src/lib/QXPParser.cpp b/src/lib/QXPParser.cpp
-index 54abd7e..9dd90a8 100644
---- a/src/lib/QXPParser.cpp
-+++ b/src/lib/QXPParser.cpp
-@@ -18,7 +18,6 @@
- namespace libqxp
- {
-
--using librevenge::RVNGStringStream;
- using std::make_shared;
-
- QXPParser::QXPParser(const std::shared_ptr<librevenge::RVNGInputStream>
&input, librevenge::RVNGDrawingInterface *painter, const
std::shared_ptr<QXPHeader> &header)
---
-2.7.4
-
diff --git a/external/libqxp/ExternalProject_libqxp.mk
b/external/libqxp/ExternalProject_libqxp.mk
index d9e43727e6ed..d2627c021602 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
--enable-static \
--disable-shared \
--without-docs \
+ --disable-tests \
--disable-tools \
--disable-debug \
--disable-werror \
@@ -36,10 +37,8 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
$(if
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
- REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS='
' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
- ax_cv_cxx_compile_cxx11=yes \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- && $(MAKE) -C src/lib \
+ && $(MAKE) \
)
# vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk
b/external/libqxp/UnpackedTarball_libqxp.mk
index b630fc2981b9..017b21d9f55c 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -13,8 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0))
-$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp))
-
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
@@ -24,9 +22,6 @@ endif
endif
$(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
- external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
\
- external/libqxp/0001-add-missing-includes.patch.1 \
- external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
external/libqxp/android-workaround.patch.1 \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
