pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 610006 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/610006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger 2018-05-18 12:26:32 +00:00 committed by Git OBS Bridge
commit 7c6e764e52
15 changed files with 393 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice-6.0.4.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbf62884f3d3192fe8ad27690a172485322647c1011dcc09139b0ca254f1bc21
size 204496172

16
libreoffice-6.0.4.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxRAAoJEPQ0oe+v7q6jxGAP/2Li/qf8AVWbY84jaeSU01w+
JwrFBnPUJDbv5VQcY7Z9Z9vcLfh1wgCF+gVyalcZ3aCPl0E/lL/LpYva7Twc68t6
O0XlhIc6A7e455DlVv/vICWOjJQawWqUBPEuITabk/kkuXHFA7yyr2cwKXYgmTmc
5XVUgu7DHdSQVVRrXiXwzDrS1acKyqCeo+0Et6Ad4721Cy35afevI4+eT1HxSa81
JOHtXa7/12luVhW1ecjmpNO9pRkDatKtn81ToVYOQP840OrBGhRsfOTISFBNduxY
QtEVtLJQxhSEV54ctkLi7ZXon9icivI/onoXIW7yMeFdlSbZ2+zLBm4biHPCor/P
2gloiyYY6muoefKkOziXrtpMFDDD2x8yESU5VbRHfwGvU+Tr8NAnvmG/TDhiPnvg
NQs15nUnn6ZG5D0mG6329kcnScgmbf3eb+xfxu1wiEhs+iXpK1hZKpJcyOmhrgKz
A+na22otnReBXezFo71O6+khgOTJ0uuFtfu9nspcf/O/MZLVzS1YkBFQQ328yUjm
OkP16kBh/rwVP0cXV99G8+CrlWdILGO7FvnUf5deOAR3EzQ23c09to5HHX9m+fMz
5cNmjvx3wZ0R/AsMtiLU+3nL6EVMZQOLmgF1B9IokrnztRBzZqqSuHyzzxD48GJp
W5l+OCoHuk0F/qLvI6/P
=Ja54
-----END PGP SIGNATURE-----

3
libreoffice-6.0.4.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9081fb132090e9fe1ed8896ba4085e6f7ceef145f3a76889caeaed6c032510f7
size 204556512

16
libreoffice-6.0.4.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa7Gp/AAoJEPQ0oe+v7q6j9yoQANGF6k/+37D19kssT73GrVAP
nl7Wq1DOPOFw4MN/5WVCi3inyOq8VpYGvIRRcJba3X3abTxNNWRzENJBu+qKG9S5
RLhQVk5x2U87akREOkpbHocmkzkJi2Pnnky+P7lyhHwlSaPjvyL3kdR4qtoVh8W3
xSZs/lKZeeRoWGlH2CGF57rS8lFNqLV7gIEsY2zGv90hUqTY/DsO44PGCggUSrgK
yVrSG0HjRQ5GqSrE19LfzflnvsUS7UKtv3syYG0aOreT6hILoC6Qp5UHNwjEioLN
APzOtnwFe4fT7/xyV4CiWBghRr7yJQkeR2OzzHxVdn6zelI1wgw137nkA76qXcvY
5iZ9Wbge9tTURphQTJFf41/AF1G1qWtCcZgQSnyMzdPTeUOqpJET6J2tF9BkZz9W
UjxUDeRtv/ovDmuDzuN381M6s4tRQ050L5vr+4tJ4NC8P7M9bjfvwKG94GbutuyF
cMdwJRd63hJGEg4VsY91jpmr95shwUz1vQfvR1GkwuGlnuxiTaVAlyTYIjchlRoa
XtWDBlbxGCaujDMZPw178AOI9znAKG/plZdjsuM5FstMoQUFMgo/DnBctiyTiwcH
MMPUjozIlqriO7tkEyk3CTi7wzZzj0ksX2TrY2NStLUZtGFa+Zi2q6Tb/Vc6qkFb
6YIE/MNCLw4cQ3hSN1LT
=amm+
-----END PGP SIGNATURE-----

3
libreoffice-help-6.0.4.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25424c2be4e323bde79327ccfc293ba63c7319fe0cf71ff12a2c3ebfeb5628d9
size 2973004

