Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2018-04-26 13:35:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Thu Apr 26 13:35:17 2018 rev:155 rq:600833 version:6.0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-04-17 11:13:52.240671151 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2018-04-26 13:35:23.961867645 +0200 @@ -1,0 +2,38 @@ +Wed Apr 25 08:46:16 UTC 2018 - tchva...@suse.com + +- Do not require update-desktop-files on 15+ bsc#1090737 + +------------------------------------------------------------------- +Wed Apr 25 06:27:49 UTC 2018 - guillaume.gar...@opensuse.org + +- Remove aarch64 condition in _constraints + +------------------------------------------------------------------- +Mon Apr 23 08:32:48 UTC 2018 - tchva...@suse.com + +- Drop patch bnc1083525.patch merged upstream + +------------------------------------------------------------------- +Fri Apr 20 12:39:00 UTC 2018 - tchva...@suse.com + +- Fix build with new icu 61+ + * libreoffice-icu61.patch + +------------------------------------------------------------------- +Fri Apr 20 08:52:11 UTC 2018 - tchva...@suse.com + +- Version update to 6.0.4.1: + * Another bugfix update containing >60 bugfixes + +------------------------------------------------------------------- +Tue Apr 17 10:32:11 UTC 2018 - andras.ti...@collabora.com + +- LO-L3: DOCX import: missing table background color + * bnc1083525.patch + +------------------------------------------------------------------- +Tue Apr 17 09:26:37 UTC 2018 - tchva...@suse.com + +- Do not enable LTO on older codestreams, too old toolchain + +------------------------------------------------------------------- Old: ---- libreoffice-6.0.3.2.tar.xz libreoffice-6.0.3.2.tar.xz.asc libreoffice-help-6.0.3.2.tar.xz libreoffice-help-6.0.3.2.tar.xz.asc libreoffice-translations-6.0.3.2.tar.xz libreoffice-translations-6.0.3.2.tar.xz.asc New: ---- 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-icu61.patch libreoffice-translations-6.0.4.1.tar.xz libreoffice-translations-6.0.4.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.9zlEgn/_old 2018-04-26 13:35:29.877650863 +0200 +++ /var/tmp/diff_new_pack.9zlEgn/_new 2018-04-26 13:35:29.881650717 +0200 @@ -22,8 +22,14 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.3 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.4 #%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ +# LTO needs newer toolchain stack only +%if 0%{?suse_version} >= 1500 +%bcond_without lto +%else +%bcond_with lto +%endif # Enable the kde integration on openSUSE only %if 0%{?is_opensuse} %bcond_without kdeintegration @@ -48,7 +54,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.0.3.2 +Version: 6.0.4.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -101,6 +107,8 @@ Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch +# PATCH-FROM-UPSTREAM fix build with new icu +Patch9: libreoffice-icu61.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -224,8 +232,6 @@ Requires: libreoffice-icon-themes = %{version} Requires: libreoffice-l10n-en = %{version} Requires: python3 -Requires(post): update-desktop-files -Requires(postun): update-desktop-files Recommends: dejavu-fonts Recommends: google-carlito-fonts Provides: %{name}-draw-extensions = %{version} @@ -247,6 +253,10 @@ Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if 0%{?suse_version} < 1500 +Requires(post): update-desktop-files +Requires(postun): update-desktop-files +%endif %if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) @@ -902,6 +912,7 @@ %patch5 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) @@ -929,9 +940,13 @@ source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... # remove big debugsymbols as we simply consume too much space +%if %{with lto} ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" -CFLAGS="$ARCH_FLAGS -flifetime-dse=1" -CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1" +%else +ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" +%endif +CFLAGS="$ARCH_FLAGS" +CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS # Colada does not have .pc file and configure creator was really lazy @@ -951,7 +966,9 @@ %configure \ --with-parallelism=%{jobs} \ --enable-eot \ +%if %{with lto} --enable-lto \ +%endif --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ @@ -1269,9 +1286,11 @@ %post /sbin/ldconfig +%if 0%{?suse_version} < 1500 %mime_database_post %desktop_database_post %icon_theme_cache_post +%endif %preun uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" @@ -1282,10 +1301,13 @@ %postun /sbin/ldconfig +%if 0%{?suse_version} < 1500 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun +%endif +%if 0%{?suse_version} < 1500 %post base %desktop_database_post @@ -1321,6 +1343,7 @@ %postun writer %desktop_database_postun +%endif %_link_noarch_files icon-themes ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.9zlEgn/_old 2018-04-26 13:35:29.989646759 +0200 +++ /var/tmp/diff_new_pack.9zlEgn/_new 2018-04-26 13:35:29.993646613 +0200 @@ -7,19 +7,4 @@ <size unit="G">25</size> </disk> </hardware> - - <overwrite> - <conditions> - <arch>aarch64</arch> - </conditions> - <hardware> - <physicalmemory> - <size unit="M">2000</size> - </physicalmemory> - <disk> - <size unit="G">15</size> - </disk> - </hardware> - </overwrite> - </constraints> ++++++ libreoffice-6.0.3.2.tar.xz -> libreoffice-6.0.4.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-6.0.3.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-6.0.4.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-6.0.3.2.tar.xz -> libreoffice-help-6.0.4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-6.0.3.2/ChangeLog-helpcontent2 new/libreoffice-6.0.4.1/ChangeLog-helpcontent2 --- old/libreoffice-6.0.3.2/ChangeLog-helpcontent2 2018-03-29 17:14:09.000000000 +0200 +++ new/libreoffice-6.0.4.1/ChangeLog-helpcontent2 2018-04-17 21:21:18.000000000 +0200 @@ -1,14 +1,14 @@ -2018-03-29 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [8a4c48aa5dffbc7938246619c18f9ed9946e7ea8] +2018-04-17 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [b9f9f4de4c695fd9bd0666175e0bd75b01b682aa] - Version 6.0.3.2, tag libreoffice-6.0.3.2 + Version 6.0.4.1, tag libreoffice-6.0.4.1 - Change-Id: I2cea0de14c8a16e99b3afabcc0faad4eb0fc86d4 + Change-Id: I97b3d1e4af8285396ec45ee9d77c034e1619e071 -2018-03-15 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [da5c97fb32c83ea8e8f8c20c97f75e926ef9474c] +2018-04-17 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [c8f93fdee8bd19bd6250f0d27aa83fb1047789a5] - Branch libreoffice-6-0-3 + Branch libreoffice-6-0-4 - This is 'libreoffice-6-0-3' - the stable branch for the 6.0.3 release. + This is 'libreoffice-6-0-4' - the stable branch for the 6.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.0.x release, @@ -16,7 +16,7 @@ If you want to build something cool, unstable, and risky, use master. - Change-Id: Ibfc2284fd83dc3b65ee412dc4c37fb78c7be1fbf + Change-Id: I04be5e3364b13958017ebafea22131bdc497e4ba 2018-02-17 Olivier Hallot <olivier.hal...@libreoffice.org> [c084a6cc7a44ecd652b78351a35dd5c3ae9624f1] ++++++ libreoffice-icu61.patch ++++++ >From f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 Mon Sep 17 00:00:00 2001 From: Eike Rathke <er...@redhat.com> Date: Mon, 18 Dec 2017 20:28:07 +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: I16b6bc8b8c49713f32424df5fc6db494df7b6892 Reviewed-on: https://gerrit.libreoffice.org/46738 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') 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 +++ 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 7d795b5..3048d12 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; -- cgit v1.1 ++++++ libreoffice-translations-6.0.3.2.tar.xz -> libreoffice-translations-6.0.4.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-6.0.3.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-6.0.4.1.tar.xz differ: char 27, line 1
