The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=30b044...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=404131....
Change:
+ExcludeArch: %{ix86}
-ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 6aee6ad00c496189a4330d3ebc18a43e71b97170
Merge: 6ae9627 ad255e6
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 14:43:56 2018 +0100
Merge branch 'master' into f28
commit ad255e6ca2fd87a89cc435483d86b5848fbe43d6
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 14:39:42 2018 +0100
Resolves: rhbz#1601882 fails to build with --nocheck
diff --git a/libreoffice.spec b/libreoffice.spec
index 62748ad..21876de 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
-Release: 1%{?libo_prerelease}%{?dist}
+Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -1256,6 +1256,8 @@ ln -s %{_datadir}/autocorr
%{buildroot}%{baseinstdir}/share/autocorr
#remove it in case we didn't build with gcj
rm -f %{buildroot}%{baseinstdir}/program/classes/sandbox.jar
+# we don't need this in the install
+rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
#remove dummy .dat files
rm -f %{buildroot}%{baseinstdir}/program/root?.dat
@@ -1476,14 +1478,9 @@ done
%check
%ifnarch ppc64 s390x aarch64
make
-%endif
-unset WITH_LANG
-# work around flawed accessibility check
-export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
-export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
-# timeout -k 2m 2h make smoketest.subsequentcheck
# we don't need this anymore
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
+%endif
%files
@@ -2321,6 +2318,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
+* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-2
+- Resolves: rhbz#1601882 fails to build with --nocheck
+
* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-1
- latest 6.0 release
commit 39494f6c1c62b2b23f1533c0ab99fbc95901ac04
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 11:50:15 2018 +0100
drop merged 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
diff --git a/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
b/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
deleted file mode 100644
index 75ef102..0000000
--- a/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cf8cb4348f270462c217d7850a509f71029153fc Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman(a)redhat.com>
-Date: Tue, 3 Jul 2018 08:33:34 +0200
-Subject: [PATCH] const fixes for python3-devel-3.7.0-1.fc29.x86_64
-
-Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c
----
- pyuno/source/module/pyuno_impl.hxx | 2 +-
- pyuno/source/module/pyuno_type.cxx | 2 +-
- pyuno/source/module/pyuno_util.cxx | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
-index ea0e419ffb1b..73acabdf4a16 100644
---- a/pyuno/source/module/pyuno_impl.hxx
-+++ b/pyuno/source/module/pyuno_impl.hxx
-@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string)
- return PyUnicode_FromString(string);
- }
-
--inline char * PyStr_AsString(PyObject *object)
-+inline char const * PyStr_AsString(PyObject *object)
- {
- return PyUnicode_AsUTF8(object);
- }
-diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
-index c6fc1351436b..80505d85bbd1 100644
---- a/pyuno/source/module/pyuno_type.cxx
-+++ b/pyuno/source/module/pyuno_type.cxx
-@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj )
- }
-
- OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) )
);
-- char *stringValue = PyStr_AsString( value.get() );
-+ char const *stringValue = PyStr_AsString( value.get() );
-
- TypeDescription desc( strTypeName );
- if( !desc.is() )
-diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
-index 45ee5a38e40b..f9714fb270f0 100644
---- a/pyuno/source/module/pyuno_util.cxx
-+++ b/pyuno/source/module/pyuno_util.cxx
-@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr )
- #else
- #if PY_MAJOR_VERSION >= 3
- Py_ssize_t size(0);
-- char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
-+ char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
- ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
- #else
- PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
---
-2.17.1
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 2c186ab..62748ad 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,7 +273,6 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
-Patch6: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
%if 0%{?rhel}
# not upstreamed
commit 68779e597fb5af843fcf7e73edbea398760622b8
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 11:37:52 2018 +0100
drop merged 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
deleted file mode 100644
index 4b9442e..0000000
--- a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+++ /dev/null
@@ -1,410 +0,0 @@
-From cc0b086988c23525f6f7825cb735e8a0d1c54720 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack(a)redhat.com>
-Date: Mon, 18 Dec 2017 20:28:07 +0100
-Subject: [PATCH] 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: I16b6bc8b8c49713f32424df5fc6db494df7b6892
-Reviewed-on:
https://gerrit.libreoffice.org/46738
-Reviewed-by: Eike Rathke <erack(a)redhat.com>
-Tested-by: Eike Rathke <erack(a)redhat.com>
-(cherry picked from commit f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5)
-Reviewed-on:
https://gerrit.libreoffice.org/56664
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- i18npool/inc/collator_unicode.hxx | 2 +-
- .../breakiterator/breakiterator_unicode.cxx | 26 +++++++++----------
- i18npool/source/collator/collator_unicode.cxx | 16 ++++++------
- i18npool/source/collator/gencoll_rule.cxx | 2 +-
- .../source/ordinalsuffix/ordinalsuffix.cxx | 2 +-
- .../transliteration/ignoreDiacritics_CTL.cxx | 6 ++---
- 6 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
-index 69d317797870..d943bc9bc2c1 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 b4ca111179c1..77fabbfce84b 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 22b7ed9ae492..552c95ed35f1 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::get()->getCollatorRuleByAlgorithm(rLocale,
rAlgorithm);
- if (!rule.isEmpty()) {
-- collator = new RuleBasedCollator(reinterpret_cast<const UChar
*>(rule.getStr()), status);
-+ collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar
*>(rule.getStr()), status);
- if (! U_SUCCESS(status)) throw RuntimeException();
- }
- if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language)
>= 0) {
-@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString&
rAlgorithm, const lang::
- size_t ruleImageSize = funclen();
-
- #if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
-- uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL),
status);
-+ uca_base = new icu::RuleBasedCollator(static_cast<UChar*>(NULL),
status);
- #else
- // Not only changed ICU 53.1 the API behavior that a negative
- // length (ruleImageSize) now leads to failure, but also that
-@@ -354,11 +354,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();
- }
-@@ -372,17 +372,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 7d795b5af079..3048d12bb90b 100644
---- a/i18npool/source/collator/gencoll_rule.cxx
-+++ b/i18npool/source/collator/gencoll_rule.cxx
-@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
- //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
- // UCOL_DEFAULT_STRENGTH, &parseError, &status);
-
-- auto coll = o3tl::make_unique<RuleBasedCollator>(reinterpret_cast<const
UChar *>(Obuf.getStr()), status);
-+ auto coll =
o3tl::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar
*>(Obuf.getStr()), status);
-
- if (U_SUCCESS(status)) {
- std::vector<uint8_t> data;
-diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
-index a3e7d4ab6e8e..f32579894d44 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 0ddfe645abaa..2b5ca1ed1bdb 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());
- }
---
-2.17.1
-
-From 8790243df458250b00de67bf6fc892b3fa5660ad Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack(a)redhat.com>
-Date: Mon, 18 Dec 2017 20:41:30 +0100
-Subject: [PATCH] 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(a)redhat.com>
-Tested-by: Eike Rathke <erack(a)redhat.com>
-(cherry picked from commit 8960ecc689ce41cfaa40b65d75830d7491b06463)
-Reviewed-on:
https://gerrit.libreoffice.org/56680
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)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 b81ffed22937..0ec2347fb332 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);
- }
---
-2.17.1
-
-From 63ebde2117d768c974252db9c4d9cce1ef4334c6 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack(a)redhat.com>
-Date: Mon, 18 Dec 2017 20:33:03 +0100
-Subject: [PATCH] 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(a)redhat.com>
-Tested-by: Eike Rathke <erack(a)redhat.com>
-(cherry picked from commit ad3b7c27cdc957a8a38876c040e86a81c3cf7003)
-Reviewed-on:
https://gerrit.libreoffice.org/56713
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)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 0173a4ad5fbf..697875b193e3 100644
---- a/i18nutil/source/utility/unicode.cxx
-+++ b/i18nutil/source/utility/unicode.cxx
-@@ -750,15 +750,15 @@ OUString SAL_CALL 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());
---
-2.17.1
-
-From 4d06789a836f1a271399cd9955b2cb96030f393a Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack(a)redhat.com>
-Date: Tue, 19 Dec 2017 15:22:09 +0100
-Subject: [PATCH] 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
-(cherry picked from commit f240332f8e965ea17b70b0ccaa9990ce0a53cfc6)
-Reviewed-on:
https://gerrit.libreoffice.org/56735
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- 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 cbe151df491d..46a5c08f3ab5 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);
---
-2.17.1
-
-From 39d2a681dd6b6b8b94770d7cade9099936e46e2d Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack(a)redhat.com>
-Date: Mon, 18 Dec 2017 20:38:59 +0100
-Subject: [PATCH] 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(a)redhat.com>
-Tested-by: Eike Rathke <erack(a)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 47d202412724..3805c5d6f973 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;
---
-2.17.1
-
diff --git a/libreoffice.spec b/libreoffice.spec
index a0ef511..2c186ab 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,8 +273,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
-Patch6: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
-Patch7: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
+Patch6: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
%if 0%{?rhel}
# not upstreamed
commit 522fee9a58d4cdbfb207225ecb6cfa6b5a1a275d
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 11:22:05 2018 +0100
drop merged 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
diff --git a/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
b/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
deleted file mode 100644
index d60ddb8..0000000
--- a/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c6c82096301180cfa7942dd9fb9d1cb66c7ecc04 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Thu, 31 May 2018 13:49:40 +0100
-Subject: [PATCH] tdf#117537 block rentry to CheckAndMarkUnknownFont
-
-Change-Id: I70e75a39d13e93e929c7aef5407b1100bb2a7c12
-Reviewed-on:
https://gerrit.libreoffice.org/55131
-Tested-by: Jenkins <ci(a)libreoffice.org>
-Reviewed-by: Miklos Vajna <vmiklos(a)collabora.co.uk>
----
- svx/source/tbxctrls/tbcontrl.cxx | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
-index 997520fd5e32..c5c19346ce3f 100644
---- a/svx/source/tbxctrls/tbcontrl.cxx
-+++ b/svx/source/tbxctrls/tbcontrl.cxx
-@@ -192,6 +192,7 @@ private:
- Reference< XDispatchProvider > m_xDispatchProvider;
- Reference< XFrame > m_xFrame;
- bool mbEndPreview;
-+ bool mbCheckingUnknownFont;
-
- void ReleaseFocus_Impl();
- void EnableControls_Impl();
-@@ -970,7 +971,8 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const
Reference<
- bRelease ( true ),
- m_xDispatchProvider( rDispatchProvider ),
- m_xFrame (_xFrame),
-- mbEndPreview(false)
-+ mbEndPreview(false),
-+ mbCheckingUnknownFont(false)
- {
- SetOptimalSize();
- EnableControls_Impl();
-@@ -1002,6 +1004,9 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont,
VclWindowEvent&, event,
- {
- if( event.GetId() != VclEventId::EditModify )
- return;
-+ if (mbCheckingUnknownFont) //tdf#117537 block rentry
-+ return;
-+ mbCheckingUnknownFont = true;
- OUString fontname = GetSubEdit()->GetText();
- lcl_GetDocFontList( &pFontList, this );
- // If the font is unknown, show it in italic.
-@@ -1024,6 +1029,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont,
VclWindowEvent&, event,
- SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
- }
- }
-+ mbCheckingUnknownFont = false;
- }
-
- void SvxFontNameBox_Impl::Update( const css::awt::FontDescriptor* pFontDesc )
---
-2.17.0
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 2a50e2a..a0ef511 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,9 +273,8 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
-Patch6: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
-Patch7: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
-Patch8: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
+Patch6: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+Patch7: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
%if 0%{?rhel}
# not upstreamed
commit 340143662691722207ca22e1062ce42a0873de53
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Jul 17 11:01:33 2018 +0100
latest 6.0 release
diff --git a/.gitignore b/.gitignore
index 3e12cb7..379c27c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,9 @@
/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
/185d60944ea767075d27247c3162b3bc-unowinreg.dll
/libreoffice-multiliblauncher.sh
-/libreoffice-6.0.5.2.tar.xz
-/libreoffice-6.0.5.2.tar.xz.asc
-/libreoffice-help-6.0.5.2.tar.xz
-/libreoffice-help-6.0.5.2.tar.xz.asc
-/libreoffice-translations-6.0.5.2.tar.xz
-/libreoffice-translations-6.0.5.2.tar.xz.asc
+/libreoffice-6.0.6.1.tar.xz
+/libreoffice-6.0.6.1.tar.xz.asc
+/libreoffice-help-6.0.6.1.tar.xz
+/libreoffice-help-6.0.6.1.tar.xz.asc
+/libreoffice-translations-6.0.6.1.tar.xz
+/libreoffice-translations-6.0.6.1.tar.xz.asc
diff --git a/libreoffice.spec b/libreoffice.spec
index e2f7f92..2a50e2a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 6.0.5
+%global libo_version 6.0.6
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -63,8 +63,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: %{libo_version}.2
-Release: 3%{?libo_prerelease}%{?dist}
+Version: %{libo_version}.1
+Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2324,6 +2324,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
+* Tue Jul 17 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.6.1-1
+- latest 6.0 release
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:6.0.5.2-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 8c9a13d..7d9f224 100644
--- a/sources
+++ b/sources
@@ -5,9 +5,9 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) =
854b8ae29b57b40ba6bb6f
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) =
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) =
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) =
db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
-SHA512 (libreoffice-6.0.5.2.tar.xz) =
796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
-SHA512 (libreoffice-6.0.5.2.tar.xz.asc) =
2838a1fc47d4a013cd0e6c37b1d3b32cbeb73184361b008f5a8e42d3d381cb37b868bbaded12c8c654798484f07f9d9a5e99487edd35c355f3a7ee395b1aab04
-SHA512 (libreoffice-help-6.0.5.2.tar.xz) =
975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
-SHA512 (libreoffice-help-6.0.5.2.tar.xz.asc) =
c7109e1d112386ddebd2990f87e24e25a1d5ba70e896bbc3f747dc62cf6061191d6baac31d1db2642c258256e9b4310c9c877a864a2e1c92bffc05b21e2a429d
-SHA512 (libreoffice-translations-6.0.5.2.tar.xz) =
5de62e013412cc0c681d7447bcbf2cebdeb4f2d6033c320dd95f6f8e39c7716ab9e0d2b864c4495c001381acbc6889e03577b767c7f0a010bacb954bc6887cee
-SHA512 (libreoffice-translations-6.0.5.2.tar.xz.asc) =
04d610d8bf83ee5ac8799a45aeadd197208c8ff8d621503a175f98e90fc74f3a6c9e4c4be0399fdb8a963fbff63ad5ee8644dde5b76bf3576e71faef6d4ebe6d
+SHA512 (libreoffice-6.0.6.1.tar.xz) =
38164d0da2f7376c62bf11dab880fe455c877e330b0191bb48ea197505e31d2391b3f540dfe074ec4fdc6ae6db831bc940a9eaa16e87dcdf536a9a91b0f4c965
+SHA512 (libreoffice-6.0.6.1.tar.xz.asc) =
c9e1cd59891fddbbbdadf1f71bdc863bf54dd69444adc68e1b5c7b65d847893502ddb2d05b3989c37039c999ebb721b2518c9e558b6f63cff8775b3577934915
+SHA512 (libreoffice-help-6.0.6.1.tar.xz) =
98469994f0cc382a579f553c1726eb1ff2959ea3efc57f503bfca48cef56a5c6c95c02a17ebbdec19fa3686dfeffc5a80fe0430841535651bea6570c7b95b389
+SHA512 (libreoffice-help-6.0.6.1.tar.xz.asc) =
017532f5df6a369ab0d0ad129ce46ffaaf3356a16ce17082c4d7ddbb6771a33b1f3237c5ece5a61d4066d35fae03d6b5de310f040db069ba007d61d03e81036a
+SHA512 (libreoffice-translations-6.0.6.1.tar.xz) =
0a3dd0825d30b96a92dd18624423ec92f8c1a8f3a8549a0dcab734f792677752b698d465ff424a1f3e24810f4b7a403d562ac35a89e3c6d1ad4e291db074c3e3
+SHA512 (libreoffice-translations-6.0.6.1.tar.xz.asc) =
a8d5835e864a5831cc5d0481cbf2e5a14103850405c3cea519e22f4223c480c4f1c8541df6ccc524534a6f9f7af6ac51dda3788796b82a6a6845d3d7ef917e9a
commit eda5ca74f9860ff121f2da579ff854895f68fd9b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 08:45:18 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libreoffice.spec b/libreoffice.spec
index a5ffe1a..e2f7f92 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2324,6 +2324,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:6.0.5.2-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.5.2-2
- Rebuild for ICU 62
commit b0c6e99a6b1a9147f1eb8c767c1e264dc45ee94e
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Tue Jul 10 21:55:04 2018 +0100
Rebuild for ICU 62
diff --git a/libreoffice.spec b/libreoffice.spec
index 83b3657..a5ffe1a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 1%{?libo_prerelease}%{?dist}
+Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2324,6 +2324,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
+* Tue Jul 10 2018 Pete Walter <pwalter(a)fedoraproject.org> - 1:6.0.5.2-2
+- Rebuild for ICU 62
+
* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
- latest 6.0 release
- fix for ICU 61
commit 40413161f39763c8f30f6ee753107bb6287aa540
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Jul 9 17:09:23 2018 +0200
Enable the i686 build again
diff --git a/libreoffice.spec b/libreoffice.spec
index 753160a..83b3657 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -68,8 +68,6 @@ Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
-ExcludeArch: %{ix86}
-
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
commit 30b044d14ab8b49a2127af8b0705a14527226093
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Jul 9 16:36:03 2018 +0200
Temporarily disable the build on i686
This should let us to get the Python 3.7 rebuild done on other arches at
least.
diff --git a/libreoffice.spec b/libreoffice.spec
index 83b3657..753160a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -68,6 +68,8 @@ Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
+ExcludeArch: %{ix86}
+
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
commit 7fcbad12f50428de8e5e7e73e8ed517539814c1d
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Jul 4 10:11:01 2018 +0200
Explicitly buildrequire /usr/bin/python
It's now in a separate package and not pulled in by python3-devel.
https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_...
diff --git a/libreoffice.spec b/libreoffice.spec
index ea3924d..83b3657 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -218,6 +218,7 @@ BuildRequires: pkgconfig(xmlsec1-nss)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zlib)
BuildRequires: unixODBC-devel
+BuildRequires: /usr/bin/python
# libs / headers - conditional
%if 0%{?fedora}
commit b21d7378217999d3eb8d8b29416c764cb4d544f7
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Tue Jul 3 08:36:29 2018 +0200
fix for Python 3.7
diff --git a/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
b/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
new file mode 100644
index 0000000..75ef102
--- /dev/null
+++ b/0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
@@ -0,0 +1,54 @@
+From cf8cb4348f270462c217d7850a509f71029153fc Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman(a)redhat.com>
+Date: Tue, 3 Jul 2018 08:33:34 +0200
+Subject: [PATCH] const fixes for python3-devel-3.7.0-1.fc29.x86_64
+
+Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c
+---
+ pyuno/source/module/pyuno_impl.hxx | 2 +-
+ pyuno/source/module/pyuno_type.cxx | 2 +-
+ pyuno/source/module/pyuno_util.cxx | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
+index ea0e419ffb1b..73acabdf4a16 100644
+--- a/pyuno/source/module/pyuno_impl.hxx
++++ b/pyuno/source/module/pyuno_impl.hxx
+@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string)
+ return PyUnicode_FromString(string);
+ }
+
+-inline char * PyStr_AsString(PyObject *object)
++inline char const * PyStr_AsString(PyObject *object)
+ {
+ return PyUnicode_AsUTF8(object);
+ }
+diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
+index c6fc1351436b..80505d85bbd1 100644
+--- a/pyuno/source/module/pyuno_type.cxx
++++ b/pyuno/source/module/pyuno_type.cxx
+@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj )
+ }
+
+ OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) )
);
+- char *stringValue = PyStr_AsString( value.get() );
++ char const *stringValue = PyStr_AsString( value.get() );
+
+ TypeDescription desc( strTypeName );
+ if( !desc.is() )
+diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
+index 45ee5a38e40b..f9714fb270f0 100644
+--- a/pyuno/source/module/pyuno_util.cxx
++++ b/pyuno/source/module/pyuno_util.cxx
+@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr )
+ #else
+ #if PY_MAJOR_VERSION >= 3
+ Py_ssize_t size(0);
+- char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
++ char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
+ ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
+ #else
+ PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
+--
+2.17.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e4b74dc..ea3924d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -274,6 +274,7 @@ Patch4:
0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
Patch6: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
Patch7: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+Patch8: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
%if 0%{?rhel}
# not upstreamed
@@ -2325,6 +2326,7 @@ done
* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
- latest 6.0 release
- fix for ICU 61
+- fix for Python 3.7
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.0.4.2-5
- Rebuilt for Python 3.7
commit aec8f095d2eb1828546ddc8311c56f12d74b3f72
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Sun Jul 1 16:32:30 2018 +0200
more fix for ICU 61
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
index e780e6d..4b9442e 100644
--- a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+++ b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
@@ -376,3 +376,35 @@ index cbe151df491d..46a5c08f3ab5 100644
--
2.17.1
+From 39d2a681dd6b6b8b94770d7cade9099936e46e2d Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack(a)redhat.com>
+Date: Mon, 18 Dec 2017 20:38:59 +0100
+Subject: [PATCH] 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(a)redhat.com>
+Tested-by: Eike Rathke <erack(a)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 47d202412724..3805c5d6f973 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;
+--
+2.17.1
+
commit 8f6bf774e4ca39971184fed90bf1fe0d6f6898ac
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Fri Jun 29 23:38:36 2018 +0200
more fix for ICU 61
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
index f8bd7af..e780e6d 100644
--- a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+++ b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
@@ -343,3 +343,36 @@ index 0173a4ad5fbf..697875b193e3 100644
--
2.17.1
+From 4d06789a836f1a271399cd9955b2cb96030f393a Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack(a)redhat.com>
+Date: Tue, 19 Dec 2017 15:22:09 +0100
+Subject: [PATCH] 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
+(cherry picked from commit f240332f8e965ea17b70b0ccaa9990ce0a53cfc6)
+Reviewed-on:
https://gerrit.libreoffice.org/56735
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
+---
+ 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 cbe151df491d..46a5c08f3ab5 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);
+--
+2.17.1
+
commit a6a21c0a99781a1184c98dd334a66d4d60f3fa54
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Fri Jun 29 21:02:31 2018 +0200
more fix for ICU 61
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
index 4ade7ca..f8bd7af 100644
--- a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+++ b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
@@ -296,3 +296,50 @@ index b81ffed22937..0ec2347fb332 100644
--
2.17.1
+From 63ebde2117d768c974252db9c4d9cce1ef4334c6 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack(a)redhat.com>
+Date: Mon, 18 Dec 2017 20:33:03 +0100
+Subject: [PATCH] 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(a)redhat.com>
+Tested-by: Eike Rathke <erack(a)redhat.com>
+(cherry picked from commit ad3b7c27cdc957a8a38876c040e86a81c3cf7003)
+Reviewed-on:
https://gerrit.libreoffice.org/56713
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)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 0173a4ad5fbf..697875b193e3 100644
+--- a/i18nutil/source/utility/unicode.cxx
++++ b/i18nutil/source/utility/unicode.cxx
+@@ -750,15 +750,15 @@ OUString SAL_CALL 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());
+--
+2.17.1
+
commit 7dc833af63c1bc4c26fb8498cc1e61e94de1aa41
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Fri Jun 29 14:48:52 2018 +0200
more fix for ICU 61
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
index 424dca7..4ade7ca 100644
--- a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+++ b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
@@ -260,3 +260,39 @@ index 0ddfe645abaa..2b5ca1ed1bdb 100644
--
2.17.1
+From 8790243df458250b00de67bf6fc892b3fa5660ad Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack(a)redhat.com>
+Date: Mon, 18 Dec 2017 20:41:30 +0100
+Subject: [PATCH] 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(a)redhat.com>
+Tested-by: Eike Rathke <erack(a)redhat.com>
+(cherry picked from commit 8960ecc689ce41cfaa40b65d75830d7491b06463)
+Reviewed-on:
https://gerrit.libreoffice.org/56680
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)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 b81ffed22937..0ec2347fb332 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);
+ }
+--
+2.17.1
+
commit 15431538c41aa15f5e7ffbaea435ac77d4434166
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Fri Jun 29 11:01:44 2018 +0200
fix for ICU 61
diff --git a/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
new file mode 100644
index 0000000..424dca7
--- /dev/null
+++ b/0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
@@ -0,0 +1,262 @@
+From cc0b086988c23525f6f7825cb735e8a0d1c54720 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack(a)redhat.com>
+Date: Mon, 18 Dec 2017 20:28:07 +0100
+Subject: [PATCH] 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: I16b6bc8b8c49713f32424df5fc6db494df7b6892
+Reviewed-on:
https://gerrit.libreoffice.org/46738
+Reviewed-by: Eike Rathke <erack(a)redhat.com>
+Tested-by: Eike Rathke <erack(a)redhat.com>
+(cherry picked from commit f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5)
+Reviewed-on:
https://gerrit.libreoffice.org/56664
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
+---
+ i18npool/inc/collator_unicode.hxx | 2 +-
+ .../breakiterator/breakiterator_unicode.cxx | 26 +++++++++----------
+ i18npool/source/collator/collator_unicode.cxx | 16 ++++++------
+ i18npool/source/collator/gencoll_rule.cxx | 2 +-
+ .../source/ordinalsuffix/ordinalsuffix.cxx | 2 +-
+ .../transliteration/ignoreDiacritics_CTL.cxx | 6 ++---
+ 6 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
+index 69d317797870..d943bc9bc2c1 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 b4ca111179c1..77fabbfce84b 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 22b7ed9ae492..552c95ed35f1 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::get()->getCollatorRuleByAlgorithm(rLocale,
rAlgorithm);
+ if (!rule.isEmpty()) {
+- collator = new RuleBasedCollator(reinterpret_cast<const UChar
*>(rule.getStr()), status);
++ collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar
*>(rule.getStr()), status);
+ if (! U_SUCCESS(status)) throw RuntimeException();
+ }
+ if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language)
>= 0) {
+@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString&
rAlgorithm, const lang::
+ size_t ruleImageSize = funclen();
+
+ #if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
+- uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL),
status);
++ uca_base = new icu::RuleBasedCollator(static_cast<UChar*>(NULL),
status);
+ #else
+ // Not only changed ICU 53.1 the API behavior that a negative
+ // length (ruleImageSize) now leads to failure, but also that
+@@ -354,11 +354,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();
+ }
+@@ -372,17 +372,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 7d795b5af079..3048d12bb90b 100644
+--- a/i18npool/source/collator/gencoll_rule.cxx
++++ b/i18npool/source/collator/gencoll_rule.cxx
+@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+ //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
+ // UCOL_DEFAULT_STRENGTH, &parseError, &status);
+
+- auto coll = o3tl::make_unique<RuleBasedCollator>(reinterpret_cast<const
UChar *>(Obuf.getStr()), status);
++ auto coll =
o3tl::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar
*>(Obuf.getStr()), status);
+
+ if (U_SUCCESS(status)) {
+ std::vector<uint8_t> data;
+diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+index a3e7d4ab6e8e..f32579894d44 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 0ddfe645abaa..2b5ca1ed1bdb 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());
+ }
+--
+2.17.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 72ba18e..e4b74dc 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,6 +273,7 @@ Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
Patch6: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
+Patch7: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
%if 0%{?rhel}
# not upstreamed
@@ -2323,6 +2324,7 @@ done
%changelog
* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
- latest 6.0 release
+- fix for ICU 61
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.0.4.2-5
- Rebuilt for Python 3.7
commit f15cf6739b33078374e7d75f2e8ab544312d74ee
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jun 22 16:44:42 2018 +0100
latest 6.0 release
diff --git a/0001-Missing-template-clone-in-configmgr-dconf-mode.patch
b/0001-Missing-template-clone-in-configmgr-dconf-mode.patch
deleted file mode 100644
index 9605075..0000000
--- a/0001-Missing-template-clone-in-configmgr-dconf-mode.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 08232c1eababe3c12c94eb1eb272bd363693450e Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman(a)redhat.com>
-Date: Wed, 9 May 2018 12:15:09 +0200
-Subject: [PATCH] Missing template clone() in configmgr dconf mode
-
-...that could cause infinite recursion, e.g. when an erroneously modified
-/org.openoffice.ucb.Hierarchy/Entry template (which recursively has children of
-the same template type) is later used to instantiate a new set member.
-
-Change-Id: I7b9e55fa1c92979aed98b9f23f4432600afffed4
----
- configmgr/source/dconf.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
-index 22c80841addf..642e37ec0257 100644
---- a/configmgr/source/dconf.cxx
-+++ b/configmgr/source/dconf.cxx
-@@ -938,6 +938,7 @@ void readDir(
- << templ);
- continue;
- }
-+ member = member->clone(true);
- break;
- default:
- assert(false); // cannot happen
---
-2.14.3
-
diff --git a/0001-Related-rhbz-1396729-use-cairo_surface_create_simila.patch
b/0001-Related-rhbz-1396729-use-cairo_surface_create_simila.patch
deleted file mode 100644
index 65252c2..0000000
--- a/0001-Related-rhbz-1396729-use-cairo_surface_create_simila.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From f770a69457b5e0432b396d5d1bd62cdc9db8e1ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Wed, 11 Apr 2018 11:06:37 +0100
-Subject: [PATCH] Related: rhbz#1396729 use cairo_surface_create_similar
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-where we can
-
-Change-Id: If6fd729a9cbf834faef33586b5bd886aad2fbe1d
-Reviewed-on:
https://gerrit.libreoffice.org/52726
-Tested-by: Jenkins <ci(a)libreoffice.org>
-Reviewed-by: Caolán McNamara <caolanm(a)redhat.com>
-Tested-by: Caolán McNamara <caolanm(a)redhat.com>
-(cherry picked from commit b524de950c6eb0bc61d05d41fe69b67ab59b16c6)
-
-cairo_surface_create_similar_image is >= cairo 1.12.0
-
-(cherry picked from commit 2ca4b505b25e13c9f422c28252f5b7533b8e3270)
-
-Change-Id: I1805e5680beff6c632016686aa661efe25a8c2f8
----
- vcl/headless/svpgdi.cxx | 20 ++++++++++++++++----
- vcl/headless/svpinst.cxx | 6 ++++--
- vcl/headless/svpvd.cxx | 40 ++++++++++++++++++++++++++--------------
- vcl/inc/headless/svpgdi.hxx | 1 +
- vcl/inc/headless/svpvd.hxx | 9 ++-------
- vcl/qt5/Qt5Instance.cxx | 8 +++++---
- vcl/unx/gtk/gtkinst.cxx | 2 +-
- 7 files changed, 55 insertions(+), 31 deletions(-)
-
-diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
-index 67433a2b30e1..b490121750db 100644
---- a/vcl/headless/svpgdi.cxx
-+++ b/vcl/headless/svpgdi.cxx
-@@ -1239,7 +1239,13 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long
nWidth, long nHeigh
-
- SalColor SvpSalGraphics::getPixel( long nX, long nY )
- {
-- cairo_surface_t *target = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
-+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
-+ cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
-+#else
-+ cairo_surface_t *target = cairo_image_surface_create(
-+#endif
-+ CAIRO_FORMAT_ARGB32, 1, 1);
-+
- cairo_t* cr = cairo_create(target);
-
- cairo_rectangle(cr, 0, 0, 1, 1);
-@@ -1398,9 +1404,15 @@ cairo_surface_t* SvpSalGraphics::createCairoSurface(const
BitmapBuffer *pBuffer)
-
- cairo_t* SvpSalGraphics::createTmpCompatibleCairoContext() const
- {
-- cairo_surface_t *target = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
-- m_aFrameSize.getX() *
m_fScale,
-- m_aFrameSize.getY() *
m_fScale);
-+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
-+ cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
-+#else
-+ cairo_surface_t *target = cairo_image_surface_create(
-+#endif
-+ CAIRO_FORMAT_ARGB32,
-+ m_aFrameSize.getX() * m_fScale,
-+ m_aFrameSize.getY() * m_fScale);
-+
- #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
- cairo_surface_set_device_scale(target, m_fScale, m_fScale);
- #endif
-diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
-index 9912186c729c..c39ffaeb5205 100644
---- a/vcl/headless/svpinst.cxx
-+++ b/vcl/headless/svpinst.cxx
-@@ -219,12 +219,14 @@ void SvpSalInstance::DestroyObject( SalObject* pObject )
-
- #ifndef IOS
-
--SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics* /* pGraphics */,
-+SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
- long &nDX, long &nDY,
- DeviceFormat eFormat,
- const SystemGraphicsData* /*
pData */ )
- {
-- SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat, 1);
-+ SvpSalGraphics *pSvpSalGraphics = dynamic_cast<SvpSalGraphics*>(pGraphics);
-+ assert(pSvpSalGraphics);
-+ SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat,
pSvpSalGraphics->getSurface());
- pNew->SetSize( nDX, nDY );
- return pNew;
- }
-diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
-index cf78ebc8eb7d..4172fc383744 100644
---- a/vcl/headless/svpvd.cxx
-+++ b/vcl/headless/svpvd.cxx
-@@ -30,9 +30,18 @@
-
- using namespace basegfx;
-
-+SvpSalVirtualDevice::SvpSalVirtualDevice(DeviceFormat eFormat, cairo_surface_t*
pRefSurface)
-+ : m_eFormat(eFormat)
-+ , m_pRefSurface(pRefSurface)
-+ , m_pSurface(nullptr)
-+{
-+ cairo_surface_reference(m_pRefSurface);
-+}
-+
- SvpSalVirtualDevice::~SvpSalVirtualDevice()
- {
- cairo_surface_destroy(m_pSurface);
-+ cairo_surface_destroy(m_pRefSurface);
- }
-
- SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
-@@ -67,9 +76,6 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long
nNewDY,
- {
- m_aFrameSize = basegfx::B2IVector(nNewDX, nNewDY);
-
-- nNewDX *= m_fScale;
-- nNewDY *= m_fScale;
--
- if (m_pSurface)
- {
- cairo_surface_destroy(m_pSurface);
-@@ -77,23 +83,29 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long
nNewDY,
-
- if (m_eFormat == DeviceFormat::BITMASK)
- {
-- m_pSurface = cairo_image_surface_create(CAIRO_FORMAT_A1,
-+ m_pSurface = cairo_surface_create_similar(m_pRefSurface,
CAIRO_CONTENT_ALPHA,
- nNewDX, nNewDY);
- }
-- else
-+ else if (pBuffer)
- {
-- m_pSurface = pBuffer ?
-- cairo_image_surface_create_for_data(pBuffer,
CAIRO_FORMAT_ARGB32,
-- nNewDX, nNewDY,
-- cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32,
nNewDX))
-- :
-- cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
-- nNewDX, nNewDY);
-- }
-+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-+ double fXScale, fYScale;
-+ cairo_surface_get_device_scale(m_pRefSurface, &fXScale, &fYScale);
-+ nNewDX *= fXScale;
-+ nNewDY *= fYScale;
-+#endif
-+
-+ m_pSurface = cairo_image_surface_create_for_data(pBuffer,
CAIRO_FORMAT_ARGB32,
-+ nNewDX, nNewDY,
cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, nNewDX));
-
- #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-- cairo_surface_set_device_scale(m_pSurface, m_fScale, m_fScale);
-+ cairo_surface_set_device_scale(m_pSurface, fXScale, fYScale);
- #endif
-+ }
-+ else
-+ {
-+ m_pSurface = cairo_surface_create_similar(m_pRefSurface,
CAIRO_CONTENT_COLOR_ALPHA, nNewDX, nNewDY);
-+ }
-
- // update device in existing graphics
- for (auto const& graphic : m_aGraphics)
-diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
-index 8204538cb132..dae0145b8c58 100644
---- a/vcl/inc/headless/svpgdi.hxx
-+++ b/vcl/inc/headless/svpgdi.hxx
-@@ -89,6 +89,7 @@ class VCL_DLLPUBLIC SvpSalGraphics : public SalGraphics
- public:
- static GlyphCache& getPlatformGlyphCache();
- void setSurface(cairo_surface_t* pSurface, const basegfx::B2IVector& rSize);
-+ cairo_surface_t* getSurface() const { return m_pSurface; }
- static cairo_user_data_key_t* getDamageKey();
-
- private:
-diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
-index 704488cdfae0..51d6af9cb499 100644
---- a/vcl/inc/headless/svpvd.hxx
-+++ b/vcl/inc/headless/svpvd.hxx
-@@ -30,18 +30,13 @@ typedef struct _cairo_surface cairo_surface_t;
- class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
- {
- DeviceFormat m_eFormat;
-+ cairo_surface_t* m_pRefSurface;
- cairo_surface_t* m_pSurface;
- basegfx::B2IVector m_aFrameSize;
-- double m_fScale;
- std::vector< SvpSalGraphics* > m_aGraphics;
-
- public:
-- SvpSalVirtualDevice(DeviceFormat eFormat, double fScale)
-- : m_eFormat(eFormat)
-- , m_pSurface(nullptr)
-- , m_fScale(fScale)
-- {
-- }
-+ SvpSalVirtualDevice(DeviceFormat eFormat, cairo_surface_t* pRefSurface);
- virtual ~SvpSalVirtualDevice() override;
-
- // SalVirtualDevice
-diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
-index c61a29a01935..0d128c2bc97c 100644
---- a/vcl/qt5/Qt5Instance.cxx
-+++ b/vcl/qt5/Qt5Instance.cxx
-@@ -84,13 +84,15 @@ SalObject* Qt5Instance::CreateObject(SalFrame* pParent,
SystemWindowData*, bool
-
- void Qt5Instance::DestroyObject(SalObject* pObject) { delete pObject; }
-
--SalVirtualDevice* Qt5Instance::CreateVirtualDevice(SalGraphics* /* pGraphics */,
long& nDX,
-- long& nDY, DeviceFormat eFormat,
-+SalVirtualDevice* Qt5Instance::CreateVirtualDevice(SalGraphics* pGraphics, long&
nDX, long& nDY,
-+ DeviceFormat eFormat,
- const SystemGraphicsData* /* pData
*/)
- {
- if (m_bUseCairo)
- {
-- SvpSalVirtualDevice* pVD = new SvpSalVirtualDevice(eFormat, 1);
-+ SvpSalGraphics* pSvpSalGraphics =
dynamic_cast<SvpSalGraphics*>(pGraphics);
-+ assert(pSvpSalGraphics);
-+ SvpSalVirtualDevice* pVD = new SvpSalVirtualDevice(eFormat,
pSvpSalGraphics->getSurface());
- pVD->SetSize(nDX, nDY);
- return pVD;
- }
-diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
-index 62b02a36a33f..ee03a340a12f 100644
---- a/vcl/unx/gtk/gtkinst.cxx
-+++ b/vcl/unx/gtk/gtkinst.cxx
-@@ -336,7 +336,7 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG,
- (void) pGd;
- SvpSalGraphics *pSvpSalGraphics = dynamic_cast<SvpSalGraphics*>(pG);
- assert(pSvpSalGraphics);
-- SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat,
pSvpSalGraphics->getScale());
-+ SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat,
pSvpSalGraphics->getSurface());
- pNew->SetSize( nDX, nDY );
- return pNew;
- #else
---
-2.14.3
-
diff --git a/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch
b/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch
deleted file mode 100644
index 281fe5d..0000000
--- a/0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cff779551db2eedf5b16d49213fc5e2179414256 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Thu, 19 Apr 2018 20:12:40 +0100
-Subject: [PATCH] Related: tdf#116951 rhbz#1569331 end should be in terms of
- unicode chars
-
-not bytes
-
-Change-Id: I05114019abb6c283586cd5c23ed1d148c9cf71d3
----
- vcl/unx/gtk/gtksalframe.cxx | 2 +-
- vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
-index 9fd86abccc3d..ad4b00d26927 100644
---- a/vcl/unx/gtk/gtksalframe.cxx
-+++ b/vcl/unx/gtk/gtksalframe.cxx
-@@ -3560,7 +3560,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*,
gpointer im_
-
- pango_attr_iterator_range (iter, &start, &end);
- if (end == G_MAXINT)
-- end = pText ? strlen (pText) : 0;
-+ end = pText ? g_utf8_strlen(pText, -1) : 0;
- if (end == start)
- continue;
-
-diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
-index 1db3a469973f..113fcb425963 100644
---- a/vcl/unx/gtk3/gtk3gtkframe.cxx
-+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
-@@ -3978,7 +3978,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*,
gpointer im_
-
- pango_attr_iterator_range (iter, &start, &end);
- if (end == G_MAXINT)
-- end = pText ? strlen (pText) : 0;
-+ end = pText ? g_utf8_strlen(pText, -1) : 0;
- if (end == start)
- continue;
-
---
-2.14.3
-
diff --git a/0001-Resolves-tdf-117413-char-doubling-appearing-under-X-.patch
b/0001-Resolves-tdf-117413-char-doubling-appearing-under-X-.patch
deleted file mode 100644
index 6856e55..0000000
--- a/0001-Resolves-tdf-117413-char-doubling-appearing-under-X-.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ba30f47d00850edbbfd157b664d5af97697d7a4a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Fri, 4 May 2018 17:15:37 +0100
-Subject: [PATCH] Resolves: tdf#117413 char doubling appearing under X with
- gtk3
-
-like happened on gtk2, so make the rhbz#1283420 bodge happen for XLIB surfaces,
-regardless of the backend
-
-Change-Id: Ic51679a71523e8cc76832858411b102d915638cf
----
- vcl/unx/generic/gdi/cairotextrender.cxx | 22 +++++++++++++++++++++-
- vcl/unx/generic/gdi/x11cairotextrender.cxx | 16 +---------------
- 2 files changed, 22 insertions(+), 16 deletions(-)
-
-diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
-index 00532c8644b9..10edfd0e5001 100644
---- a/vcl/unx/generic/gdi/cairotextrender.cxx
-+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
-@@ -151,6 +151,26 @@ namespace
- }
- }
-
-+namespace
-+{
-+ cairo_t* syncCairoContext(cairo_t* cr)
-+ {
-+ //rhbz#1283420 tdf#117413 bodge to force a read from the underlying surface
which has
-+ //the side effect of making the mysterious xrender related problem go away
-+ cairo_surface_t *target = cairo_get_target(cr);
-+ if (cairo_surface_get_type(target) == CAIRO_SURFACE_TYPE_XLIB)
-+ {
-+ cairo_surface_t *throw_away = cairo_surface_create_similar(target,
cairo_surface_get_content(target), 1, 1);
-+ cairo_t *force_read_cr = cairo_create(throw_away);
-+ cairo_set_source_surface(force_read_cr, target, 0, 0);
-+ cairo_paint(force_read_cr);
-+ cairo_destroy(force_read_cr);
-+ cairo_surface_destroy(throw_away);
-+ }
-+ return cr;
-+ }
-+}
-+
- void CairoTextRender::DrawTextLayout(const CommonSalLayout& rLayout)
- {
- const FreetypeFont& rFont = *rLayout.getFreetypeFont();
-@@ -191,7 +211,7 @@ void CairoTextRender::DrawTextLayout(const CommonSalLayout&
rLayout)
- * least change the SalFrame etc impls to dtor the SalGraphics *before* the
- * destruction of the windows they reference
- */
-- cairo_t *cr = getCairoContext();
-+ cairo_t *cr = syncCairoContext(getCairoContext());
- if (!cr)
- {
- SAL_WARN("vcl", "no cairo context for text");
-diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
-index 105d0a0392bd..8960bd1c6bb1 100644
---- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
-+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
-@@ -36,21 +36,7 @@ GlyphCache& X11CairoTextRender::getPlatformGlyphCache()
-
- cairo_t* X11CairoTextRender::getCairoContext()
- {
-- cairo_t *cr = mrParent.getCairoContext();
--
-- //rhbz#1283420 bodge to force a read from the underlying surface which has
-- //the side effect of making the mysterious xrender related problem go away
-- {
-- cairo_surface_t *target = cairo_get_target(cr);
-- cairo_surface_t *throw_away = cairo_surface_create_similar(target,
cairo_surface_get_content(target), 1, 1);
-- cairo_t *force_read_cr = cairo_create(throw_away);
-- cairo_set_source_surface(force_read_cr, target, 0, 0);
-- cairo_paint(force_read_cr);
-- cairo_destroy(force_read_cr);
-- cairo_surface_destroy(throw_away);
-- }
--
-- return cr;
-+ return mrParent.getCairoContext();
- }
-
- void X11CairoTextRender::getSurfaceOffset( double& nDX, double& nDY )
---
-2.14.3
-
diff --git a/0001-set-Referer-on-link-mediadescriptor.patch
b/0001-set-Referer-on-link-mediadescriptor.patch
deleted file mode 100644
index 8c394c7..0000000
--- a/0001-set-Referer-on-link-mediadescriptor.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Tue, 1 May 2018 12:57:02 +0100
-Subject: [PATCH] set Referer on link mediadescriptor
-
-to allow determining if the source document is from a trusted/untrusted
-location
-
-Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
-Reviewed-on:
https://gerrit.libreoffice.org/53693
-Tested-by: Jenkins <ci(a)libreoffice.org>
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- sw/source/filter/xml/xmltexti.cxx | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
-index 78cab08507f0..33548de42f6c 100644
---- a/sw/source/filter/xml/xmltexti.cxx
-+++ b/sw/source/filter/xml/xmltexti.cxx
-@@ -570,16 +570,21 @@ uno::Reference< XPropertySet >
SwXMLTextImportHelper::createAndInsertOOoLink(
- uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
- aMediaDescriptor[0].Name = "URL";
- aMediaDescriptor[0].Value <<= aURLObj.GetMainURL(
INetURLObject::DecodeMechanism::NONE );
-- if ( pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
-+
-+ if (SfxMedium* pMedium = pDoc->GetDocShell() ?
pDoc->GetDocShell()->GetMedium() : nullptr)
- {
-- uno::Reference< task::XInteractionHandler > xInteraction =
--
pDoc->GetDocShell()->GetMedium()->GetInteractionHandler();
-+ uno::Reference< task::XInteractionHandler > xInteraction =
pMedium->GetInteractionHandler();
- if ( xInteraction.is() )
- {
- aMediaDescriptor.realloc( 2 );
- aMediaDescriptor[1].Name = "InteractionHandler";
- aMediaDescriptor[1].Value <<= xInteraction;
- }
-+
-+ const auto nLen = aMediaDescriptor.getLength() + 1;
-+ aMediaDescriptor.realloc(nLen);
-+ aMediaDescriptor[nLen - 1].Name = "Referer";
-+ aMediaDescriptor[nLen - 1].Value <<= pMedium->GetName();
- }
-
- uno::Reference < embed::XEmbeddedObject > xObj(
---
-2.14.3
-
diff --git a/0001-tdf-117601-a11y-crash-after-merging-cells.patch
b/0001-tdf-117601-a11y-crash-after-merging-cells.patch
deleted file mode 100644
index bf94f82..0000000
--- a/0001-tdf-117601-a11y-crash-after-merging-cells.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 47b299c7de49edd3bddd743d6d9bdcf49a09ec39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Fri, 25 May 2018 14:37:03 +0100
-Subject: [PATCH] tdf#117601 a11y crash after merging cells
-
-this is similar to tdf#87199, in this case the accessibiles for the merged
-cells are not visible so not removed when their frame is deleted, but remain
-in the cache pointing to invalid frames.
-
-Change-Id: Ibc5b9f27541683b8f3604839fa3d1431380a4039
----
- sw/inc/accmap.hxx | 3 +++
- sw/source/core/access/acccontext.cxx | 6 +++++-
- sw/source/core/access/accmap.cxx | 11 ++++++++---
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
-index fc7f665da383..c78bea3e0e51 100644
---- a/sw/inc/accmap.hxx
-+++ b/sw/inc/accmap.hxx
-@@ -277,6 +277,9 @@ public:
- Point PixelToCore (const Point& rPoint) const;
- tools::Rectangle CoreToPixel (const tools::Rectangle& rRect) const;
-
-+ // is there a known accessibility impl cached for the frame
-+ bool Contains(const SwFrame *pFrame) const;
-+
- private:
- /** get mapping mode for LogicToPixel and PixelToLogic conversions
-
-diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
-index 628ad727dc47..efb6b415d372 100644
---- a/sw/source/core/access/acccontext.cxx
-+++ b/sw/source/core/access/acccontext.cxx
-@@ -402,8 +402,12 @@ void SwAccessibleContext::DisposeChildren(const SwFrame *pFrame,
- if( pLower )
- {
- ::rtl::Reference< SwAccessibleContext > xAccImpl;
-- if( rLower.IsAccessible( GetShell()->IsPreview() ) )
-+ if (rLower.IsAccessible(GetShell()->IsPreview())
-+ // tdf#117601 dispose the darn thing if it ever was accessible
-+ || GetMap()->Contains(pLower))
-+ {
- xAccImpl = GetMap()->GetContextImpl( pLower, false );
-+ }
- if( xAccImpl.is() )
- xAccImpl->Dispose( bRecursive );
- else
-diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
-index 712b70873507..43cc0974625e 100644
---- a/sw/source/core/access/accmap.cxx
-+++ b/sw/source/core/access/accmap.cxx
-@@ -2158,6 +2158,11 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
- }
- }
-
-+bool SwAccessibleMap::Contains(const SwFrame *pFrame) const
-+{
-+ return (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end());
-+}
-+
- void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
- const SdrObject *pObj,
- vcl::Window* pWindow,
-@@ -2173,9 +2178,9 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
- OSL_ENSURE( !aFrameOrObj.GetSwFrame() ||
aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
- "non accessible frame should be disposed" );
-
-- if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
-- // fdo#87199 dispose the darn thing if it ever was accessible
-- || (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end()))
-+ if (aFrameOrObj.IsAccessible(GetShell()->IsPreview())
-+ // fdo#87199 dispose the darn thing if it ever was accessible
-+ || Contains(pFrame))
- {
- ::rtl::Reference< SwAccessibleContext > xAccImpl;
- ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
---
-2.14.3
-
diff --git a/0001-tdf-95843-Wait-for-fire_glxtest_process-also-in-head.patch
b/0001-tdf-95843-Wait-for-fire_glxtest_process-also-in-head.patch
deleted file mode 100644
index 0e99ae5..0000000
--- a/0001-tdf-95843-Wait-for-fire_glxtest_process-also-in-head.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 1b3cf7e967aa103181a3203f5d504d49b49a5ab2 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman(a)redhat.com>
-Date: Thu, 19 Apr 2018 13:59:16 +0200
-Subject: [PATCH] tdf#95843: Wait for fire_glxtest_process also in --headless
- mode
-
-Discussed with mmeeks on IRC that fire_glxtest_process is probably called as
-early as possible so that its reuslt is ready by the time it is needed in the
-non-headless case. So best fix for headless is probably to just wait for the
-sub-process at an opportune point, instead of redesigning the whole mess so that
-fire_glxtest_process would only be called once its result is actually needed.
-
-Change-Id: I4ea9c9d54b83c9695a3b72317e68fed0c410da0e
-Reviewed-on:
https://gerrit.libreoffice.org/53154
-Tested-by: Jenkins <ci(a)libreoffice.org>
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
-(cherry picked from commit 4bacf58f4af44ac8c4632b43289ccfcc07e5820c)
----
- desktop/inc/app.hxx | 1 +
- desktop/source/app/app.cxx | 9 +++++++++
- desktop/source/app/sofficemain.cxx | 4 ++++
- vcl/inc/opengl/x11/glxtest.hxx | 2 ++
- vcl/unx/glxtest.cxx | 16 ++++++++++++++++
- 5 files changed, 32 insertions(+)
-
-diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
-index 0e5f8774d3c3..d0ef2a66818a 100644
---- a/desktop/inc/app.hxx
-+++ b/desktop/inc/app.hxx
-@@ -181,6 +181,7 @@ OUString ReplaceStringHookProc(const OUString& rStr);
-
- #if defined( UNX ) && !defined MACOSX && !defined IOS &&
!defined ANDROID && !defined LIBO_HEADLESS
- bool fire_glxtest_process();
-+void reap_glxtest_process();
- #endif
-
- #endif // INCLUDED_DESKTOP_INC_APP_HXX
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index 192793ea42f1..583ea189165f 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -1595,6 +1595,15 @@ int Desktop::Main()
- CheckOpenCLCompute(xDesktop);
- #endif
-
-+ // In headless mode, reap the process started by fire_glxtest_process() early in
soffice_main
-+ // (desktop/source/app/sofficemain.cxx), in a code block that needs to be
covered by the same
-+ // #if condition as this code block:
-+#if defined( UNX ) && !defined MACOSX && !defined IOS &&
!defined ANDROID && !defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
-+ if (rCmdLineArgs.IsHeadless()) {
-+ reap_glxtest_process();
-+ }
-+#endif
-+
- // Release solar mutex just before we wait for our client to connect
- {
- SolarMutexReleaser aReleaser;
-diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
-index 657614962489..67c1efe4a799 100644
---- a/desktop/source/app/sofficemain.cxx
-+++ b/desktop/source/app/sofficemain.cxx
-@@ -122,6 +122,10 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
- #if defined( UNX ) && !defined MACOSX && !defined IOS &&
!defined ANDROID && !defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
- /* Run test for OpenGL support in own process to avoid crash with broken
- * OpenGL drivers. Start process as early as possible.
-+ * In non-headless mode, the process will be reaped in X11OpenGLDeviceInfo::GetData
-+ * (vcl/opengl/x11/X11DeviceInfo.cxx). In headless mode, the process will be reaped
late in
-+ * Desktop::Main (desktop/source/app/app.cxx), in a code block that needs to be
covered by the
-+ * same #if condition as this code block.
- */
- bool bSuccess = fire_glxtest_process();
- SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with
glxtest");
-diff --git a/vcl/inc/opengl/x11/glxtest.hxx b/vcl/inc/opengl/x11/glxtest.hxx
-index 979f795de139..d74436aae111 100644
---- a/vcl/inc/opengl/x11/glxtest.hxx
-+++ b/vcl/inc/opengl/x11/glxtest.hxx
-@@ -18,6 +18,8 @@ VCL_DLLPUBLIC pid_t* getGlxPid();
-
- bool fire_glxtest_process();
-
-+void reap_glxtest_process();
-+
- #endif
-
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
-index b0cdde234c2b..70d34fb7318d 100644
---- a/vcl/unx/glxtest.cxx
-+++ b/vcl/unx/glxtest.cxx
-@@ -27,6 +27,8 @@
- #include <string.h>
- #include <signal.h>
-
-+#include <sys/wait.h>
-+
- #include <opengl/x11/glxtest.hxx>
-
- #ifdef __SUNPRO_CC
-@@ -36,6 +38,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-
-+#include <sal/log.hxx>
-+
- // stuff from glx.h
- typedef struct __GLXcontextRec *GLXContext;
- typedef XID GLXPixmap;
-@@ -275,3 +279,15 @@ bool fire_glxtest_process()
- *glxtest_pid = pid;
- return true;
- }
-+
-+void reap_glxtest_process() {
-+ pid_t * pid = getGlxPid();
-+ if (*pid != 0) {
-+ // Use WNOHANG, as it is probably better to have a (rather harmless) zombie
child process
-+ // hanging around for the duration of the calling process, than to potentially
block the
-+ // calling process here:
-+ pid_t e = waitpid(*pid, nullptr, WNOHANG);
-+ SAL_INFO_IF(
-+ e <= 0, "vcl.opengl", "waiting for glxtest process "
<< *pid << " failed with " << e);
-+ }
-+}
---
-2.14.3
-
diff --git a/libreoffice.spec b/libreoffice.spec
index d907e86..72ba18e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -272,15 +272,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
-Patch6: 0001-Related-rhbz-1396729-use-cairo_surface_create_simila.patch
-Patch7: 0001-tdf-95843-Wait-for-fire_glxtest_process-also-in-head.patch
-Patch8: 0001-Related-tdf-116951-rhbz-1569331-end-should-be-in-ter.patch
-Patch9: 0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch
-Patch10: 0001-set-Referer-on-link-mediadescriptor.patch
-Patch11: 0001-Resolves-tdf-117413-char-doubling-appearing-under-X-.patch
-Patch12: 0001-Missing-template-clone-in-configmgr-dconf-mode.patch
-Patch13: 0001-tdf-117601-a11y-crash-after-merging-cells.patch
-Patch14: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
+Patch6: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
%if 0%{?rhel}
# not upstreamed
commit ffd22cd81ce855ed8cbbfd4155a5cb28250786e7
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jun 22 16:23:13 2018 +0100
latest 6.0 release
diff --git a/.gitignore b/.gitignore
index 7349e37..3e12cb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,6 @@
/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
/185d60944ea767075d27247c3162b3bc-unowinreg.dll
/libreoffice-multiliblauncher.sh
-/libreoffice-6.0.4.2.tar.xz
-/libreoffice-6.0.4.2.tar.xz.asc
-/libreoffice-help-6.0.4.2.tar.xz
-/libreoffice-help-6.0.4.2.tar.xz.asc
-/libreoffice-translations-6.0.4.2.tar.xz
-/libreoffice-translations-6.0.4.2.tar.xz.asc
/libreoffice-6.0.5.2.tar.xz
/libreoffice-6.0.5.2.tar.xz.asc
/libreoffice-help-6.0.5.2.tar.xz
commit 31d169da36dff974968cc34d050093aee530e6b5
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jun 22 16:22:21 2018 +0100
foo
diff --git a/.gitignore b/.gitignore
index 107384a..7349e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,9 @@
/libreoffice-help-6.0.4.2.tar.xz.asc
/libreoffice-translations-6.0.4.2.tar.xz
/libreoffice-translations-6.0.4.2.tar.xz.asc
+/libreoffice-6.0.5.2.tar.xz
+/libreoffice-6.0.5.2.tar.xz.asc
+/libreoffice-help-6.0.5.2.tar.xz
+/libreoffice-help-6.0.5.2.tar.xz.asc
+/libreoffice-translations-6.0.5.2.tar.xz
+/libreoffice-translations-6.0.5.2.tar.xz.asc
diff --git a/0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch
b/0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch
deleted file mode 100644
index dbdb845..0000000
--- a/0001-Resolves-tdf-116951-rhbz-1569331-start-is-G_MAXINT.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a1e24ab0a98ea6155c581907aca42532311218df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Tue, 24 Apr 2018 11:39:20 +0100
-Subject: [PATCH] Resolves: tdf#116951 rhbz#1569331 start is G_MAXINT
-
-and text is nullptr, seeing as an end G_MAXINT translates to str len,
-assume the same for start
-
-Change-Id: I76b8bb0e66694129d36bbe08a6d55fc434f3434f
----
- vcl/unx/gtk3/gtk3gtkframe.cxx | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
-index 113fcb425963..8a18974d2635 100644
---- a/vcl/unx/gtk3/gtk3gtkframe.cxx
-+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
-@@ -3977,8 +3977,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged(
GtkIMContext*, gpointer im_
- ExtTextInputAttr sal_attr = ExtTextInputAttr::NONE;
-
- pango_attr_iterator_range (iter, &start, &end);
-- if (end == G_MAXINT)
-- end = pText ? g_utf8_strlen(pText, -1) : 0;
-+ if (start == G_MAXINT || end == G_MAXINT)
-+ {
-+ auto len = pText ? g_utf8_strlen(pText, -1) : 0;
-+ if (end == G_MAXINT)
-+ end = len;
-+ if (start == G_MAXINT)
-+ start = len;
-+ }
- if (end == start)
- continue;
-
---
-2.14.3
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 532e2e0..d907e86 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 6.0.4
+%global libo_version 6.0.5
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 5%{?libo_prerelease}%{?dist}
+Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2329,6 +2329,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
+* Fri Jun 22 2018 Caolán McNamara <caolanm(a)redhat.com> - 1:6.0.5.2-1
+- latest 6.0 release
+
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 1:6.0.4.2-5
- Rebuilt for Python 3.7
diff --git a/sources b/sources
index 286a6ef..8c9a13d 100644
--- a/sources
+++ b/sources
@@ -5,9 +5,9 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) =
854b8ae29b57b40ba6bb6f
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) =
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) =
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) =
db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
-SHA512 (libreoffice-6.0.4.2.tar.xz) =
004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
-SHA512 (libreoffice-6.0.4.2.tar.xz.asc) =
31045e72c36cc5b0c27bbfc58c85e3ca2a9b1c1c8633545310d47aa3eb30a2d0b0505146a8f6edc22b21293c8aae412e42516fc655f6274ccffd517ab20db994
-SHA512 (libreoffice-help-6.0.4.2.tar.xz) =
ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
-SHA512 (libreoffice-help-6.0.4.2.tar.xz.asc) =
da32dbcf3ac6d0717b3d9acb3d4372a8a43ca05615426aadd0ff9cc16b9d013cc6bbb5544fc5adffd65d8ffa930664246b86747e22a36610ce57cf62a02ff3c2
-SHA512 (libreoffice-translations-6.0.4.2.tar.xz) =
470e1d9d17dcbd4cebd2429d0c2711ee1730be32178684b3128471387708a24b6ee357ea261ac36f6b6a5d8acbcb4fa1ea5c216186705edcb2406bc5cb765124
-SHA512 (libreoffice-translations-6.0.4.2.tar.xz.asc) =
4814ba3ca29a1ce083faa4eaf9d3e2c30e335f366520efee79b691cc033dc4beb67793afbacb4fb077dc37931360bfc13f94c41ac15f0c092bd4419a1ad0b900
+SHA512 (libreoffice-6.0.5.2.tar.xz) =
796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
+SHA512 (libreoffice-6.0.5.2.tar.xz.asc) =
2838a1fc47d4a013cd0e6c37b1d3b32cbeb73184361b008f5a8e42d3d381cb37b868bbaded12c8c654798484f07f9d9a5e99487edd35c355f3a7ee395b1aab04
+SHA512 (libreoffice-help-6.0.5.2.tar.xz) =
975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
+SHA512 (libreoffice-help-6.0.5.2.tar.xz.asc) =
c7109e1d112386ddebd2990f87e24e25a1d5ba70e896bbc3f747dc62cf6061191d6baac31d1db2642c258256e9b4310c9c877a864a2e1c92bffc05b21e2a429d
+SHA512 (libreoffice-translations-6.0.5.2.tar.xz) =
5de62e013412cc0c681d7447bcbf2cebdeb4f2d6033c320dd95f6f8e39c7716ab9e0d2b864c4495c001381acbc6889e03577b767c7f0a010bacb954bc6887cee
+SHA512 (libreoffice-translations-6.0.5.2.tar.xz.asc) =
04d610d8bf83ee5ac8799a45aeadd197208c8ff8d621503a175f98e90fc74f3a6c9e4c4be0399fdb8a963fbff63ad5ee8644dde5b76bf3576e71faef6d4ebe6d