16
libreoffice-help-6.0.4.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxaAAoJEPQ0oe+v7q6j+1UP/iqFG3ddTp4+dzSzyd0xSVI8
enhNa1bkvNcldCRJZuQI3xTOmWWBEGD9+QCgqvkuDsWtkcSoESNSbb/FvWIUK8e5
wp2e4RiSEFamK1VSjD4Ufd1aJqvVAsEYJEXY8oiyAmakp7QXNT/Z417gYW/lPTyd
nlei7PwJCAINjvjiEiC7S27Ud5E7+vYW0YphfynPHRXNnyp0cdwnN9LJVS+XrxKZ
c678CoGH+ogIetbbAkIpyd0bc/KSUU+4guUYOkTbAWyTvPUVsI0kVd9pd+peSCJk
Mxo/a0RQFDkf6vPXgrC69aYIpmFt7QxlvKzbIlAKXLG1H/nr4OeQMJ6TthnbgTbA
phbsuHdKzDAJ6gZOKfyh5uOajrwZ3Rr5Th2AW84eDRrItfW7cEAnZ1OxmfSI9hvw
GNNpwKAc9e5HkMH8JqjcwIGIplWOq3SI0uy+b99TNlCa6VOLRn3w+PYp583AOdIY
y3XdpFdyCfC5jrwtKL/zB1iPTeqJZ6bBk5VV2o7x9AMLTe2JS0X1vBlKUQkCYhUq
CgU16aUeMLq3bL3VzrKh+nZnnQ66nVPWBlWLVRHnQveZ2jA+GnVK1RRq+Aqi2Pmh
/2sBPfUaB+A7UWqKuvGLyeIcCrEpQPJeNANGdhTt1aLyiWCKsNBZMITJYNUBn1tO
GguP/8JcwQ1Me060j4w3
=rj9H
-----END PGP SIGNATURE-----

3
libreoffice-help-6.0.4.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cef0f0d54da925bb9a69725177ba8594683f5f7500f226bdeeaf344ecb5c41fc
size 2972636

16
libreoffice-help-6.0.4.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa7GqHAAoJEPQ0oe+v7q6j+XwP/2+6CKjRo1KUKD459ZDg5gUj
d6/ujSPvpCly2tsfVQ+gSmtXY/c+qFYWHG7tGGp20lxOfbpfG3oUTPBCTW4QMHw/
kAyvoMz4vGU9bS7vv5nJwuFEAE3qWESWPNDgkr+0IO3F+m8P7w5XzxE8z78jPJyw
7jxwLcl9eKzySnq08hvTpXzuvo5lMal3TH2bO6lkJv6U1HR4Fxm8BVA2mfH+wrBQ
tyb5Nofp0MG7Y8wPVa/Fku+dZgXMhz2WBpOUtjjnfK3qZNUZtjJGt1IeBJt7UPm2
nRkem593KjR0fTFjglS/zjW1BlnpZDPE0h7JhBNkHjSAtU0Lbn3Kx9h4bYb6fBgX
G9PDPpKS/88Y1dBwpYk+ys9qfiFHYzg/hDu4bbQXMcvY+XM/Fog81tEij1iMRqLQ
RF8hTeQqnzGkaRMToDKnWbzJnQpFx2s2B9WHhcVU6+lfv4YmtTchBnammIcRTx2l
lx6+0VirGjHTFHuY7fROcEcGh4kMuwMrFvlPM9aUJt3RqVHKYSSkAzgJDQk9PIzJ
nC+mw7D7D7oOjvy0Yb08qI+Sd//rFZDeBfpvd3+69vT20rWlsJcwNTLoNp2XDDHq
9cZmWi4ePVz3tuaqIZAURvacwPUr/uX4GY6a51agXPh6I9E4J4VaBkSvkgLwYj3Y
J0ZBeve4JWQ68Aoi0+IV
=rdh3
-----END PGP SIGNATURE-----

307
libreoffice-icu61.patch
View File

@ -1,3 +1,75 @@
From ad3b7c27cdc957a8a38876c040e86a81c3cf7003 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 18 Dec 2017 20:33:03 +0100
Subject: Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: Ia051e8e2aa64b0e32a7f16a2afebaef0e4ebf531
Reviewed-on: https://gerrit.libreoffice.org/46739
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
i18nutil/source/utility/unicode.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 96c0194..f225b3a 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -750,15 +750,15 @@ OUString unicode::formatPercent(double dNumber,
icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
- std::unique_ptr<NumberFormat> xF(
- NumberFormat::createPercentInstance(aLocale, errorCode));
+ std::unique_ptr<icu::NumberFormat> xF(
+ icu::NumberFormat::createPercentInstance(aLocale, errorCode));
if(U_FAILURE(errorCode))
{
- SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
+ SAL_WARN("i18n", "icu::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());
--
cgit v1.1
From f240332f8e965ea17b70b0ccaa9990ce0a53cfc6 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Tue, 19 Dec 2017 15:22:09 +0100
Subject: vcl: explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: Iecb30b903e9a67252147a8cc78c641621d763755
---
vcl/inc/scrptrun.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index cbe151d..46a5c08 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -58,7 +58,7 @@ struct ParenStackEntry
}
};
-class ScriptRun : public UObject {
+class ScriptRun : public icu::UObject {
public:
ScriptRun(const UChar chars[], int32_t length);
--
cgit v1.1
From f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 18 Dec 2017 20:28:07 +0100
@ -11,12 +83,133 @@ Reviewed-on: https://gerrit.libreoffice.org/46738
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
i18npool/source/collator/collator_unicode.cxx | 16 ++++++++--------
i18npool/inc/collator_unicode.hxx | 2 +-
.../source/breakiterator/breakiterator_unicode.cxx | 26 +++++++++++-----------
i18npool/source/collator/collator_unicode.cxx | 16 ++++++-------
i18npool/source/collator/gencoll_rule.cxx | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 2 +-
.../transliteration/ignoreDiacritics_CTL.cxx | 6 ++---
6 files changed, 27 insertions(+), 27 deletions(-)
(limited to 'i18npool/source/collator')
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 69d3177..d943bc9 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -63,7 +63,7 @@ public:
private:
const sal_Char *implementationName;
- 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 a81a80e..02da856 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
}
/*
- Wrapper class to provide public access to the RuleBasedBreakIterator's
+ Wrapper class to provide public access to the icu::RuleBasedBreakIterator's
setbreakType method.
*/
-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
+class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
{
public:
#if (U_ICU_VERSION_MAJOR_NUM < 58)
- // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
+ // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
void publicSetBreakType(int32_t type)
{
setBreakType(type);
@@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
#endif
OOoRuleBasedBreakIterator(UDataMemory* image,
UErrorCode &status)
- : RuleBasedBreakIterator(image, status)
+ : icu::RuleBasedBreakIterator(image, status)
{ };
};
@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
for (nDone = 0; nDone < nCount; nDone++) {
nStartPos = pBI->following(nStartPos);
- if (nStartPos == BreakIterator::DONE)
+ if (nStartPos == icu::BreakIterator::DONE)
return Text.getLength();
}
} else { // for CHARACTER mode
@@ -353,7 +353,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
for (nDone = 0; nDone < nCount; nDone++) {
nStartPos = pBI->preceding(nStartPos);
- if (nStartPos == BreakIterator::DONE)
+ if (nStartPos == icu::BreakIterator::DONE)
return 0;
}
} else { // for BS to delete one char and CHARACTER mode.
@@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
Boundary rv;
rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos);
- if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE )
+ if( rv.startPos >= Text.getLength() || rv.startPos == icu::BreakIterator::DONE )
rv.endPos = result.startPos;
else {
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
@@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
rv.startPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
- if(rv.endPos == BreakIterator::DONE)
+ if(rv.endPos == icu::BreakIterator::DONE)
rv.endPos = rv.startPos;
}
return rv;
@@ -394,7 +394,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
Boundary rv;
rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos);
- if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE)
+ if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE)
rv.endPos = rv.startPos;
else {
if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
@@ -403,7 +403,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(rv.startPos);
rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
- if(rv.endPos == BreakIterator::DONE)
+ if(rv.endPos == icu::BreakIterator::DONE)
rv.endPos = rv.startPos;
}
return rv;
@@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos);
}
}
- if (rv.startPos == BreakIterator::DONE)
+ if (rv.startPos == icu::BreakIterator::DONE)
rv.startPos = rv.endPos;
- else if (rv.endPos == BreakIterator::DONE)
+ else if (rv.endPos == icu::BreakIterator::DONE)
rv.endPos = rv.startPos;
return rv;
@@ -502,7 +502,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 = (pLineBI->next() != BreakIterator::DONE) ? pLineBI->current() : 0;
+ sal_Int32 boundary_with_punctuation = (pLineBI->next() != icu::BreakIterator::DONE) ? pLineBI->current() : 0;
pLineBI->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 71bc4ed..37dc7ee 100644
--- a/i18npool/source/collator/collator_unicode.cxx
@ -88,6 +281,114 @@ index 7d795b5..3048d12 100644
if (U_SUCCESS(status)) {
std::vector<uint8_t> data;
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 1a63dcb..b9efd51 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;
- std::unique_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
+ std::unique_ptr<icu::NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
if (!U_SUCCESS(nCode))
return retValue;
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index 0ddfe64..2b5ca1e 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -35,7 +35,7 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar)
if (!m_transliterator)
throw css::uno::RuntimeException();
- UnicodeString aChar(nInChar);
+ icu::UnicodeString aChar(nInChar);
m_transliterator->transliterate(aChar);
if (aChar.isEmpty())
@@ -68,7 +68,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
{
sal_Int32 nIndex = nPosition;
UChar32 nChar = rInStr.iterateCodePoints(&nIndex);
- UnicodeString aUStr(nChar);
+ icu::UnicodeString aUStr(nChar);
m_transliterator->transliterate(aUStr);
if (nOffset + aUStr.length() > rOffset.getLength())
@@ -87,7 +87,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
}
else
{
- UnicodeString aUStr(reinterpret_cast<const UChar*>(rInStr.getStr()) + nStartPos, nCount);
+ icu::UnicodeString aUStr(reinterpret_cast<const UChar*>(rInStr.getStr()) + nStartPos, nCount);
m_transliterator->transliterate(aUStr);
return OUString(reinterpret_cast<const sal_Unicode*>(aUStr.getBuffer()), aUStr.length());
}
--
cgit v1.1
From 7c46e0086802c22f5a5040d9161d4d2b3b2a3aff Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 18 Dec 2017 20:38:59 +0100
Subject: Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: If7f1330550981fd28eb7eea6329f21e116291cca
Reviewed-on: https://gerrit.libreoffice.org/46740
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
lotuswordpro/source/filter/localtime.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
index 47d2024..3805c5d 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -174,7 +174,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;
--
cgit v1.1
From 8960ecc689ce41cfaa40b65d75830d7491b06463 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 18 Dec 2017 20:41:30 +0100
Subject: Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
Reviewed-on: https://gerrit.libreoffice.org/46741
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
opencl/source/openclconfig.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index b81ffed..0ec2347 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -119,7 +119,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);
return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError);
}
--
cgit v1.1

3
libreoffice-translations-6.0.4.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c57414653ca36d5f40d6572dc5c1e8be63404b16e323864c80ab473e28b9acaa
size 139188068

16
libreoffice-translations-6.0.4.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxdAAoJEPQ0oe+v7q6jqs0P/1mnB5FQvFGFyusS6UEBFyrN
ATymAcU4swPHr0clbmNlPnsaWsFi6laq68ZZRWqITTTKbP3v22E0dpaX2urW0YRX
PYIrMmploJFDvsc6FmBQNcViA2VsQU8ldXE+f2zUNnobXWb09UekOwiMDh/v/TEN
iLEgP0nHQ3W5xcI4F27adPvqENiHohqHG4Ro4OXTFlcHlc14jTzA93skEuUw66dX
5FF8LC13eUo3Bbb2KEaZLp5usN5D3ZVtgxG9c3R0Eq/OVcSvlLsyOzFC2z5XG0O/
s5+9c9kl5Uy9WZR6Ac1C/OWzqfn6hdDapHEy66E5l6QH2VCDgOybvTZudm8Rcg2I
j56DijW8/+EOX/2/iwYAyGi3i98VfBx4FOhCsWf26UIWpE5UjLWqmofW3tUQpGPX
9ubE89a5m6hbdiHhQ36t5ybme9QJkM/G6a7qmq7xNZm+gWubdVeHUiotac/PzclV
lvTzsk9Z5VzJ7103nJIwJfVBM00KdSE9AY7BRyzE9qEyVY/2MjHCzDAwQzvRDOsX
XC+u0uItrAa8jRmP+yhsS66Mon8nk/jYC0m5ped8Yp2V3O7IskgOQLzAL1oKjx+A
D9A8JojsgCQv2g8wlcO/zzxMLSyAK7mgQkz86Cubk4LSa4jTvI8j7llEaBZFX9AC
1/f05cONlpOy5raeh6UP
=fcuj
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.0.4.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:865f78003114c9333d8df63ee64197b25f1894c5dd1038f563abb4c91a1c542e
size 139214448

