Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2018-05-18 14:26:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Fri May 18 14:26:32 2018 rev:156 rq:610006 version:6.0.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-04-26
13:35:23.961867645 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2018-05-18 14:27:40.310879560 +0200
@@ -1,0 +2,25 @@
+Thu May 17 05:25:15 UTC 2018 - bo...@opensuse.org
+
+- Add supplements for xfce4-session for libreoffice-gtk3 to install
+ that package when xfce is present (boo#1092699).
+
+-------------------------------------------------------------------
+Wed May 16 10:58:54 UTC 2018 - bjorn....@gmail.com
+
+- Add condtional for Libreoffice Supplement in libreoffice-base, no
+ longer install libreoffice-base by default for future versions of
+ openSUSE.
+
+-------------------------------------------------------------------
+Wed May 9 08:59:02 UTC 2018 - tchva...@suse.com
+
+- Extend the icu patch with more patches wrt bsc#1091772
+ * libreoffice-icu61.patch
+
+-------------------------------------------------------------------
+Wed May 9 07:57:58 UTC 2018 - tchva...@suse.com
+
+- Bump to 6.0.4.2:
+ * 2 more fixes on top of 6.0.4.1
+
+-------------------------------------------------------------------
@@ -19 +44 @@
-- Fix build with new icu 61+
+- Fix build with new icu 61+ bsc#1091772
Old:
----
libreoffice-6.0.4.1.tar.xz
libreoffice-6.0.4.1.tar.xz.asc
libreoffice-help-6.0.4.1.tar.xz
libreoffice-help-6.0.4.1.tar.xz.asc
libreoffice-translations-6.0.4.1.tar.xz
libreoffice-translations-6.0.4.1.tar.xz.asc
New:
----
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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.EZotrl/_old 2018-05-18 14:27:45.258697983 +0200
+++ /var/tmp/diff_new_pack.EZotrl/_new 2018-05-18 14:27:45.262697836 +0200
@@ -54,7 +54,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
-Version: 6.0.4.1
+Version: 6.0.4.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@@ -384,7 +384,9 @@
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
+%if 0%{?suse_version} <= 1500
Supplements: %{name}
+%endif
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
@@ -524,6 +526,7 @@
Requires: %{name}-gnome = %{version}
Supplements: packageand(libreoffice:gnome-session)
Supplements: packageand(libreoffice:mate-session-manager)
+Supplements: packageand(libreoffice:xfce4-session)
%description gtk3
This package contains Gtk3 interface rendering option for LibreOffice.
++++++ libreoffice-6.0.4.1.tar.xz -> libreoffice-6.0.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-6.0.4.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-6.0.4.2.tar.xz differ:
char 26, line 1
++++++ libreoffice-help-6.0.4.1.tar.xz -> libreoffice-help-6.0.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-6.0.4.1/ChangeLog-helpcontent2
new/libreoffice-6.0.4.2/ChangeLog-helpcontent2
--- old/libreoffice-6.0.4.1/ChangeLog-helpcontent2 2018-04-17
21:21:18.000000000 +0200
+++ new/libreoffice-6.0.4.2/ChangeLog-helpcontent2 2018-05-04
15:39:37.000000000 +0200
@@ -1,8 +1,8 @@
-2018-04-17 Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
[b9f9f4de4c695fd9bd0666175e0bd75b01b682aa]
+2018-05-04 Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
[187dda12fb0a85a63c98710476a08e707d18d5ff]
- Version 6.0.4.1, tag libreoffice-6.0.4.1
+ Version 6.0.4.2, tag libreoffice-6.0.4.2
- Change-Id: I97b3d1e4af8285396ec45ee9d77c034e1619e071
+ Change-Id: I341a2edeeeea27a4e6951893bd4d89c6ef6af9fe
2018-04-17 Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
[c8f93fdee8bd19bd6250f0d27aa83fb1047789a5]
++++++ libreoffice-icu61.patch ++++++
--- /var/tmp/diff_new_pack.EZotrl/_old 2018-05-18 14:27:46.810641029 +0200
+++ /var/tmp/diff_new_pack.EZotrl/_new 2018-05-18 14:27:46.814640882 +0200
@@ -1,3 +1,75 @@
+From ad3b7c27cdc957a8a38876c040e86a81c3cf7003 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <er...@redhat.com>
+Date: Mon, 18 Dec 2017 20:33:03 +0100
+Subject: Explicitly qualify ICU types with icu:: namespace
+
+It will be required by ICU 61 anyway, see
+https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+
+Change-Id: Ia051e8e2aa64b0e32a7f16a2afebaef0e4ebf531
+Reviewed-on: https://gerrit.libreoffice.org/46739
+Reviewed-by: Eike Rathke <er...@redhat.com>
+Tested-by: Eike Rathke <er...@redhat.com>
+---
+ i18nutil/source/utility/unicode.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
+index 96c0194..f225b3a 100644
+--- a/i18nutil/source/utility/unicode.cxx
++++ b/i18nutil/source/utility/unicode.cxx
+@@ -750,15 +750,15 @@ OUString unicode::formatPercent(double dNumber,
+
+ icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
+
+- std::unique_ptr<NumberFormat> xF(
+- NumberFormat::createPercentInstance(aLocale, errorCode));
++ std::unique_ptr<icu::NumberFormat> xF(
++ icu::NumberFormat::createPercentInstance(aLocale, errorCode));
+ if(U_FAILURE(errorCode))
+ {
+- SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
++ SAL_WARN("i18n", "icu::NumberFormat::createPercentInstance failed");
+ return OUString::number(dNumber) + "%";
+ }
+
+- UnicodeString output;
++ icu::UnicodeString output;
+ xF->format(dNumber/100, output);
+ OUString aRet(reinterpret_cast<const sal_Unicode *>(output.getBuffer()),
+ output.length());
+--
+cgit v1.1
+
+From f240332f8e965ea17b70b0ccaa9990ce0a53cfc6 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <er...@redhat.com>
+Date: Tue, 19 Dec 2017 15:22:09 +0100
+Subject: vcl: explicitly qualify ICU types with icu:: namespace
+
+It will be required by ICU 61 anyway, see
+https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+
+Change-Id: Iecb30b903e9a67252147a8cc78c641621d763755
+---
+ vcl/inc/scrptrun.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
+index cbe151d..46a5c08 100644
+--- a/vcl/inc/scrptrun.h
++++ b/vcl/inc/scrptrun.h
+@@ -58,7 +58,7 @@ struct ParenStackEntry
+ }
+ };
+
+-class ScriptRun : public UObject {
++class ScriptRun : public icu::UObject {
+ public:
+
+ ScriptRun(const UChar chars[], int32_t length);
+--
+cgit v1.1
+
From f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 Mon Sep 17 00:00:00 2001
From: Eike Rathke <er...@redhat.com>
Date: Mon, 18 Dec 2017 20:28:07 +0100
@@ -11,12 +83,133 @@
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
---
- i18npool/source/collator/collator_unicode.cxx | 16 ++++++++--------
- i18npool/source/collator/gencoll_rule.cxx | 2 +-
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-(limited to 'i18npool/source/collator')
+ i18npool/inc/collator_unicode.hxx | 2 +-
+ .../source/breakiterator/breakiterator_unicode.cxx | 26 +++++++++++-----------
+ i18npool/source/collator/collator_unicode.cxx | 16 ++++++-------
+ i18npool/source/collator/gencoll_rule.cxx | 2 +-
+ i18npool/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 69d3177..d943bc9 100644
+--- a/i18npool/inc/collator_unicode.hxx
++++ b/i18npool/inc/collator_unicode.hxx
+@@ -63,7 +63,7 @@ public:
+
+ private:
+ const sal_Char *implementationName;
+- RuleBasedCollator *uca_base, *collator;
++ icu::RuleBasedCollator *uca_base, *collator;
+ #ifndef DISABLE_DYNLOADING
+ oslModule hModule;
+ #endif
+diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
+index a81a80e..02da856 100644
+--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
++++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
+@@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
+ }
+
+ /*
+- Wrapper class to provide public access to the RuleBasedBreakIterator's
++ Wrapper class to provide public access to the
icu::RuleBasedBreakIterator's
+ setbreakType method.
+ */
+-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
++class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
+ {
+ public:
+ #if (U_ICU_VERSION_MAJOR_NUM < 58)
+- // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
++ // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
+ void publicSetBreakType(int32_t type)
+ {
+ setBreakType(type);
+@@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public
RuleBasedBreakIterator
+ #endif
+ OOoRuleBasedBreakIterator(UDataMemory* image,
+ UErrorCode &status)
+- : RuleBasedBreakIterator(image, status)
++ : icu::RuleBasedBreakIterator(image, status)
+ { };
+
+ };
+@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters(
const OUString& Text,
+ icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
+ for (nDone = 0; nDone < nCount; nDone++) {
+ nStartPos = pBI->following(nStartPos);
+- if (nStartPos == BreakIterator::DONE)
++ if (nStartPos == icu::BreakIterator::DONE)
+ return Text.getLength();
+ }
+ } else { // for CHARACTER mode
+@@ -353,7 +353,7 @@ sal_Int32 SAL_CALL
BreakIterator_Unicode::previousCharacters( const OUString& Te
+ icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
+ for (nDone = 0; nDone < nCount; nDone++) {
+ nStartPos = pBI->preceding(nStartPos);
+- if (nStartPos == BreakIterator::DONE)
++ if (nStartPos == icu::BreakIterator::DONE)
+ return 0;
+ }
+ } else { // for BS to delete one char and CHARACTER mode.
+@@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const
OUString& Text, sal_Int
+
+ Boundary rv;
+ rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos);
+- if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE
)
++ if( rv.startPos >= Text.getLength() || rv.startPos ==
icu::BreakIterator::DONE )
+ rv.endPos = result.startPos;
+ else {
+ if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
+@@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const
OUString& Text, sal_Int
+ rv.startPos =
icuBI->mpValue->mpBreakIterator->following(rv.startPos);
+
+ rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
+- if(rv.endPos == BreakIterator::DONE)
++ if(rv.endPos == icu::BreakIterator::DONE)
+ rv.endPos = rv.startPos;
+ }
+ return rv;
+@@ -394,7 +394,7 @@ Boundary SAL_CALL
BreakIterator_Unicode::previousWord(const OUString& Text, sal_
+
+ Boundary rv;
+ rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos);
+- if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE)
++ if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE)
+ rv.endPos = rv.startPos;
+ else {
+ if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
+@@ -403,7 +403,7 @@ Boundary SAL_CALL
BreakIterator_Unicode::previousWord(const OUString& Text, sal_
+ rv.startPos =
icuBI->mpValue->mpBreakIterator->preceding(rv.startPos);
+
+ rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
+- if(rv.endPos == BreakIterator::DONE)
++ if(rv.endPos == icu::BreakIterator::DONE)
+ rv.endPos = rv.startPos;
+ }
+ return rv;
+@@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary(
const OUString& Text,
+ rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos);
+ }
+ }
+- if (rv.startPos == BreakIterator::DONE)
++ if (rv.startPos == icu::BreakIterator::DONE)
+ rv.startPos = rv.endPos;
+- else if (rv.endPos == BreakIterator::DONE)
++ else if (rv.endPos == icu::BreakIterator::DONE)
+ rv.endPos = rv.startPos;
+
+ return rv;
+@@ -502,7 +502,7 @@ LineBreakResults SAL_CALL
BreakIterator_Unicode::getLineBreak(
+ lbr.breakIndex = nStartPos;
+ lbr.breakType = BreakType::WORDBOUNDARY;
+ } else if (hOptions.rHyphenator.is()) { //Hyphenation break
+- sal_Int32 boundary_with_punctuation = (pLineBI->next() !=
BreakIterator::DONE) ? pLineBI->current() : 0;
++ sal_Int32 boundary_with_punctuation = (pLineBI->next() !=
icu::BreakIterator::DONE) ? pLineBI->current() : 0;
+ pLineBI->preceding(nStartPos + 1); // reset to check correct
hyphenation of "word-word"
+
+ sal_Int32 nStartPosWordEnd = nStartPos;
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 71bc4ed..37dc7ee 100644
--- a/i18npool/source/collator/collator_unicode.cxx
@@ -88,6 +281,114 @@
if (U_SUCCESS(status)) {
std::vector<uint8_t> data;
+diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+index 1a63dcb..b9efd51 100644
+--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
++++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL
OrdinalSuffixService::getOrdinalSuffix( sal_I
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+- std::unique_ptr<NumberFormat>
xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
++ std::unique_ptr<icu::NumberFormat>
xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+index 0ddfe64..2b5ca1e 100644
+--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
++++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+@@ -35,7 +35,7 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode
nInChar)
+ if (!m_transliterator)
+ throw css::uno::RuntimeException();
+
+- UnicodeString aChar(nInChar);
++ icu::UnicodeString aChar(nInChar);
+ m_transliterator->transliterate(aChar);
+
+ if (aChar.isEmpty())
+@@ -68,7 +68,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr,
sal_Int32 nStartPos,
+ {
+ sal_Int32 nIndex = nPosition;
+ UChar32 nChar = rInStr.iterateCodePoints(&nIndex);
+- UnicodeString aUStr(nChar);
++ icu::UnicodeString aUStr(nChar);
+ m_transliterator->transliterate(aUStr);
+
+ if (nOffset + aUStr.length() > rOffset.getLength())
+@@ -87,7 +87,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr,
sal_Int32 nStartPos,
+ }
+ else
+ {
+- UnicodeString aUStr(reinterpret_cast<const UChar*>(rInStr.getStr()) +
nStartPos, nCount);
++ icu::UnicodeString aUStr(reinterpret_cast<const
UChar*>(rInStr.getStr()) + nStartPos, nCount);
+ m_transliterator->transliterate(aUStr);
+ return OUString(reinterpret_cast<const
sal_Unicode*>(aUStr.getBuffer()), aUStr.length());
+ }
+--
+cgit v1.1
+
+From 7c46e0086802c22f5a5040d9161d4d2b3b2a3aff Mon Sep 17 00:00:00 2001
+From: Eike Rathke <er...@redhat.com>
+Date: Mon, 18 Dec 2017 20:38:59 +0100
+Subject: Explicitly qualify ICU types with icu:: namespace
+
+It will be required by ICU 61 anyway, see
+https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+
+Change-Id: If7f1330550981fd28eb7eea6329f21e116291cca
+Reviewed-on: https://gerrit.libreoffice.org/46740
+Reviewed-by: Eike Rathke <er...@redhat.com>
+Tested-by: Eike Rathke <er...@redhat.com>
+---
+ lotuswordpro/source/filter/localtime.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lotuswordpro/source/filter/localtime.cxx
b/lotuswordpro/source/filter/localtime.cxx
+index 47d2024..3805c5d 100644
+--- a/lotuswordpro/source/filter/localtime.cxx
++++ b/lotuswordpro/source/filter/localtime.cxx
+@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
+
+ if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
+ {
+- TimeZone* pLocalZone = TimeZone::createDefault();
++ icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
+ long offset = (pLocalZone->getRawOffset())/1000;
+ delete pLocalZone;
+ long ltime = rtime + offset;
+--
+cgit v1.1
+
+From 8960ecc689ce41cfaa40b65d75830d7491b06463 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <er...@redhat.com>
+Date: Mon, 18 Dec 2017 20:41:30 +0100
+Subject: Explicitly qualify ICU types with icu:: namespace
+
+It will be required by ICU 61 anyway, see
+https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+
+Change-Id: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
+Reviewed-on: https://gerrit.libreoffice.org/46741
+Reviewed-by: Eike Rathke <er...@redhat.com>
+Tested-by: Eike Rathke <er...@redhat.com>
+---
+ opencl/source/openclconfig.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
+index b81ffed..0ec2347 100644
+--- a/opencl/source/openclconfig.cxx
++++ b/opencl/source/openclconfig.cxx
+@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString&
rInput)
+ UErrorCode nIcuError(U_ZERO_ERROR);
+ icu::UnicodeString sIcuPattern(reinterpret_cast<const
UChar*>(rPattern.getStr()), rPattern.getLength());
+ icu::UnicodeString sIcuInput(reinterpret_cast<const
UChar*>(rInput.getStr()), rInput.getLength());
+- RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
++ icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
+
+ return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) &&
U_SUCCESS(nIcuError);
+ }
--
cgit v1.1
++++++ libreoffice-translations-6.0.4.1.tar.xz ->
libreoffice-translations-6.0.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-6.0.4.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-6.0.4.2.tar.xz
differ: char 27, line 1
