libreoffice: start upgrade 5.0.6.3 -> 6.2.6.1
Currently libreoffice-native compiles - we don't know if build is complete yet. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -0,0 +1,132 @@
|
||||
From b5a988f79520d3ea39af37e9d726cf0aafb36019 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 3 Aug 2019 14:51:00 +0200
|
||||
Subject: [PATCH] Workaround boost library detection failures
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
m4/ax_boost_date_time.m4 | 11 +++++------
|
||||
m4/ax_boost_filesystem.m4 | 11 +++++------
|
||||
m4/ax_boost_iostreams.m4 | 11 +++++------
|
||||
m4/ax_boost_locale.m4 | 11 +++++------
|
||||
m4/ax_boost_system.m4 | 11 +++++------
|
||||
5 files changed, 25 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
|
||||
index 9b9ec67..0baac6c 100644
|
||||
--- a/m4/ax_boost_date_time.m4
|
||||
+++ b/m4/ax_boost_date_time.m4
|
||||
@@ -92,12 +92,11 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
|
||||
fi
|
||||
|
||||
else
|
||||
- for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
|
||||
- AC_CHECK_LIB($ax_lib, main,
|
||||
- [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
|
||||
- [link_date_time="no"])
|
||||
- done
|
||||
-
|
||||
+ # ld does not like our LDFLAGS so just trust we set library correctly...
|
||||
+ ax_lib=${ax_boost_user_date_time_lib}
|
||||
+ BOOST_DATE_TIME_LIB="-l$ax_lib"
|
||||
+ AC_SUBST(BOOST_DATE_TIME_LIB)
|
||||
+ link_date_time="yes"
|
||||
fi
|
||||
if test "x$ax_lib" = "x"; then
|
||||
AC_MSG_ERROR(Could not find a version of the boost date_time library!)
|
||||
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
|
||||
index b571f89..3996791 100644
|
||||
--- a/m4/ax_boost_filesystem.m4
|
||||
+++ b/m4/ax_boost_filesystem.m4
|
||||
@@ -96,12 +96,11 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
|
||||
done
|
||||
fi
|
||||
else
|
||||
- for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
|
||||
- AC_CHECK_LIB($ax_lib, exit,
|
||||
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
|
||||
- [link_filesystem="no"])
|
||||
- done
|
||||
-
|
||||
+ # ld does not like our LDFLAGS so just trust we set library correctly...
|
||||
+ ax_lib=${ax_boost_user_filesystem_lib}
|
||||
+ BOOST_FILESYSTEM_LIB="-l$ax_lib"
|
||||
+ AC_SUBST(BOOST_FILESYSTEM_LIB)
|
||||
+ link_filesystem="yes"
|
||||
fi
|
||||
if test "x$ax_lib" = "x"; then
|
||||
AC_MSG_ERROR(Could not find a version of the boost filesystem library!)
|
||||
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
|
||||
index 803d3a3..d165f46 100644
|
||||
--- a/m4/ax_boost_iostreams.m4
|
||||
+++ b/m4/ax_boost_iostreams.m4
|
||||
@@ -95,12 +95,11 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
|
||||
fi
|
||||
|
||||
else
|
||||
- for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
|
||||
- AC_CHECK_LIB($ax_lib, main,
|
||||
- [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
|
||||
- [link_iostreams="no"])
|
||||
- done
|
||||
-
|
||||
+ # ld does not like our LDFLAGS so just trust we set library correctly...
|
||||
+ ax_lib=${ax_boost_user_iostreams_lib}
|
||||
+ BOOST_IOSTREAMS_LIB="-l$ax_lib"
|
||||
+ AC_SUBST(BOOST_IOSTREAMS_LIB)
|
||||
+ link_iostreams="yes"
|
||||
fi
|
||||
if test "x$ax_lib" = "x"; then
|
||||
AC_MSG_ERROR(Could not find a version of the boost iostreams library!)
|
||||
diff --git a/m4/ax_boost_locale.m4 b/m4/ax_boost_locale.m4
|
||||
index adaedf0..468d708 100644
|
||||
--- a/m4/ax_boost_locale.m4
|
||||
+++ b/m4/ax_boost_locale.m4
|
||||
@@ -98,12 +98,11 @@ AC_DEFUN([AX_BOOST_LOCALE],
|
||||
fi
|
||||
|
||||
else
|
||||
- for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do
|
||||
- AC_CHECK_LIB($ax_lib, exit,
|
||||
- [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
|
||||
- [link_locale="no"])
|
||||
- done
|
||||
-
|
||||
+ # ld does not like our LDFLAGS so just trust we set library correctly...
|
||||
+ ax_lib=${ax_boost_user_locale_lib}
|
||||
+ BOOST_LOCALE_LIB="-l$ax_lib"
|
||||
+ AC_SUBST(BOOST_LOCALE_LIB)
|
||||
+ link_locale="yes"
|
||||
fi
|
||||
if test "x$ax_lib" = "x"; then
|
||||
AC_MSG_ERROR(Could not find a version of the library!)
|
||||
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
|
||||
index 139d066..889b05d 100644
|
||||
--- a/m4/ax_boost_system.m4
|
||||
+++ b/m4/ax_boost_system.m4
|
||||
@@ -100,12 +100,11 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
||||
fi
|
||||
|
||||
else
|
||||
- for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
|
||||
- AC_CHECK_LIB($ax_lib, exit,
|
||||
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
||||
- [link_system="no"])
|
||||
- done
|
||||
-
|
||||
+ # ld does not like our LDFLAGS so just trust we set library correctly...
|
||||
+ ax_lib=${ax_boost_user_system_lib}
|
||||
+ BOOST_SYSTEM_LIB="-l$ax_lib"
|
||||
+ AC_SUBST(BOOST_SYSTEM_LIB)
|
||||
+ link_system="yes"
|
||||
fi
|
||||
if test "x$ax_lib" = "x"; then
|
||||
AC_MSG_ERROR(Could not find a version of the boost system library!)
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
From dfba581f6d1dd64fc69ef9db9fc27059366e3f8f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 29 Oct 2015 00:23:24 +0100
|
||||
Subject: [PATCH] update ax_boost scripts to fix configure with system boost
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
m4/ax_boost_base.m4 | 87 +++++++++++++++++++++++++++++++--------------------
|
||||
m4/ax_boost_system.m4 | 6 ++--
|
||||
2 files changed, 56 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
|
||||
index 55de0c4..f3279f2 100644
|
||||
--- a/m4/ax_boost_base.m4
|
||||
+++ b/m4/ax_boost_base.m4
|
||||
@@ -33,7 +33,7 @@
|
||||
# and this notice are preserved. This file is offered as-is, without any
|
||||
# warranty.
|
||||
|
||||
-#serial 20
|
||||
+#serial 26
|
||||
|
||||
AC_DEFUN([AX_BOOST_BASE],
|
||||
[
|
||||
@@ -91,12 +91,29 @@ if test "x$want_boost" = "xyes"; then
|
||||
dnl are found, e.g. when only header-only libraries are installed!
|
||||
libsubdirs="lib"
|
||||
ax_arch=`uname -m`
|
||||
- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = ppc64le -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64; then
|
||||
- libsubdirs="lib64 lib lib64"
|
||||
- fi
|
||||
+ case $ax_arch in
|
||||
+ x86_64)
|
||||
+ libsubdirs="lib64 libx32 lib lib64"
|
||||
+ ;;
|
||||
+ ppc64|s390x|sparc64|aarch64|ppc64le)
|
||||
+ libsubdirs="lib64 lib lib64 ppc64le"
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
|
||||
+ dnl them priority over the other paths since, if libs are found there, they
|
||||
+ dnl are almost assuredly the ones desired.
|
||||
+ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
+ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
|
||||
+
|
||||
+ case ${host_cpu} in
|
||||
+ i?86)
|
||||
+ libsubdirs="lib/i386-${host_os} $libsubdirs"
|
||||
+ ;;
|
||||
+ esac
|
||||
|
||||
dnl first we check the system location for boost libraries
|
||||
- dnl this location is chosen if boost libraries are installed with the --layout=system option
|
||||
+ dnl this location ist chosen if boost libraries are installed with the --layout=system option
|
||||
dnl or if you install boost with RPM
|
||||
if test "$ac_boost_path" != ""; then
|
||||
BOOST_CPPFLAGS="-I$ac_boost_path/include"
|
||||
@@ -106,13 +123,8 @@ if test "x$want_boost" = "xyes"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
- else
|
||||
- if test "$cross_compiling" != yes; then
|
||||
- ac_boost_paths='/usr /usr/local /opt /opt/local'
|
||||
- else
|
||||
- ac_boost_paths="/usr/$host/sys-root/mingw"
|
||||
- fi
|
||||
- for ac_boost_path_tmp in $ac_boost_paths ; do
|
||||
+ elif test "$cross_compiling" != yes; then
|
||||
+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
|
||||
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
|
||||
for libsubdir in $libsubdirs ; do
|
||||
if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||
@@ -161,6 +173,10 @@ if test "x$want_boost" = "xyes"; then
|
||||
dnl if we found no boost with system layout we search for boost libraries
|
||||
dnl built and installed without the --layout=system option or for a staged(not installed) version
|
||||
if test "x$succeeded" != "xyes"; then
|
||||
+ CPPFLAGS="$CPPFLAGS_SAVED"
|
||||
+ LDFLAGS="$LDFLAGS_SAVED"
|
||||
+ BOOST_CPPFLAGS=
|
||||
+ BOOST_LDFLAGS=
|
||||
_version=0
|
||||
if test "$ac_boost_path" != ""; then
|
||||
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
|
||||
@@ -173,33 +189,36 @@ if test "x$want_boost" = "xyes"; then
|
||||
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
||||
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
|
||||
done
|
||||
+ dnl if nothing found search for layout used in Windows distributions
|
||||
+ if test -z "$BOOST_CPPFLAGS"; then
|
||||
+ if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
|
||||
+ BOOST_CPPFLAGS="-I$ac_boost_path"
|
||||
+ fi
|
||||
+ fi
|
||||
fi
|
||||
else
|
||||
if test "$cross_compiling" != yes; then
|
||||
- ac_boost_paths='/usr /usr/local /opt /opt/local'
|
||||
- else
|
||||
- ac_boost_paths="/usr/$host/sys-root/mingw"
|
||||
- fi
|
||||
- for ac_boost_path in $ac_boost_paths ; do
|
||||
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
|
||||
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
|
||||
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
|
||||
- V_CHECK=`expr $_version_tmp \> $_version`
|
||||
- if test "$V_CHECK" = "1" ; then
|
||||
- _version=$_version_tmp
|
||||
- best_path=$ac_boost_path
|
||||
- fi
|
||||
+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
|
||||
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
|
||||
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
|
||||
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
|
||||
+ V_CHECK=`expr $_version_tmp \> $_version`
|
||||
+ if test "$V_CHECK" = "1" ; then
|
||||
+ _version=$_version_tmp
|
||||
+ best_path=$ac_boost_path
|
||||
+ fi
|
||||
+ done
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
||||
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
|
||||
+ if test "$ac_boost_lib_path" = ""; then
|
||||
+ for libsubdir in $libsubdirs ; do
|
||||
+ if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||
done
|
||||
+ BOOST_LDFLAGS="-L$best_path/$libsubdir"
|
||||
fi
|
||||
- done
|
||||
-
|
||||
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
|
||||
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
|
||||
- if test "$ac_boost_lib_path" = ""; then
|
||||
- for libsubdir in $libsubdirs ; do
|
||||
- if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
|
||||
- done
|
||||
- BOOST_LDFLAGS="-L$best_path/$libsubdir"
|
||||
fi
|
||||
|
||||
if test "x$BOOST_ROOT" != "x"; then
|
||||
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
|
||||
index 20df5ee..c4c4555 100644
|
||||
--- a/m4/ax_boost_system.m4
|
||||
+++ b/m4/ax_boost_system.m4
|
||||
@@ -31,7 +31,7 @@
|
||||
# and this notice are preserved. This file is offered as-is, without any
|
||||
# warranty.
|
||||
|
||||
-#serial 15
|
||||
+#serial 17
|
||||
|
||||
AC_DEFUN([AX_BOOST_SYSTEM],
|
||||
[
|
||||
@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
|
||||
|
||||
LDFLAGS_SAVE=$LDFLAGS
|
||||
if test "x$ax_boost_user_system_lib" = "x"; then
|
||||
- for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
|
||||
+ for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
|
||||
ax_lib=${libextension}
|
||||
AC_CHECK_LIB($ax_lib, exit,
|
||||
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
||||
[link_system="no"])
|
||||
done
|
||||
if test "x$link_system" != "xyes"; then
|
||||
- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
|
||||
+ for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
|
||||
ax_lib=${libextension}
|
||||
AC_CHECK_LIB($ax_lib, exit,
|
||||
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 3 Feb 2016 10:30:43 +0000
|
||||
Subject: [PATCH] fix gcc build error
|
||||
|
||||
error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
|
||||
{aka double}' and 'int' to binary 'operator%'
|
||||
|
||||
apparently there's a template returning double for abs for the
|
||||
non-int/long/float/double argument case. So promote earlier to int so the
|
||||
abs<int> is called
|
||||
|
||||
Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
|
||||
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
sax/source/tools/converter.cxx | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
|
||||
index 744415e..cf061c9 100644
|
||||
--- a/sax/source/tools/converter.cxx
|
||||
+++ b/sax/source/tools/converter.cxx
|
||||
@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
|
||||
|
||||
|
||||
static void
|
||||
-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
|
||||
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
|
||||
{
|
||||
if (0 == nOffset)
|
||||
{
|
||||
@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
|
||||
static void lcl_ConvertToUTC(
|
||||
sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
|
||||
sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
|
||||
- sal_Int16 const nSourceOffset)
|
||||
+ int const nSourceOffset)
|
||||
{
|
||||
sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
|
||||
sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,246 +0,0 @@
|
||||
From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001
|
||||
From: Eike Rathke <erack@redhat.com>
|
||||
Date: Wed, 2 Nov 2016 13:07:48 +0100
|
||||
Subject: [PATCH] upgrade to ICU 58
|
||||
|
||||
Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
|
||||
Reviewed-on: https://gerrit.libreoffice.org/30487
|
||||
Reviewed-by: Eike Rathke <erack@redhat.com>
|
||||
Tested-by: Eike Rathke <erack@redhat.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
.../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++
|
||||
i18nutil/source/utility/unicode.cxx | 26 +++++++++++++
|
||||
include/svx/ucsubset.hrc | 11 ++++++
|
||||
svx/source/dialog/charmap.cxx | 35 +++++++++++++++++
|
||||
svx/source/dialog/ucsubset.src | 44 ++++++++++++++++++++++
|
||||
9 files changed, 130 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f06ef8e..66a11a9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
|
||||
SYSTEM_GENCCODE=
|
||||
SYSTEM_GENCMN=
|
||||
|
||||
-ICU_MAJOR=54
|
||||
+ICU_MAJOR=58
|
||||
ICU_MINOR=1
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
|
||||
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
|
||||
diff --git a/download.lst b/download.lst
|
||||
index 4571338..0770a4d 100644
|
||||
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
|
||||
class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
|
||||
{
|
||||
public:
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
|
||||
+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
|
||||
inline void publicSetBreakType(int32_t type)
|
||||
{
|
||||
setBreakType(type);
|
||||
};
|
||||
+#endif
|
||||
OOoRuleBasedBreakIterator(UDataMemory* image,
|
||||
UErrorCode &status)
|
||||
: RuleBasedBreakIterator(image, status)
|
||||
@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
|
||||
}
|
||||
}
|
||||
if (rbi) {
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
|
||||
+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private
|
||||
+ // instead of protected, so the old workaround of
|
||||
+ // https://ssl.icu-project.org/trac/ticket/5498
|
||||
+ // doesn't work anymore. However, they also claim to have fixed
|
||||
+ // the cause that an initial fBreakType==-1 would lead to an
|
||||
+ // endless loop under some circumstances.
|
||||
+ // Let's see ...
|
||||
switch (rBreakType) {
|
||||
case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
|
||||
case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
|
||||
case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
|
||||
case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
|
||||
}
|
||||
+#endif
|
||||
icuBI->aBreakIterator = rbi;
|
||||
}
|
||||
}
|
||||
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
|
||||
index bb82bbf..984c5f7 100644
|
||||
--- a/i18nutil/source/utility/unicode.cxx
|
||||
+++ b/i18nutil/source/utility/unicode.cxx
|
||||
@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
|
||||
sRet = "sa-Sidd";
|
||||
break;
|
||||
#endif
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
|
||||
+ case USCRIPT_ADLAM:
|
||||
+ sRet = "mis"; // Adlm - Adlam for Fulani, no language code
|
||||
+ break;
|
||||
+ case USCRIPT_BHAIKSUKI:
|
||||
+ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code
|
||||
+ break;
|
||||
+ case USCRIPT_MARCHEN:
|
||||
+ sRet = "bo-Marc";
|
||||
+ break;
|
||||
+ case USCRIPT_NEWA:
|
||||
+ sRet = "new-Newa";
|
||||
+ break;
|
||||
+ case USCRIPT_OSAGE:
|
||||
+ sRet = "osa-Osge";
|
||||
+ break;
|
||||
+ case USCRIPT_HAN_WITH_BOPOMOFO:
|
||||
+ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ?
|
||||
+ break;
|
||||
+ case USCRIPT_JAMO:
|
||||
+ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ?
|
||||
+ break;
|
||||
+ case USCRIPT_SYMBOLS_EMOJI:
|
||||
+ sRet = "mis"; // Zsye - Emoji variant
|
||||
+ break;
|
||||
+#endif
|
||||
}
|
||||
return sRet;
|
||||
}
|
||||
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
|
||||
index adf1cf6..1157a7e 100644
|
||||
--- a/include/svx/ucsubset.hrc
|
||||
+++ b/include/svx/ucsubset.hrc
|
||||
@@ -281,6 +281,27 @@
|
||||
#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C (RID_SUBSET_START + 253)
|
||||
#define RID_SUBSETSTR_TIRHUTA (RID_SUBSET_START + 254)
|
||||
#define RID_SUBSETSTR_WARANG_CITI (RID_SUBSET_START + 255)
|
||||
+#define RID_SUBSETSTR_AHOM (RID_SUBSET_START + 256)
|
||||
+#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS (RID_SUBSET_START + 257)
|
||||
+#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT (RID_SUBSET_START + 258)
|
||||
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E (RID_SUBSET_START + 259)
|
||||
+#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM (RID_SUBSET_START + 260)
|
||||
+#define RID_SUBSETSTR_HATRAN (RID_SUBSET_START + 261)
|
||||
+#define RID_SUBSETSTR_MULTANI (RID_SUBSET_START + 262)
|
||||
+#define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263)
|
||||
+#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264)
|
||||
+#define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265)
|
||||
+#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266)
|
||||
+#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267)
|
||||
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268)
|
||||
+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269)
|
||||
+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270)
|
||||
+#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271)
|
||||
+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272)
|
||||
+#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273)
|
||||
+#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274)
|
||||
+#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275)
|
||||
+#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276)
|
||||
|
||||
// RID_SUBSET_END (RID_SUBSET_START + 299)
|
||||
|
||||
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
|
||||
index bcc7cef..ff201a6 100644
|
||||
--- a/svx/source/dialog/charmap.cxx
|
||||
+++ b/svx/source/dialog/charmap.cxx
|
||||
@@ -1594,6 +1594,41 @@ void SubsetMap::InitList()
|
||||
case UBLOCK_SUTTON_SIGNWRITING:
|
||||
break;
|
||||
#endif
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
|
||||
+ case UBLOCK_ADLAM:
|
||||
+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) );
|
||||
+ break;
|
||||
+ case UBLOCK_BHAIKSUKI:
|
||||
+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) );
|
||||
+ break;
|
||||
+ case UBLOCK_CYRILLIC_EXTENDED_C:
|
||||
+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) );
|
||||
+ break;
|
||||
+ case UBLOCK_GLAGOLITIC_SUPPLEMENT:
|
||||
+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) );
|
||||
+ break;
|
||||
+ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
|
||||
+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) );
|
||||
+ break;
|
||||
+ case UBLOCK_MARCHEN:
|
||||
+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) );
|
||||
+ break;
|
||||
+ case UBLOCK_MONGOLIAN_SUPPLEMENT:
|
||||
+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) );
|
||||
+ break;
|
||||
+ case UBLOCK_NEWA:
|
||||
+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) );
|
||||
+ break;
|
||||
+ case UBLOCK_OSAGE:
|
||||
+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) );
|
||||
+ break;
|
||||
+ case UBLOCK_TANGUT:
|
||||
+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) );
|
||||
+ break;
|
||||
+ case UBLOCK_TANGUT_COMPONENTS:
|
||||
+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) );
|
||||
+ break;
|
||||
+#endif
|
||||
|
||||
}
|
||||
|
||||
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
|
||||
index 06630cc..a7765c3 100644
|
||||
--- a/svx/source/dialog/ucsubset.src
|
||||
+++ b/svx/source/dialog/ucsubset.src
|
||||
@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP
|
||||
{
|
||||
Text [ en-US ] = "Warang Citi";
|
||||
};
|
||||
+ String RID_SUBSETSTR_ADLAM
|
||||
+ {
|
||||
+ Text [ en-US ] = "Adlam";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_BHAIKSUKI
|
||||
+ {
|
||||
+ Text [ en-US ] = "Bhaiksuki";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C
|
||||
+ {
|
||||
+ Text [ en-US ] = "Cyrillic Extended-C";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT
|
||||
+ {
|
||||
+ Text [ en-US ] = "Glagolitic Supplement";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION
|
||||
+ {
|
||||
+ Text [ en-US ] = "Ideographic Symbols and Punctuation";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_MARCHEN
|
||||
+ {
|
||||
+ Text [ en-US ] = "Marchen";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT
|
||||
+ {
|
||||
+ Text [ en-US ] = "Mongolian Supplement";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_NEWA
|
||||
+ {
|
||||
+ Text [ en-US ] = "Newa";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_OSAGE
|
||||
+ {
|
||||
+ Text [ en-US ] = "Osage";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_TANGUT
|
||||
+ {
|
||||
+ Text [ en-US ] = "Tangut";
|
||||
+ };
|
||||
+ String RID_SUBSETSTR_TANGUT_COMPONENTS
|
||||
+ {
|
||||
+ Text [ en-US ] = "Tangut Components";
|
||||
+ };
|
||||
};
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 42cc1bf76716940ea381efc6e18fd087df63c2c4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 15 Apr 2017 11:23:40 +0200
|
||||
Subject: [PATCH] remove dictmgr.hxx to be compatible with later hunspell
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
https://github.com/LibreOffice/core/commit/072b32442e3f6f220936a93ad1fcbde57746b747
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
index 706f8b7..73d124c 100644
|
||||
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
|
||||
@@ -29,7 +29,6 @@
|
||||
|
||||
#include <lingutil.hxx>
|
||||
#include <hunspell.hxx>
|
||||
-#include <dictmgr.hxx>
|
||||
#include <sspellimp.hxx>
|
||||
|
||||
#include <linguistic/lngprops.hxx>
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 3ca26ac9c7d3ff28e7687215115fa832f43ca06a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 6 Jul 2017 14:58:15 +0200
|
||||
Subject: [PATCH] packedpixeliterator.hxx: fix typo detected by gcc7
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
include/basebmp/packedpixeliterator.hxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
|
||||
index 1b99bf9..d3d9ad2 100644
|
||||
--- a/include/basebmp/packedpixeliterator.hxx
|
||||
+++ b/include/basebmp/packedpixeliterator.hxx
|
||||
@@ -603,7 +603,7 @@ public:
|
||||
|
||||
value_type get(difference_type const & d) const
|
||||
{
|
||||
- const int remainder( x(d.x) % num_intraword_positions );
|
||||
+ const int remainder( (x + d.x) % num_intraword_positions );
|
||||
|
||||
return (unsigned_cast<value_type>(*current(d.x,d.y) &
|
||||
get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,278 +0,0 @@
|
||||
From 99dd8e29764156b0d7ac53044f393efd8b6555ee Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 8 Jun 2018 15:10:50 +0200
|
||||
Subject: [PATCH] Fix build with recent icu
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Change-Id: I0ce2494a3994155ad0949a17aa71da51891200a7
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
basegfx/source/range/b2drangeclipper.cxx | 1 +
|
||||
i18npool/inc/collator_unicode.hxx | 2 +-
|
||||
.../source/breakiterator/breakiterator_unicode.cxx | 20 ++++++++++----------
|
||||
i18npool/source/collator/collator_unicode.cxx | 14 +++++++-------
|
||||
i18npool/source/collator/gencoll_rule.cxx | 2 +-
|
||||
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 2 +-
|
||||
i18nutil/source/utility/unicode.cxx | 6 +++---
|
||||
vcl/generic/glyphs/scrptrun.h | 2 +-
|
||||
opencl/source/openclconfig.cxx | 2 +-
|
||||
lotuswordpro/source/filter/localtime.cxx | 2 +-
|
||||
10 files changed, 27 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
|
||||
index edbb128..ceb9e11 100644
|
||||
--- a/basegfx/source/range/b2drangeclipper.cxx
|
||||
+++ b/basegfx/source/range/b2drangeclipper.cxx
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <o3tl/vector_pool.hxx>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
+#include <boost/next_prior.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <deque>
|
||||
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
|
||||
index 951de9c..c12213a 100644
|
||||
--- a/i18npool/inc/collator_unicode.hxx
|
||||
+++ b/i18npool/inc/collator_unicode.hxx
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
protected:
|
||||
const sal_Char *implementationName;
|
||||
private:
|
||||
- RuleBasedCollator *uca_base, *collator;
|
||||
+ icu::RuleBasedCollator *uca_base, *collator;
|
||||
#ifndef DISABLE_DYNLOADING
|
||||
oslModule hModule;
|
||||
#endif
|
||||
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
index c68b860..6b10960 100644
|
||||
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
@@ -61,7 +61,7 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
|
||||
Wrapper class to provide public access to the RuleBasedBreakIterator's
|
||||
setbreakType method.
|
||||
*/
|
||||
-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
|
||||
+class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
|
||||
{
|
||||
public:
|
||||
#if (U_ICU_VERSION_MAJOR_NUM < 58)
|
||||
@@ -224,7 +224,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
|
||||
loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
|
||||
for (nDone = 0; nDone < nCount; nDone++) {
|
||||
nStartPos = character.aBreakIterator->following(nStartPos);
|
||||
- if (nStartPos == BreakIterator::DONE)
|
||||
+ if (nStartPos == icu::BreakIterator::DONE)
|
||||
return Text.getLength();
|
||||
}
|
||||
} else { // for CHARACTER mode
|
||||
@@ -243,7 +243,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
|
||||
loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
|
||||
for (nDone = 0; nDone < nCount; nDone++) {
|
||||
nStartPos = character.aBreakIterator->preceding(nStartPos);
|
||||
- if (nStartPos == BreakIterator::DONE)
|
||||
+ if (nStartPos == icu::BreakIterator::DONE)
|
||||
return 0;
|
||||
}
|
||||
} else { // for BS to delete one char and CHARACTER mode.
|
||||
@@ -260,7 +260,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
|
||||
loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
|
||||
|
||||
result.startPos = icuBI->aBreakIterator->following(nStartPos);
|
||||
- if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
|
||||
+ if( result.startPos >= Text.getLength() || result.startPos == icu::BreakIterator::DONE )
|
||||
result.endPos = result.startPos;
|
||||
else {
|
||||
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
|
||||
@@ -269,7 +269,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
|
||||
result.startPos = icuBI->aBreakIterator->following(result.startPos);
|
||||
|
||||
result.endPos = icuBI->aBreakIterator->following(result.startPos);
|
||||
- if(result.endPos == BreakIterator::DONE)
|
||||
+ if(result.endPos == icu::BreakIterator::DONE)
|
||||
result.endPos = result.startPos;
|
||||
}
|
||||
return result;
|
||||
@@ -282,7 +282,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
|
||||
loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
|
||||
|
||||
result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
|
||||
- if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
|
||||
+ if( result.startPos < 0 || result.startPos == icu::BreakIterator::DONE)
|
||||
result.endPos = result.startPos;
|
||||
else {
|
||||
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
|
||||
@@ -291,7 +291,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
|
||||
result.startPos = icuBI->aBreakIterator->preceding(result.startPos);
|
||||
|
||||
result.endPos = icuBI->aBreakIterator->following(result.startPos);
|
||||
- if(result.endPos == BreakIterator::DONE)
|
||||
+ if(result.endPos == icu::BreakIterator::DONE)
|
||||
result.endPos = result.startPos;
|
||||
}
|
||||
return result;
|
||||
@@ -322,9 +322,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
|
||||
result.endPos = icuBI->aBreakIterator->following(nPos);
|
||||
}
|
||||
}
|
||||
- if (result.startPos == BreakIterator::DONE)
|
||||
+ if (result.startPos == icu::BreakIterator::DONE)
|
||||
result.startPos = result.endPos;
|
||||
- else if (result.endPos == BreakIterator::DONE)
|
||||
+ else if (result.endPos == icu::BreakIterator::DONE)
|
||||
result.endPos = result.startPos;
|
||||
|
||||
return result;
|
||||
@@ -388,7 +388,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
|
||||
lbr.breakIndex = nStartPos;
|
||||
lbr.breakType = BreakType::WORDBOUNDARY;
|
||||
} else if (hOptions.rHyphenator.is()) { //Hyphenation break
|
||||
- sal_Int32 boundary_with_punctuation = (line.aBreakIterator->next() != BreakIterator::DONE) ? line.aBreakIterator->current() : 0;
|
||||
+ sal_Int32 boundary_with_punctuation = (line.aBreakIterator->next() != icu::BreakIterator::DONE) ? line.aBreakIterator->current() : 0;
|
||||
line.aBreakIterator->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word"
|
||||
|
||||
sal_Int32 nStartPosWordEnd = nStartPos;
|
||||
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
|
||||
index 9ef6548..978aa04 100644
|
||||
--- a/i18npool/source/collator/collator_unicode.cxx
|
||||
+++ b/i18npool/source/collator/collator_unicode.cxx
|
||||
@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
OUString rule = LocaleDataImpl().getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
|
||||
if (!rule.isEmpty()) {
|
||||
- collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status); // UChar != sal_Unicode in MinGW
|
||||
+ collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status); // UChar != sal_Unicode in MinGW
|
||||
if (! U_SUCCESS(status)) throw RuntimeException();
|
||||
}
|
||||
if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
|
||||
@@ -355,11 +355,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
|
||||
// The default collator of the en-US locale would also fulfill
|
||||
// the requirement. The collator of the actual locale or the
|
||||
// NULL (default) locale does not.
|
||||
- uca_base = static_cast<RuleBasedCollator*>(icu::Collator::createInstance(
|
||||
+ uca_base = static_cast<icu::RuleBasedCollator*>(icu::Collator::createInstance(
|
||||
icu::Locale::getRoot(), status));
|
||||
#endif
|
||||
if (! U_SUCCESS(status)) throw RuntimeException();
|
||||
- collator = new RuleBasedCollator(
|
||||
+ collator = new icu::RuleBasedCollator(
|
||||
reinterpret_cast<const uint8_t*>(ruleImage), ruleImageSize, uca_base, status);
|
||||
if (! U_SUCCESS(status)) throw RuntimeException();
|
||||
}
|
||||
@@ -373,17 +373,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
|
||||
*/
|
||||
icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm));
|
||||
// load ICU collator
|
||||
- collator = static_cast<RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
|
||||
+ collator = static_cast<icu::RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
|
||||
if (! U_SUCCESS(status)) throw RuntimeException();
|
||||
}
|
||||
}
|
||||
|
||||
if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)
|
||||
- collator->setStrength(Collator::PRIMARY);
|
||||
+ collator->setStrength(icu::Collator::PRIMARY);
|
||||
else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE)
|
||||
- collator->setStrength(Collator::SECONDARY);
|
||||
+ collator->setStrength(icu::Collator::SECONDARY);
|
||||
else
|
||||
- collator->setStrength(Collator::TERTIARY);
|
||||
+ collator->setStrength(icu::Collator::TERTIARY);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
|
||||
index 201170a..9b8c1b6 100644
|
||||
--- a/i18npool/source/collator/gencoll_rule.cxx
|
||||
+++ b/i18npool/source/collator/gencoll_rule.cxx
|
||||
@@ -112,7 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
||||
//UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
|
||||
// UCOL_DEFAULT_STRENGTH, &parseError, &status);
|
||||
|
||||
- RuleBasedCollator *coll = new RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status); // UChar != sal_Unicode in MinGW
|
||||
+ icu::RuleBasedCollator *coll = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(Obuf.getStr()), status); // UChar != sal_Unicode in MinGW
|
||||
|
||||
if (U_SUCCESS(status)) {
|
||||
std::vector<uint8_t> data;
|
||||
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
||||
index 17546ef..eb45ebd 100644
|
||||
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
||||
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
||||
@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
|
||||
if (!U_SUCCESS(nCode))
|
||||
return retValue;
|
||||
|
||||
- boost::scoped_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
|
||||
+ boost::scoped_ptr<icu::NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
|
||||
if (!U_SUCCESS(nCode))
|
||||
return retValue;
|
||||
|
||||
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
|
||||
index 6766a6b..01fae9b 100644
|
||||
--- a/i18nutil/source/utility/unicode.cxx
|
||||
+++ b/i18nutil/source/utility/unicode.cxx
|
||||
@@ -1004,15 +1004,15 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
|
||||
|
||||
icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
|
||||
|
||||
- boost::scoped_ptr<NumberFormat> xF(
|
||||
- NumberFormat::createPercentInstance(aLocale, errorCode));
|
||||
+ boost::scoped_ptr<icu::NumberFormat> xF(
|
||||
+ icu::NumberFormat::createPercentInstance(aLocale, errorCode));
|
||||
if(U_FAILURE(errorCode))
|
||||
{
|
||||
SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
|
||||
return OUString::number(dNumber) + "%";
|
||||
}
|
||||
|
||||
- UnicodeString output;
|
||||
+ icu::UnicodeString output;
|
||||
xF->format(dNumber/100, output);
|
||||
OUString aRet(reinterpret_cast<const sal_Unicode *>(output.getBuffer()),
|
||||
output.length());
|
||||
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
|
||||
index 625ca7b..2b8ce0b 100644
|
||||
--- a/vcl/generic/glyphs/scrptrun.h
|
||||
+++ b/vcl/generic/glyphs/scrptrun.h
|
||||
@@ -65,7 +65,7 @@ struct ParenStackEntry
|
||||
}
|
||||
};
|
||||
|
||||
-class ScriptRun : public UObject {
|
||||
+class ScriptRun : public icu::UObject {
|
||||
public:
|
||||
ScriptRun();
|
||||
|
||||
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
|
||||
index 688dab1..aa1f913 100644
|
||||
--- a/opencl/source/openclconfig.cxx
|
||||
+++ b/opencl/source/openclconfig.cxx
|
||||
@@ -121,7 +121,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
|
||||
UErrorCode nIcuError(U_ZERO_ERROR);
|
||||
icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
|
||||
icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
|
||||
- RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
|
||||
+ icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
|
||||
|
||||
if (U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError))
|
||||
return true;
|
||||
diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
|
||||
index f8af7e6..73903c8 100644
|
||||
--- a/lotuswordpro/source/filter/localtime.cxx
|
||||
+++ b/lotuswordpro/source/filter/localtime.cxx
|
||||
@@ -176,7 +176,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
|
||||
|
||||
if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
|
||||
{
|
||||
- TimeZone* pLocalZone = TimeZone::createDefault();
|
||||
+ icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
|
||||
long offset = (pLocalZone->getRawOffset())/1000;
|
||||
delete pLocalZone;
|
||||
long ltime = rtime + offset;
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
From 42cebff14f7d486c20f04863681cc5ef4602f4eb Mon Sep 17 00:00:00 2001
|
||||
From: Rene Engelhard <rene@debian.org>
|
||||
Date: Tue, 24 Apr 2018 15:56:23 +0200
|
||||
Subject: [PATCH] fix build with poppler 0.64
|
||||
|
||||
GooString became const...
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
|
||||
---
|
||||
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
|
||||
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
|
||||
2 files changed, 14 insertions(+)
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index b7c47d8..6a40bcc 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -453,6 +453,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
|
||||
FontAttributes aNewFont;
|
||||
int nSize = 0;
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 64, 0)
|
||||
+ const
|
||||
+#endif
|
||||
GooString* pFamily = gfxFont->getName();
|
||||
if( pFamily )
|
||||
{
|
||||
@@ -750,6 +753,9 @@ void PDFOutDev::updateFont(GfxState *state)
|
||||
FontAttributes aFont;
|
||||
int nEmbedSize=0;
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 64, 0)
|
||||
+ const
|
||||
+#endif
|
||||
Ref* pID = gfxFont->getID();
|
||||
// TODO(Q3): Portability problem
|
||||
long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
|
||||
@@ -929,7 +935,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
|
||||
printf( "\n" );
|
||||
}
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 64, 0)
|
||||
+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
|
||||
+#else
|
||||
void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
|
||||
+#endif
|
||||
{
|
||||
// TODO(F3): NYI
|
||||
}
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
index b5dd4e4..2f59bf2 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -237,7 +237,11 @@ namespace pdfi
|
||||
double dx, double dy,
|
||||
double originX, double originY,
|
||||
CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
|
||||
+#if POPPLER_CHECK_VERSION(0, 64, 0)
|
||||
+ virtual void drawString(GfxState *state, const GooString *s) SAL_OVERRIDE;
|
||||
+#else
|
||||
virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
|
||||
+#endif
|
||||
virtual void endTextObject(GfxState *state) SAL_OVERRIDE;
|
||||
|
||||
//----- image drawing
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
From a6a65ecdef3a577b537b5d9fccb9d41e585b9f14 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 19 Jan 2016 10:58:44 +0100
|
||||
Subject: [PATCH] Make virtual ~ScValidationDlg non-inline
|
||||
|
||||
...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction of the
|
||||
VclPtr<ScValidationDlg> in ScValidityRefChildWin::ScValidityRefChildWin
|
||||
(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
|
||||
points at ~ScValidationDlg (instead of a derived class dtor) to directly inline
|
||||
the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to store
|
||||
it in the object's vtable during destruction), which requires the code of inline
|
||||
virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn need
|
||||
the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
|
||||
ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
|
||||
exported from there.
|
||||
|
||||
Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
|
||||
(cherry picked from commit 8d1a24dae03690b576310e3539369916f31ac475)
|
||||
Reviewed-on: https://gerrit.libreoffice.org/21637
|
||||
Reviewed-by: Eike Rathke <erack@redhat.com>
|
||||
Tested-by: Eike Rathke <erack@redhat.com>
|
||||
|
||||
Upstream-Status: Backported
|
||||
---
|
||||
sc/source/ui/dbgui/validate.cxx | 5 +++++
|
||||
sc/source/ui/inc/validate.hxx | 2 +-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
|
||||
index 459c5d731fc7..db7301280b1e 100644
|
||||
--- a/sc/source/ui/dbgui/validate.cxx
|
||||
+++ b/sc/source/ui/dbgui/validate.cxx
|
||||
@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
|
||||
get(m_pHBox, "refinputbox");
|
||||
}
|
||||
|
||||
+ScValidationDlg::~ScValidationDlg()
|
||||
+{
|
||||
+ disposeOnce();
|
||||
+}
|
||||
+
|
||||
void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
|
||||
{
|
||||
if ( rRange.aStart != rRange.aEnd )
|
||||
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
|
||||
index d39b99b12bac..1e785b7942de 100644
|
||||
--- a/sc/source/ui/inc/validate.hxx
|
||||
+++ b/sc/source/ui/inc/validate.hxx
|
||||
@@ -182,7 +182,7 @@ class ScValidationDlg
|
||||
|
||||
public:
|
||||
explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL );
|
||||
- virtual ~ScValidationDlg() { disposeOnce(); }
|
||||
+ virtual ~ScValidationDlg();
|
||||
virtual void dispose() SAL_OVERRIDE
|
||||
{
|
||||
if( m_bOwnRefHdlr )
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From ae6d997f605c5913ba8a10a8ae71a947f7e10f0c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 22:29:26 +0100
|
||||
Subject: [PATCH] Fix build with boost >= 1.69.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://github.com/LibreOffice/core/commit/23a8d5ffbbe58761b89f590f0735abccd69a3681
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
sfx2/source/appl/shutdownicon.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
|
||||
index a8b8a13..4db03c4 100644
|
||||
--- a/sfx2/source/appl/shutdownicon.cxx
|
||||
+++ b/sfx2/source/appl/shutdownicon.cxx
|
||||
@@ -177,7 +177,7 @@ bool LoadModule()
|
||||
#endif // ENABLE_QUICKSTART_APPLET
|
||||
}
|
||||
assert(!boost::logic::indeterminate(loaded));
|
||||
- return loaded;
|
||||
+ return bool(loaded);
|
||||
}
|
||||
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,194 +0,0 @@
|
||||
From 5e8bdd9203dd642111c62a6668ee665a20d4ba19 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Kaganski <mike.kaganski@collabora.com>
|
||||
Date: Tue, 20 Nov 2018 08:45:38 +0100
|
||||
Subject: [PATCH] poppler dropped GBool since 0.71
|
||||
|
||||
See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
|
||||
|
||||
Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
|
||||
Reviewed-on: https://gerrit.libreoffice.org/63625
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://gitlab.freedesktop.org/poppler/poppler/commit/163420b48bdddf9084208b3cadf04dafad52d40a
|
||||
---
|
||||
.../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 22 +++++++--------
|
||||
.../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 28 +++++++++----------
|
||||
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++--
|
||||
3 files changed, 27 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index 34d73bc..b684f74 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -538,7 +538,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
|
||||
PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
|
||||
m_pDoc( pDoc ),
|
||||
m_aFontMap(),
|
||||
- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
|
||||
+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
|
||||
m_bSkipImages(false)
|
||||
{
|
||||
}
|
||||
@@ -961,11 +961,11 @@ void PDFOutDev::endTextObject(GfxState*)
|
||||
}
|
||||
|
||||
void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
|
||||
- int width, int height, GBool invert,
|
||||
+ int width, int height, bool invert,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ bool /*interpolate*/,
|
||||
#endif
|
||||
- GBool /*inlineImg*/ )
|
||||
+ bool /*inlineImg*/ )
|
||||
{
|
||||
if (m_bSkipImages)
|
||||
return;
|
||||
@@ -994,9 +994,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
|
||||
void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height, GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ bool /*interpolate*/,
|
||||
#endif
|
||||
- int* maskColors, GBool /*inlineImg*/ )
|
||||
+ int* maskColors, bool /*inlineImg*/ )
|
||||
{
|
||||
if (m_bSkipImages)
|
||||
return;
|
||||
@@ -1045,13 +1045,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height,
|
||||
GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ bool /*interpolate*/,
|
||||
#endif
|
||||
Stream* maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
- GBool maskInvert
|
||||
+ bool maskInvert
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool /*maskInterpolate*/
|
||||
+ , bool /*maskInterpolate*/
|
||||
#endif
|
||||
)
|
||||
{
|
||||
@@ -1067,13 +1067,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
|
||||
int width, int height,
|
||||
GfxImageColorMap* colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool /*interpolate*/,
|
||||
+ bool /*interpolate*/,
|
||||
#endif
|
||||
Stream* maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
GfxImageColorMap* maskColorMap
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool /*maskInterpolate*/
|
||||
+ , bool /*maskInterpolate*/
|
||||
#endif
|
||||
)
|
||||
{
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
index b6d97bb..41d5da4 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -164,17 +164,17 @@ namespace pdfi
|
||||
|
||||
// Does this device use upside-down coordinates?
|
||||
// (Upside-down means (0,0) is the top left corner of the page.)
|
||||
- virtual GBool upsideDown() SAL_OVERRIDE { return gTrue; }
|
||||
+ virtual bool upsideDown() SAL_OVERRIDE { return true; }
|
||||
|
||||
// Does this device use drawChar() or drawString()?
|
||||
- virtual GBool useDrawChar() SAL_OVERRIDE { return gTrue; }
|
||||
+ virtual bool useDrawChar() SAL_OVERRIDE { return true; }
|
||||
|
||||
// Does this device use beginType3Char/endType3Char? Otherwise,
|
||||
// text in Type 3 fonts will be drawn with drawChar/drawString.
|
||||
- virtual GBool interpretType3Chars() SAL_OVERRIDE { return gFalse; }
|
||||
+ virtual bool interpretType3Chars() SAL_OVERRIDE { return false; }
|
||||
|
||||
// Does this device need non-text content?
|
||||
- virtual GBool needNonText() SAL_OVERRIDE { return gTrue; }
|
||||
+ virtual bool needNonText() SAL_OVERRIDE { return true; }
|
||||
|
||||
//----- initialization and control
|
||||
|
||||
@@ -250,40 +250,40 @@ namespace pdfi
|
||||
|
||||
//----- image drawing
|
||||
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GBool invert,
|
||||
+ int width, int height, bool invert,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ bool interpolate,
|
||||
#endif
|
||||
- GBool inlineImg) SAL_OVERRIDE;
|
||||
+ bool inlineImg) SAL_OVERRIDE;
|
||||
virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ bool interpolate,
|
||||
#endif
|
||||
- int *maskColors, GBool inlineImg) SAL_OVERRIDE;
|
||||
+ int *maskColors, bool inlineImg) SAL_OVERRIDE;
|
||||
virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height,
|
||||
GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ bool interpolate,
|
||||
#endif
|
||||
Stream *maskStr, int maskWidth, int maskHeight,
|
||||
- GBool maskInvert
|
||||
+ bool maskInvert
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool maskInterpolate
|
||||
+ , bool maskInterpolate
|
||||
#endif
|
||||
) SAL_OVERRIDE;
|
||||
virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height,
|
||||
GfxImageColorMap *colorMap,
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- GBool interpolate,
|
||||
+ bool interpolate,
|
||||
#endif
|
||||
Stream *maskStr,
|
||||
int maskWidth, int maskHeight,
|
||||
GfxImageColorMap *maskColorMap
|
||||
#if POPPLER_CHECK_VERSION(0, 12, 0)
|
||||
- , GBool maskInterpolate
|
||||
+ , bool maskInterpolate
|
||||
#endif
|
||||
) SAL_OVERRIDE;
|
||||
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
|
||||
|
||||
// read config file
|
||||
globalParams = new GlobalParams();
|
||||
- globalParams->setErrQuiet(gTrue);
|
||||
+ globalParams->setErrQuiet(true);
|
||||
#if defined(_MSC_VER)
|
||||
globalParams->setupBaseFonts(NULL);
|
||||
#endif
|
||||
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
|
||||
i,
|
||||
PDFI_OUTDEV_RESOLUTION,
|
||||
PDFI_OUTDEV_RESOLUTION,
|
||||
- 0, gTrue, gTrue, gTrue);
|
||||
+ 0, true, true, true);
|
||||
rDoc.processLinks(&aOutDev, i);
|
||||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -4,14 +4,19 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"
|
||||
|
||||
inherit native
|
||||
|
||||
# TODO
|
||||
# boost / mariadb
|
||||
|
||||
DEPENDS += " \
|
||||
cairo-native \
|
||||
libepoxy-native \
|
||||
curl-native \
|
||||
gconf-native \
|
||||
libpng-native \
|
||||
jpeg-native \
|
||||
libxml2-native \
|
||||
graphite2-native \
|
||||
harfbuzz-native \
|
||||
boost-native \
|
||||
icu-native \
|
||||
expat-native \
|
||||
lcms-native \
|
||||
@@ -25,7 +30,6 @@ DEPENDS += " \
|
||||
mythes-native \
|
||||
clucene-core-native \
|
||||
libcmis-native \
|
||||
mdds-native \
|
||||
libpagemaker-native \
|
||||
glm-native \
|
||||
libetonyek-native \
|
||||
@@ -39,62 +43,22 @@ DEPENDS += " \
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-saxparser-output-calling-parametrs-for-debug.patch \
|
||||
file://0002-cppumaker-output-more-detailed-error-message.patch \
|
||||
file://0003-cppuhelper-defaultbootstrap-output-debug-information.patch \
|
||||
file://0004-fix-build-for-x-less-cairp-less-build.patch \
|
||||
file://0005-add-gengal-debug-information.patch \
|
||||
file://0006-gengal-fix-path-to-redirectrc.patch \
|
||||
file://0002-cppuhelper-defaultbootstrap-output-debug-information.patch \
|
||||
file://0003-add-gengal-debug-information.patch \
|
||||
file://0004-gengal-fix-path-to-redirectrc.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += " \
|
||||
--enable-python=system \
|
||||
--without-x \
|
||||
--without-java \
|
||||
\
|
||||
--with-system-curl \
|
||||
--with-system-libpng \
|
||||
--with-system-jpeg \
|
||||
--with-system-libxml \
|
||||
--with-system-harfbuzz \
|
||||
--with-system-boost \
|
||||
--with-system-icu \
|
||||
--with-system-expat \
|
||||
--with-system-lcms2 \
|
||||
--with-system-nss \
|
||||
--with-system-cppunit \
|
||||
--with-system-libabw \
|
||||
--with-system-libcdr \
|
||||
--with-system-libebook \
|
||||
--with-system-libfreehand \
|
||||
--with-system-hunspell \
|
||||
--with-system-mythes \
|
||||
--with-system-clucene \
|
||||
--with-system-libcmis \
|
||||
--with-system-mdds \
|
||||
--with-system-libpagemaker \
|
||||
--with-system-glm \
|
||||
--with-system-libetonyek \
|
||||
--with-system-vigra \
|
||||
--with-system-libvisio \
|
||||
--with-system-libexttextcat \
|
||||
--with-system-altlinuxhyph \
|
||||
--with-system-neon \
|
||||
\
|
||||
--without-boost-date-time \
|
||||
--without-boost-iostreams \
|
||||
--without-boost-system \
|
||||
--disable-gui \
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-lotuswordpro \
|
||||
--disable-firebird-sdbc \
|
||||
--disable-liblangtag \
|
||||
--disable-openssl \
|
||||
--disable-gltf \
|
||||
--disable-collada \
|
||||
--disable-scripting-beanshell \
|
||||
--disable-scripting-javascript \
|
||||
--disable-graphite \
|
||||
--disable-pdfimport \
|
||||
--disable-orcus \
|
||||
--disable-coinmp \
|
||||
"
|
||||
|
||||
@@ -105,28 +69,48 @@ do_configure() {
|
||||
gnu-configize
|
||||
autoconf
|
||||
cd $olddir
|
||||
PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}" oe_runconf
|
||||
PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}${PYTHON_ABI} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" oe_runconf
|
||||
}
|
||||
|
||||
# for debugging - we can as we're native
|
||||
CXXFLAGS += "-g -O0 -DSAL_LOG_INFO -DSAL_LOG_WARN"
|
||||
LDFLAGS += "-g"
|
||||
|
||||
# these seem to get lost in our tailored build
|
||||
LDFLAGS += "-ldl"
|
||||
|
||||
|
||||
do_compile() {
|
||||
# inspired by ${B}/Makefile
|
||||
BUILDDIR=${B} oe_runmake -f ${S}/Makefile.gbuild build-tools
|
||||
# gengal was not designed for build on its own - we need to add dependencies
|
||||
BUILDDIR=${B} oe_runmake Executable_gengal
|
||||
# see pre_BuildTools.mk
|
||||
BUILDDIR=${B} oe_runmake Executable_bestreversemap
|
||||
BUILDDIR=${B} oe_runmake Executable_cfgex
|
||||
BUILDDIR=${B} oe_runmake Executable_cpp
|
||||
BUILDDIR=${B} oe_runmake Executable_gendict
|
||||
BUILDDIR=${B} oe_runmake Executable_gencoll_rule
|
||||
BUILDDIR=${B} oe_runmake Executable_genconv_dict
|
||||
BUILDDIR=${B} oe_runmake Executable_gengal
|
||||
BUILDDIR=${B} oe_runmake Executable_genindex_data
|
||||
BUILDDIR=${B} oe_runmake Executable_helpex
|
||||
BUILDDIR=${B} oe_runmake Executable_idxdict
|
||||
BUILDDIR=${B} oe_runmake Executable_makedepend
|
||||
BUILDDIR=${B} oe_runmake Executable_propex
|
||||
BUILDDIR=${B} oe_runmake Executable_saxparser
|
||||
BUILDDIR=${B} oe_runmake Executable_svidl
|
||||
BUILDDIR=${B} oe_runmake Executable_treex
|
||||
BUILDDIR=${B} oe_runmake Executable_ulfex
|
||||
BUILDDIR=${B} oe_runmake Executable_uiex
|
||||
BUILDDIR=${B} oe_runmake Executable_unoidl-check
|
||||
BUILDDIR=${B} oe_runmake Executable_unoidl-write
|
||||
BUILDDIR=${B} oe_runmake Executable_xrmex
|
||||
BUILDDIR=${B} oe_runmake Library_ucb1
|
||||
BUILDDIR=${B} oe_runmake Library_configmgr
|
||||
BUILDDIR=${B} oe_runmake Library_fwk
|
||||
BUILDDIR=${B} oe_runmake Library_i18npool
|
||||
BUILDDIR=${B} oe_runmake Library_pyuno
|
||||
|
||||
# BUILDDIR=${B} oe_runmake Module_external
|
||||
}
|
||||
|
||||
# rsc
|
||||
# transex3
|
||||
LOBUILDTOOLS = " \
|
||||
bestreversemap \
|
||||
cfgex \
|
||||
@@ -136,13 +120,10 @@ LOBUILDTOOLS = " \
|
||||
genindex_data \
|
||||
idxdict \
|
||||
propex \
|
||||
rsc \
|
||||
saxparser \
|
||||
svidl \
|
||||
transex3 \
|
||||
ulfex \
|
||||
uiex \
|
||||
unoidl-check \
|
||||
unoidl-write \
|
||||
xrmex \
|
||||
"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From c3baa66501375419563ba6d44685df347ae09a8a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 22 Nov 2015 21:44:04 +0100
|
||||
Subject: [PATCH] saxparser: output calling parametrs for debug
|
||||
MIME-Version: 1.0
|
||||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
i18npool/source/localedata/saxparser.cxx | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 691674ce51be55f02464c6b6180680a41a64f906 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 1 Dec 2015 00:09:32 +0100
|
||||
From 4577fbcae9790d88f6ccc5de07dd8dbff9d9cf97 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 3 Aug 2019 18:15:28 +0200
|
||||
Subject: [PATCH] cppuhelper / defaultbootstrap: output debug information in
|
||||
getBootstrapVariable
|
||||
MIME-Version: 1.0
|
||||
@@ -9,13 +9,13 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
cppuhelper/source/defaultbootstrap.cxx | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
|
||||
index 1fbbf8f..75160e8 100644
|
||||
index 945268b..3259d43 100644
|
||||
--- a/cppuhelper/source/defaultbootstrap.cxx
|
||||
+++ b/cppuhelper/source/defaultbootstrap.cxx
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -32,9 +32,9 @@ index 1fbbf8f..75160e8 100644
|
||||
#include <rtl/ustring.hxx>
|
||||
+#include <rtl/string.hxx>
|
||||
|
||||
using rtl::OUString;
|
||||
|
||||
@@ -40,6 +42,10 @@ rtl::OUString getBootstrapVariable(
|
||||
#include "macro_expander.hxx"
|
||||
#include "paths.hxx"
|
||||
@@ -38,6 +40,10 @@ OUString getBootstrapVariable(
|
||||
throw css::uno::DeploymentException(
|
||||
"Cannot obtain " + name + " from uno ini");
|
||||
}
|
||||
@@ -46,5 +46,5 @@ index 1fbbf8f..75160e8 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.1.0
|
||||
2.21.0
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 98774bf61294703183118b7953f6a92cad6da068 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 26 Nov 2015 17:48:19 +0100
|
||||
Subject: [PATCH] cppumaker: output more detailed error message
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
codemaker/source/cppumaker/cpputype.cxx | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
|
||||
index 0b3e9fd..26a9a73 100644
|
||||
--- a/codemaker/source/cppumaker/cpputype.cxx
|
||||
+++ b/codemaker/source/cppumaker/cpputype.cxx
|
||||
@@ -3385,11 +3385,7 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
|
||||
{
|
||||
return OUString(
|
||||
"\n"
|
||||
- "#if OSL_DEBUG_LEVEL > 0\n"
|
||||
- " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
|
||||
- "#else\n"
|
||||
- " ::rtl::OUString(\"service not supplied\")\n"
|
||||
- "#endif\n");
|
||||
+ " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n");
|
||||
}
|
||||
|
||||
void ServiceType::dumpHxxFile(
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
From d15275f988ea61b7ef128ac52f55906500728d7a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 20 Jan 2016 20:51:02 +0100
|
||||
Subject: [PATCH] add gengal debug information
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
svx/source/gengal/gengal.sh | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
@@ -1,72 +0,0 @@
|
||||
From 5caf9ca138e89434249f2878334231011e382687 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 18 Dec 2015 22:09:29 +0100
|
||||
Subject: [PATCH] fix build for x-less/cairo-less build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: submitted [1]
|
||||
|
||||
[1] https://bugs.documentfoundation.org/show_bug.cgi?id=96587
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
vcl/headless/svpgdi.cxx | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
|
||||
index 21efd33..d1f4df1 100644
|
||||
--- a/vcl/headless/svpgdi.cxx
|
||||
+++ b/vcl/headless/svpgdi.cxx
|
||||
@@ -645,6 +645,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
|
||||
dbgOut( m_aDevice );
|
||||
}
|
||||
|
||||
+#if ENABLE_CAIRO_CANVAS
|
||||
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
|
||||
static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, bool bClosePath)
|
||||
{
|
||||
@@ -707,6 +708,7 @@ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, b
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
bool SvpSalGraphics::drawPolyLine(
|
||||
const ::basegfx::B2DPolygon& rPolyLine,
|
||||
@@ -717,6 +719,7 @@ bool SvpSalGraphics::drawPolyLine(
|
||||
{
|
||||
bool bRet = false;
|
||||
(void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; (void)eLineCap;
|
||||
+#if ENABLE_CAIRO_CANVAS
|
||||
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
|
||||
// short circuit if there is nothing to do
|
||||
const int nPointCount = rPolyLine.count();
|
||||
@@ -825,6 +828,7 @@ bool SvpSalGraphics::drawPolyLine(
|
||||
}
|
||||
bRet = true;
|
||||
#endif
|
||||
+#endif
|
||||
return bRet;
|
||||
}
|
||||
|
||||
@@ -857,6 +861,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
|
||||
{
|
||||
bool bRet = false;
|
||||
(void)rPolyPoly; (void)fTransparency;
|
||||
+#if ENABLE_CAIRO_CANVAS
|
||||
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
|
||||
if (m_bUseLineColor || !m_bUseFillColor)
|
||||
{
|
||||
@@ -901,6 +906,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
|
||||
}
|
||||
bRet = true;
|
||||
#endif
|
||||
+#endif
|
||||
return bRet;
|
||||
}
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 0840b6904d48399818f17487caf593bc2e9727bd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 20 Jan 2016 23:16:10 +0100
|
||||
Subject: [PATCH] gengal: fix path to redirectrc
|
||||
MIME-Version: 1.0
|
||||
@@ -7,7 +7,7 @@ Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Change-Id: I4a221b828a2ac9b8fd585d34f8e5197bf40c6498
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
svx/source/gengal/gengal.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@@ -1,9 +1,9 @@
|
||||
PV = "5.0.6.3"
|
||||
DIRV = "5.0.6"
|
||||
PV = "6.2.6.1"
|
||||
DIRV = "6.2.6"
|
||||
|
||||
SRC_URI += " \
|
||||
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "541d92329d433696c478f7669ac976f1"
|
||||
SRC_URI[sha256sum] = "4601d778318e6221cf5b44398c54a790169ad3afb4e81aa29766bcefac0fecc7"
|
||||
SRC_URI[md5sum] = "ccb003ef8cec828041eb848a26a39588"
|
||||
SRC_URI[sha256sum] = "5a6caf9addcfbb7372102fd8a43731be06e44eed4e71e03b567e04dce693a755"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit gtk-icon-cache pythonnative
|
||||
inherit gtk-icon-cache
|
||||
|
||||
SRC_URI += " \
|
||||
http://download.documentfoundation.org/libreoffice/src/${DIRV}/${BPN}-translations-${PV}.tar.xz;name=translations \
|
||||
@@ -105,26 +105,17 @@ EXTRA_OECONF += " \
|
||||
\
|
||||
--disable-collada \
|
||||
--disable-coinmp \
|
||||
--enable-python=system \
|
||||
--with-tls=nss \
|
||||
--without-galleries \
|
||||
\
|
||||
--with-system-poppler \
|
||||
--with-system-openldap \
|
||||
--with-system-zlib \
|
||||
--with-system-jpeg \
|
||||
--with-system-neon \
|
||||
--with-system-libpng \
|
||||
--with-system-nss \
|
||||
--with-system-apr \
|
||||
--with-system-serf \
|
||||
--with-system-libatomic_ops \
|
||||
--with-system-lcms2 \
|
||||
--with-system-libxml \
|
||||
--with-system-icu \
|
||||
--with-system-expat \
|
||||
--with-system-curl \
|
||||
--with-system-harfbuzz \
|
||||
--with-system-glew \
|
||||
--with-system-openssl \
|
||||
\
|
||||
@@ -149,10 +140,8 @@ EXTRA_OECONF += " \
|
||||
--with-system-libexttextcat \
|
||||
--with-system-clucene \
|
||||
--with-system-vigra \
|
||||
--with-system-hunspell \
|
||||
--with-system-mythes \
|
||||
--with-system-altlinuxhyph \
|
||||
--with-system-graphite \
|
||||
--with-system-liblangtag \
|
||||
--with-system-lpsolve \
|
||||
"
|
||||
@@ -160,7 +149,7 @@ EXTRA_OECONF += " \
|
||||
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
gtk \
|
||||
gtk3 \
|
||||
mariadb \
|
||||
postgresql \
|
||||
"
|
||||
|
||||
@@ -10,20 +10,11 @@ require libreoffice-version.inc
|
||||
|
||||
SRC_URI += " \
|
||||
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
|
||||
file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \
|
||||
file://0002-fix-gcc-build-error.patch \
|
||||
file://0003-upgrade-to-ICU-58.patch \
|
||||
file://0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch \
|
||||
file://0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch \
|
||||
file://0006-Fix-build-with-recent-icu.patch \
|
||||
file://0007-fix-build-with-poppler-0.64.patch \
|
||||
file://0008-Make-virtual-ScValidationDlg-non-inline.patch \
|
||||
file://0009-Fix-build-with-boost-1.69.0.patch \
|
||||
file://0010-poppler-dropped-GBool-since-0.71.patch \
|
||||
file://0001-Workaround-boost-library-detection-failures.patch \
|
||||
"
|
||||
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
|
||||
|
||||
inherit autotools-brokensep pkgconfig distutils-base perlnative
|
||||
inherit autotools pkgconfig python3native distutils3-base perlnative
|
||||
|
||||
DEPENDS += " \
|
||||
python3-lxml-native \
|
||||
@@ -37,12 +28,49 @@ DEPENDS += " \
|
||||
EXTRA_OECONF = " \
|
||||
--without-doxygen \
|
||||
--enable-release-build \
|
||||
--disable-verbose \
|
||||
--enable-python=system \
|
||||
${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
|
||||
\
|
||||
--with-system-boost \
|
||||
--with-boost-date-time=boost_date_time \
|
||||
--with-boost-filesystem=boost_filesystem \
|
||||
--with-boost-locale=boost_locale\
|
||||
--with-boost-iostreams=boost_iostreams\
|
||||
--with-boost-system=boost_system\
|
||||
\
|
||||
--with-system-cairo \
|
||||
--with-system-epoxy \
|
||||
--with-system-curl \
|
||||
--with-system-libpng \
|
||||
--with-system-jpeg \
|
||||
--with-system-libxml \
|
||||
--with-system-graphite \
|
||||
--with-system-harfbuzz \
|
||||
--with-system-icu \
|
||||
--with-system-expat \
|
||||
--with-system-lcms2 \
|
||||
--with-system-nss \
|
||||
--with-system-cppunit \
|
||||
--with-system-libabw \
|
||||
--with-system-libcdr \
|
||||
--with-system-libebook \
|
||||
--with-system-libfreehand \
|
||||
--with-system-hunspell \
|
||||
--with-system-mythes \
|
||||
--with-system-clucene \
|
||||
--with-system-libcmis \
|
||||
--with-system-libpagemaker \
|
||||
--with-system-glm \
|
||||
--with-system-libetonyek \
|
||||
--with-system-libvisio \
|
||||
--with-system-libexttextcat \
|
||||
--with-system-altlinuxhyph \
|
||||
--with-system-neon \
|
||||
--with-system-librevenge \
|
||||
--with-system-libabw \
|
||||
--with-system-libcdr \
|
||||
--with-system-libebook \
|
||||
--with-system-libfreehand \
|
||||
--with-system-zlib \
|
||||
"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 8407698e81ad907287a87bbc561544c0a84ae3c4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 21 Oct 2015 23:27:01 +0200
|
||||
Subject: [PATCH] configure.ac: skip some cross-compile sections - they do not
|
||||
work for oe-environment
|
||||
@@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 231a054d94ee9eced6e116829d5a9f7706d7bb41 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 01:16:47 +0100
|
||||
Subject: [PATCH] Makefile.in: avoid building target cross-toolset
|
||||
MIME-Version: 1.0
|
||||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross compiling specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 502ff5208fc4326960b9d1e9f25642046dc64a28 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 21 Nov 2015 23:56:19 +0100
|
||||
Subject: [PATCH] remove paths for gb_Executable_get_command
|
||||
MIME-Version: 1.0
|
||||
@@ -10,7 +10,7 @@ use binaries found in our native sysroot
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
solenv/gbuild/TargetLocations.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 20 Nov 2015 22:03:58 +0100
|
||||
Subject: [PATCH] ensure that native gendict build by libreoffice is used
|
||||
MIME-Version: 1.0
|
||||
@@ -11,7 +11,7 @@ This is neccessary since last commit using all helpers from native sysroot
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
i18npool/CustomTarget_breakiterator.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From cf939a0c4e49d34f5bd795dbbbd1a7ae396ce622 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 6 Dec 2015 22:23:17 +0100
|
||||
Subject: [PATCH] add a new gb_Rdb_get_target_for_build_native and use it
|
||||
i18npool/CustomTarget_localedata
|
||||
@@ -11,7 +11,7 @@ We need to use native saxparser
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
i18npool/CustomTarget_localedata.mk | 2 +-
|
||||
solenv/gbuild/TargetLocations.mk | 1 +
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 8f21c644930042bca1725b9547f4a4585fe79784 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 9 Dec 2015 23:20:14 +0100
|
||||
Subject: [PATCH] make sure that gengal uses native libraries
|
||||
MIME-Version: 1.0
|
||||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
solenv/gbuild/Gallery.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From d194f5aef8bf1c16097729d448b34316d621e557 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 24 Jan 2016 16:55:11 +0100
|
||||
Subject: [PATCH] Package.mk: workaround icu missing error for
|
||||
--without-galleries
|
||||
@@ -7,7 +7,7 @@ MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
solenv/gbuild/Package.mk | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From a3d541ac396929b6ab78fcd5d8e8ccc85a6b3a2d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 28 Jan 2016 00:49:41 +0100
|
||||
Subject: [PATCH] configure.ac: avoid finding/calling pg_config
|
||||
MIME-Version: 1.0
|
||||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross compiling specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From f52d4fea70f71b844b4ad757df61423e08366083 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 31 Jan 2016 21:10:32 +0100
|
||||
Subject: [PATCH] avoid downloading by git submodules
|
||||
MIME-Version: 1.0
|
||||
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
Reference in New Issue
Block a user