16
libreoffice-translations-6.0.4.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa7GqKAAoJEPQ0oe+v7q6jSeAP/0iOer7KQKJ83xCzJDFCzkeU
Cq/Nxs0vwgUeMCjdr4dMofkOyjJjwvNwvYEn0HPZa+QKlmcDPswdqFw4l6cB4rDj
dCsGvBTWXXbMZG95vvfq96AGyupcKVV9tT+Xi5PMvrHCdHukYt+lWG4mZ//0XKzQ
7AT8kl5ki+X3kXutSCJZHU3GfUwHNi2UTgO7UHh4Zx3K5ZHo43uaosoCK/keF9Kd
jYAT0JQZx1QxfThTXh7/UTRPwrYr2OXBHgWuSCUPBlOE9BDjUDDhDjqqKP1gVJnN
yPCNqmUICgPaKmjHDbYS8eDaY6XR8T73YxAKrfSTJBE98zbyLUSsjyNKYFnjyHeR
YQAS+G8nGO8nDh8Wvim705mRjL6oNLV68DMCVN1ljiAgWxwHn0eZc/l6FlAwYXUc
0Tw1zMt76jkVHLPG+pPVHb4gg1/R5DD9bmC+geO0Qp2QEMpxcI4XMJ/+dcNBYr4g
t9Yl0dXWykxSaKrGC4KmmE+rsByWuqcRDXXzrnQO1duMT4Q8eT18JECmqVJeFYdj
H5qb9dVUxIlQdppoEAbXsy/+VJLRLe7XMr44lSyatvyF/NjZES9Bgj49iTExePEh
2O9u3mQvXJttpz2XkhDdr1sJhhChYPoLW3VBKucG6T6guNHXObokgPanrPnR82IG
GbDJqakXguuTEgeJAGpZ
=Afez
-----END PGP SIGNATURE-----

27
libreoffice.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu May 17 05:25:15 UTC 2018 - bosim@opensuse.org
- Add supplements for xfce4-session for libreoffice-gtk3 to install
that package when xfce is present (boo#1092699).
-------------------------------------------------------------------
Wed May 16 10:58:54 UTC 2018 - bjorn.lie@gmail.com
- Add condtional for Libreoffice Supplement in libreoffice-base, no
longer install libreoffice-base by default for future versions of
openSUSE.
-------------------------------------------------------------------
Wed May 9 08:59:02 UTC 2018 - tchvatal@suse.com
- Extend the icu patch with more patches wrt bsc#1091772
* libreoffice-icu61.patch
-------------------------------------------------------------------
Wed May 9 07:57:58 UTC 2018 - tchvatal@suse.com
- Bump to 6.0.4.2:
* 2 more fixes on top of 6.0.4.1
-------------------------------------------------------------------
Wed Apr 25 08:46:16 UTC 2018 - tchvatal@suse.com
@ -16,7 +41,7 @@ Mon Apr 23 08:32:48 UTC 2018 - tchvatal@suse.com
-------------------------------------------------------------------
Fri Apr 20 12:39:00 UTC 2018 - tchvatal@suse.com
- Fix build with new icu 61+
- Fix build with new icu 61+ bsc#1091772
* libreoffice-icu61.patch
-------------------------------------------------------------------

5
libreoffice.spec
View File

@ -54,7 +54,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.0.4.1
Version: 6.0.4.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -384,7 +384,9 @@ Summary: LibreOffice Base
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
%if 0%{?suse_version} <= 1500
Supplements: %{name}
%endif
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
@ -524,6 +526,7 @@ Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version}
Supplements: packageand(libreoffice:gnome-session)
Supplements: packageand(libreoffice:mate-session-manager)
Supplements: packageand(libreoffice:xfce4-session)
%description gtk3
This package contains Gtk3 interface rendering option for LibreOffice.