Verified Commit 00075f84 authored by Max Rees's avatar Max Rees

user/libreoffice: [CVE] bump to 6.4.0.3 (#151)

* GTK+2 VCL plugin has been dropped upstream; move to GTK+3
* When porting 6.3.x.x, the Serbian and Serbian (Latin) translations did
  not build correctly, so they have been disabled for the time being.

* Pin subpackage versions to eachother
* Remove paxmark
* makedepends changelog:
  + autoconf
  + automake
  + libqrcodegen
  ~ mdds~1.5
  - paxmark

  - gtk+2.0-dev
  - gdk-pixbuf-dev
  + gtk+3.0-dev
  + mesa-dev

  ~ liborcus-dev~0.15
parent 38c71c75
This diff is collapsed.
After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
return loaded;
^~~~~~
--- lo/sfx2/source/appl/shutdownicon.cxx.orig 2018-06-19 22:27:30 UTC
+++ lo/sfx2/source/appl/shutdownicon.cxx
@@ -167,7 +167,7 @@ bool LoadModule()
#endif // ENABLE_QUICKSTART_APPLET
}
assert(!boost::logic::indeterminate(loaded));
- return loaded;
+ return bool{loaded};
}
}
--- libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-10 16:08:33.000000000 -0400 --- libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2019-08-29 16:51:57.000000000 -0500
+++ libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-18 15:25:41.030304773 -0400 +++ libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2019-09-12 20:46:12.114022513 -0500
@@ -760,14 +760,13 @@ void SvmTest::checkBitmaps(const GDIMeta @@ -896,14 +896,13 @@ void SvmTest::checkBitmaps(const GDIMeta
xmlDocPtr pDoc = dumpMeta(rMetaFile); }
#endif
#ifdef LINUX - assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", crc1}});
- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); + assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}});
+ assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},});
assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", { assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"} - {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", crc2}
+ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, + {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}
}); });
assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", { assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", {
{"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
{"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, - {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"},
- {"crc", "5e01ddcc"} - {"crc", crc3}
+ {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}
}); });
#else }
assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
@@ -816,16 +815,16 @@ void SvmTest::checkBitmapExs(const GDIMe @@ -973,33 +972,33 @@ void SvmTest::checkBitmapExs(const GDIMe
}
#ifdef LINUX
assertXPathAttrs(pDoc, "/metafile/bmpex[1]", { assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
- {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"} - {"x", "1"}, {"y", "1"}, {"crc", aExpectedCRC[0]}, {"transparenttype", "bitmap"}
+ {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"} + {"x", "1"}, {"y", "1"}, {"transparenttype", "bitmap"}
}); });
assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", { assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
{"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"x", "5"}, {"y", "0"}, {"width", "2"}, {"height", "3"},
- {"crc", "281fc589"}, {"transparenttype", "bitmap"} - {"crc", aExpectedCRC[1]}, {"transparenttype", "bitmap"}
+ {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"}
}); });
assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", { assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", {
{"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, {"destx", "7"}, {"desty", "1"}, {"destwidth", "2"}, {"destheight", "2"},
{"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, {"srcx", "0"}, {"srcy", "0"}, {"srcwidth", "3"}, {"srcheight", "4"},
- {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"} - {"crc", aExpectedCRC[2]}, {"transparenttype", "bitmap"}
+ {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"}
}); });
#else
assertXPathAttrs(pDoc, "/metafile/bmpex[1]", { #ifndef MACOSX
assertXPathAttrs(pDoc, "/metafile/bmpex[2]", {
- {"x", "6"}, {"y", "6"}, {"crc", aExpectedCRC[3]}, {"transparenttype", "bitmap"}
+ {"x", "6"}, {"y", "6"}, {"transparenttype", "bitmap"}
});
assertXPathAttrs(pDoc, "/metafile/bmpex[3]", {
- {"x", "0"}, {"y", "6"}, {"crc", aExpectedCRC[4]}, {"transparenttype", "bitmap"}
+ {"x", "0"}, {"y", "6"}, {"transparenttype", "bitmap"}
});
assertXPathAttrs(pDoc, "/metafile/bmpex[4]", {
- {"x", "2"}, {"y", "6"}, {"crc", aExpectedCRC[5]}, {"transparenttype", "bitmap"}
+ {"x", "2"}, {"y", "6"}, {"transparenttype", "bitmap"}
});
assertXPathAttrs(pDoc, "/metafile/bmpex[5]", {
- {"x", "0"}, {"y", "8"}, {"crc", aExpectedCRC[6]}, {"transparenttype", "bitmap"}
+ {"x", "0"}, {"y", "8"}, {"transparenttype", "bitmap"}
});
assertXPathAttrs(pDoc, "/metafile/bmpex[6]", {
- {"x", "2"}, {"y", "8"}, {"crc", aExpectedCRC[7]}, {"transparenttype", "bitmap"}
+ {"x", "2"}, {"y", "8"}, {"transparenttype", "bitmap"}
});
#endif
}
We don't have MariaDB yet and there is no ./configure option for it We don't have MariaDB yet and there is no ./configure option for it
--- libreoffice-6.2.1.2/configure.ac --- libreoffice-6.2.3.2/configure.ac
+++ libreoffice-6.2.1.2/configure.ac +++ libreoffice-6.2.3.2/configure.ac
@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION) @@ -8471,7 +8471,7 @@
AC_SUBST(PYTHON_VERSION_MAJOR) AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR) AC_SUBST(PYTHON_VERSION_MINOR)
-ENABLE_MARIADBC=TRUE -ENABLE_MARIADBC=TRUE
+ENABLE_MARIADBC= +ENABLE_MARIADBC=
if test "$_os" = "Android" -o "$_os" = "iOS"; then if test "$_os" = "Android" -o "$_os" = "iOS" -o "$enable_mpl_subset" = "yes"; then
ENABLE_MARIADBC= ENABLE_MARIADBC=
fi fi
From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 05 Mar 2019 17:28:55 +0200
Subject: [PATCH] Make mysqlc conditional on MARIADBC, too
Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794
Reviewed-on: https://gerrit.libreoffice.org/68764
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/68783
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
---
diff --git a/Repository.mk b/Repository.mk
index 36b35b7..f4899a1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -404,7 +404,7 @@
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
$(if $(ENABLE_JAVA),mysql_jdbc) \
- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
numbertext \
odbc \
odfflatxml \
--- libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -21,7 +21,7 @@
#include <dbus/dbus.h>
#include <errno.h>
#include <fcntl.h>
- #include <sys/unistd.h>
+ #include <unistd.h>
#include <sys/socket.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
--- libreoffice-6.2.1.2/configure.ac --- libreoffice-6.4.0.3/configure.ac 2020-01-22 23:14:16.000000000 +0000
+++ libreoffice-6.2.1.2/configure.ac +++ libreoffice-6.4.0.3/configure.ac 2020-02-04 04:09:34.970114523 +0000
@@ -462,7 +462,7 @@ if test -n "$with_android_ndk"; then @@ -612,7 +612,7 @@ solaris*)
# (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if
# all objects have been built with debug information.)
case $build_os in
- linux-gnu*)
+ linux-gnu*|linux-musl*)
ndk_build_os=linux
;;
darwin*)
@@ -592,7 +592,7 @@ solaris*)
fi fi
;; ;;
-linux-gnu*|k*bsd*-gnu*) -linux-gnu*|k*bsd*-gnu*)
+linux-gnu*|linux-musl*|k*bsd*-gnu*) +linux-gnu*|linux-musl*|k*bsd*-gnu*)
test_gtk=yes
build_gstreamer_1_0=yes build_gstreamer_1_0=yes
build_gstreamer_0_10=yes test_kf5=yes
@@ -4149,7 +4149,7 @@ kfreebsd*) test_gtk3_kde5=yes
@@ -4341,7 +4341,7 @@ kfreebsd*)
esac esac
;; ;;
...@@ -27,16 +18,7 @@ ...@@ -27,16 +18,7 @@
COM=GCC COM=GCC
USING_X11=TRUE USING_X11=TRUE
OS=LINUX OS=LINUX
@@ -7277,7 +7277,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN @@ -10232,21 +10232,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA)
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
- linux-gnu*)
+ linux-gnu*|linux-musl*)
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
@@ -9854,21 +9854,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA)
AC_SUBST(ENABLE_LIBNUMBERTEXT) AC_SUBST(ENABLE_LIBNUMBERTEXT)
AC_SUBST(LIBNUMBERTEXT_CFLAGS) AC_SUBST(LIBNUMBERTEXT_CFLAGS)
...@@ -58,12 +40,3 @@ ...@@ -58,12 +40,3 @@
dnl ========================================= dnl =========================================
dnl Check for uuidgen dnl Check for uuidgen
dnl ========================================= dnl =========================================
@@ -12828,7 +12813,7 @@ else
case "$host_os" in
- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
if test "$ENABLE_JAVA" != ""; then
pathmunge "$JAVA_HOME/bin" "after"
fi
--- libreoffice-6.3.1.2/svl/source/misc/msodocumentlockfile.cxx 2019-08-29 16:51:57.000000000 -0500
+++ libreoffice-6.3.1.2/svl/source/misc/msodocumentlockfile.cxx 2019-09-15 04:19:32.593900468 -0500
@@ -12,6 +12,7 @@
#include <algorithm>
#include <ucbhelper/content.hxx>
#include <comphelper/processfactory.hxx>
+#include <oox/helper/helper.hxx>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
@@ -220,7 +221,7 @@ LockFileEntry MSODocumentLockFile::GetLo
const int nACPLen = aBuf[0];
if (nACPLen > 0 && nACPLen <= 52) // skip wrong format
{
- const sal_Int8* pBuf = aBuf.getConstArray() + 54;
+ sal_Int8* pBuf = aBuf.getArray() + 54;
int nUTF16Len = *pBuf; // try Word position
// If UTF-16 length is 0x20, then ACP length is also less than maximal, which means
// that in Word lockfile case, at least two preceding bytes would be zero. Both
@@ -228,9 +229,12 @@ LockFileEntry MSODocumentLockFile::GetLo
if (nUTF16Len == 0x20 && (*(pBuf - 1) != 0 || *(pBuf - 2) != 0))
nUTF16Len = *++pBuf; // use Excel/PowerPoint position
- if (nUTF16Len > 0 && nUTF16Len <= 52) // skip wrong format
+ if (nUTF16Len > 0 && nUTF16Len <= 52) { // skip wrong format
+ oox::ByteOrderConverter::convertLittleEndianArray(
+ reinterpret_cast<sal_Unicode*>(pBuf + 2), nUTF16Len);
aResult[LockFileComponent::OOOUSERNAME]
= OUString(reinterpret_cast<const sal_Unicode*>(pBuf + 2), nUTF16Len);
+ }
}
}
return aResult;
From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Wed, 4 Dec 2019 02:37:40 +0100
Subject: [PATCH] Fix build with poppler-0.83
Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
Reviewed-on: https://gerrit.libreoffice.org/84384
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++
3 files changed, 15 insertions(+)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 26048177e87d..e9c2a407c279 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
gfree(pBuf);
}
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+void PDFOutDev::printPath( const GfxPath* pPath )
+#else
void PDFOutDev::printPath( GfxPath* pPath )
+#endif
{
int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
for( int i=0; i<nSubPaths; i++ )
{
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+ const
+#endif
GfxSubpath* pSub = pPath->getSubpath( i );
const int nPoints = pSub->getNumPoints();
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 02f6b59f6f15..2e7d2186f9a1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -149,7 +149,11 @@ namespace pdfi
int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
void writeFontFile( GfxFont* gfxFont ) const;
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+ static void printPath( const GfxPath* pPath );
+#else
static void printPath( GfxPath* pPath );
+#endif
public:
explicit PDFOutDev( PDFDoc* pDoc );
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 42178b650cdd..b1a54bd09c5f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -68,7 +68,11 @@ int main(int argc, char **argv)
}
// read config file
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+ globalParams = std::make_unique<GlobalParams>();
+#else
globalParams = new GlobalParams();
+#endif
globalParams->setErrQuiet(true);
#if defined(_MSC_VER)
globalParams->setupBaseFonts(nullptr);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment