From 3e75a0478623be978681ce01d0d2710a8280b3d3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 13 Oct 2015 08:33:10 +0200 Subject: [PATCH] update to 5.0.3 rc1 --- .gitignore | 3 + ...-1255200-apparent-missing-stylesheet.patch | 44 ------ ...3461-captions-laid-out-behind-images.patch | 58 -------- ...ore-fix-build-with-system-boost-1.59.patch | 133 ------------------ libreoffice.spec | 11 +- sources | 6 +- 6 files changed, 12 insertions(+), 243 deletions(-) delete mode 100644 0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch delete mode 100644 0001-Resolves-tdf-93461-captions-laid-out-behind-images.patch delete mode 100644 0001-core-fix-build-with-system-boost-1.59.patch diff --git a/.gitignore b/.gitignore index b54ba7d..3d161c2 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,6 @@ /libreoffice-5.0.2.2.tar.xz /libreoffice-help-5.0.2.2.tar.xz /libreoffice-translations-5.0.2.2.tar.xz +/libreoffice-5.0.3.1.tar.xz +/libreoffice-help-5.0.3.1.tar.xz +/libreoffice-translations-5.0.3.1.tar.xz diff --git a/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch b/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch deleted file mode 100644 index e3140c2..0000000 --- a/0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch +++ /dev/null @@ -1,44 +0,0 @@ -From aa2ae6a979c494f1aa6ce534c49edf2763ccb3e0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 1 Sep 2015 12:45:03 +0100 -Subject: [PATCH] Related: rhbz#1255200 apparent missing stylesheet - -Change-Id: Ice9a860ca839d37308b5c2f2eb639852fefe1d15 -(cherry picked from commit dcb0738b631c61999364bd8500f401f93bbfb84e) ---- - svx/source/table/tablecontroller.cxx | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx -index 38a41b5..64b40da 100644 ---- a/svx/source/table/tablecontroller.cxx -+++ b/svx/source/table/tablecontroller.cxx -@@ -1081,14 +1081,19 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) - { - SfxItemSet aSet( xCell->GetItemSet() ); - bool bChanges = false; -- const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet(); -- -- for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ ) -+ SfxStyleSheet *pStyleSheet = xCell->GetStyleSheet(); -+ SAL_WARN_IF(!pStyleSheet, "svx", "no stylesheet for table cell?"); -+ if (pStyleSheet) - { -- if( (rStyleAttribs.GetItemState( nWhich ) == SfxItemState::SET) && (aSet.GetItemState( nWhich ) == SfxItemState::SET) ) -+ const SfxItemSet& rStyleAttribs = pStyleSheet->GetItemSet(); -+ -+ for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ ) - { -- aSet.ClearItem( nWhich ); -- bChanges = true; -+ if( (rStyleAttribs.GetItemState( nWhich ) == SfxItemState::SET) && (aSet.GetItemState( nWhich ) == SfxItemState::SET) ) -+ { -+ aSet.ClearItem( nWhich ); -+ bChanges = true; -+ } - } - } - --- -2.4.0 - diff --git a/0001-Resolves-tdf-93461-captions-laid-out-behind-images.patch b/0001-Resolves-tdf-93461-captions-laid-out-behind-images.patch deleted file mode 100644 index 34b47e7..0000000 --- a/0001-Resolves-tdf-93461-captions-laid-out-behind-images.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 880298e4e7850d0b1af0b53e6e0ec3e769af782d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 28 Sep 2015 13:28:13 +0100 -Subject: [PATCH] Resolves: tdf#93461 captions laid out behind images - -regression from... - -commit 8a08f68669f9acfe98dadcca4af6519164a17000 -Author: Mike -Date: Mon Apr 27 01:27:05 2015 +1000 - - tdf#66141: SwTxtFrm::FormatQuick(bool) endless loop - - If a line happens to be invisible (e.g. in too thin cell of a table) - then aLine.FormatLine(nStart) returns nStart, and - aLine.Insert( new SwLineLayout() ) is executed until OOM. - -keep the zero advance loop detection attempt, but allow the first -insertion and disallow subsequent inserts - -Change-Id: I16380588220149cfd0ed0f835f08d2849180fece -(cherry picked from commit f06508e2cfa7e833862b7e9ff3b2f79181672275) ---- - sw/source/core/text/frmform.cxx | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx -index 263c05f..7f863c6 100644 ---- a/sw/source/core/text/frmform.cxx -+++ b/sw/source/core/text/frmform.cxx -@@ -1909,12 +1909,20 @@ bool SwTextFrm::FormatQuick( bool bForceQuickFormat ) - sal_Int32 nStart = GetOfst(); - const sal_Int32 nEnd = GetFollow() - ? GetFollow()->GetOfst() : aInf.GetText().getLength(); -+ -+ int nLoopProtection = 0; - do - { -- sal_Int32 nShift = aLine.FormatLine(nStart) - nStart; -- nStart += nShift; -- if ((nShift != 0) // Check for special case: line is invisible, -- // like in too thin table cell: tdf#66141 -+ sal_Int32 nNewStart = aLine.FormatLine(nStart); -+ if (nNewStart == nStart) -+ ++nLoopProtection; -+ else -+ nLoopProtection = 0; -+ nStart = nNewStart; -+ const bool bWillEndlessInsert = nLoopProtection > 250; -+ SAL_WARN_IF(bWillEndlessInsert, "sw", "loop detection triggered"); -+ if ((!bWillEndlessInsert) // Check for special case: line is invisible, -+ // like in too thin table cell: tdf#66141 - && (aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd))) - aLine.Insert( new SwLineLayout() ); - } while( aLine.Next() ); --- -2.4.3 - diff --git a/0001-core-fix-build-with-system-boost-1.59.patch b/0001-core-fix-build-with-system-boost-1.59.patch deleted file mode 100644 index 4854625..0000000 --- a/0001-core-fix-build-with-system-boost-1.59.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 7d49b9384ddb864231f7fa609f7bda097d734498 Mon Sep 17 00:00:00 2001 -From: David Ostrovsky -Date: Mon, 31 Aug 2015 19:53:49 +0200 -Subject: [PATCH] core: fix build with system boost 1.59 - -9a6cdce37e601b1406c71fef16ad9b315045c9da was trying to fix the problem -with exposing deprecated vars and functions in system's error_code.hpp -include file by patching bundled boost version. This approach would -only make sense, when upstream version is going to be fixed ASAP. Apply -another approach, and follow the same pattern as applied in external -libraries, by defining - - -DBOOST_ERROR_CODE_HEADER_ONLY \ - -DBOOST_SYSTEM_NO_DEPRECATED - -instead of patching bundled boost version. This way, the code would -work with unpatched system boost 1.59 final as well. - -Reviewed-on: https://gerrit.libreoffice.org/18201 -Reviewed-by: David Ostrovsky -Tested-by: David Ostrovsky -(cherry picked from commit e00a3a684e22f45f36b4002ce726cb2975cb36ae) - -Change-Id: I8684ca458ea4a5b7d7c3c3acfe7c14a6d19bc665 ---- - external/libebook/ExternalProject_libebook.mk | 3 ++- - external/libmspub/ExternalProject_libmspub.mk | 3 ++- - external/liborcus/ExternalProject_liborcus.mk | 2 +- - external/libpagemaker/ExternalProject_libpagemaker.mk | 3 ++- - external/librevenge/ExternalProject_librevenge.mk | 3 ++- - solenv/gbuild/platform/com_GCC_defs.mk | 2 ++ - solenv/gbuild/platform/com_MSC_defs.mk | 3 +++ - 7 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk -index 5e7f2b0..24244909 100644 ---- a/external/libebook/ExternalProject_libebook.mk -+++ b/external/libebook/ExternalProject_libebook.mk -@@ -38,7 +38,8 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - --disable-werror \ - --disable-weffc \ -- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ -+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ - XML_CFLAGS="$(LIBXML_CFLAGS)" \ - XML_LIBS="$(LIBXML_LIBS)" \ - REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ -diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk -index 644fc42..6157320 100644 ---- a/external/libmspub/ExternalProject_libmspub.mk -+++ b/external/libmspub/ExternalProject_libmspub.mk -@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : - --disable-werror \ - --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ -- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ -+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - ) -diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk -index 90d453c..ee890cd 100644 ---- a/external/liborcus/ExternalProject_liborcus.mk -+++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG - endif - endif - --liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) -+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED - liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) - ifeq ($(COM),MSC) - liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) -diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk -index f892d42..7ec8d7a 100644 ---- a/external/libpagemaker/ExternalProject_libpagemaker.mk -+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk -@@ -33,7 +33,8 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) : - --disable-werror \ - --disable-weffc \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ -- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ -+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) \ - ) -diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk -index 861a47c..702a495 100644 ---- a/external/librevenge/ExternalProject_librevenge.mk -+++ b/external/librevenge/ExternalProject_librevenge.mk -@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) : - --disable-generators \ - --without-docs \ - $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ -- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ -+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - && $(MAKE) \ -diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk -index 5b5a2bd..93b35a4 100644 ---- a/solenv/gbuild/platform/com_GCC_defs.mk -+++ b/solenv/gbuild/platform/com_GCC_defs.mk -@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3 - gb_AFLAGS := $(AFLAGS) - - gb_COMPILERDEFS := \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY \ -+ -DBOOST_SYSTEM_NO_DEPRECATED \ - -DCPPU_ENV=$(gb_CPPU_ENV) \ - - gb_CFLAGS_COMMON := \ -diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk -index e02b581..aa82a93 100644 ---- a/solenv/gbuild/platform/com_MSC_defs.mk -+++ b/solenv/gbuild/platform/com_MSC_defs.mk -@@ -44,6 +44,9 @@ endif - # like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled) - - gb_COMPILERDEFS := \ -+ -DBOOST_ERROR_CODE_HEADER_ONLY \ -+ -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \ -+ -DBOOST_SYSTEM_NO_DEPRECATED \ - -D_CRT_NON_CONFORMING_SWPRINTFS \ - -D_CRT_NONSTDC_NO_DEPRECATE \ - -D_CRT_SECURE_NO_DEPRECATE \ --- -2.5.0 - diff --git a/libreoffice.spec b/libreoffice.spec index b0a2fbe..8fd0067 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 5.0.2 +%define libo_version 5.0.3 # 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. @@ -52,8 +52,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 4%{?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 Artistic and MPLv2.0 and CC0 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -332,12 +332,10 @@ Patch23: 0001-implement-undo-for-equalize-marked-objects.patch Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch Patch26: 0001-implement-undo-of-delete-impress-cell-contents.patch -Patch27: 0001-core-fix-build-with-system-boost-1.59.patch Patch28: 0001-Fix-export-of-tdf-93675-to-.docx-as-much-as-is-possi.patch Patch29: 0001-default-to-as-character-caption-contents.patch Patch30: 0001-Related-tdf-93676-msword-wraps-slightly-differently-.patch Patch31: 0002-Related-tdf-93676-msword-wraps-slightly-differently-.patch -Patch32: 0001-Resolves-tdf-93461-captions-laid-out-behind-images.patch Patch33: 0001-implement-save-slide-background-for-impress.patch Patch34: 0001-Related-tdf-72880-presumably-using-startcenter-as-ge.patch @@ -2463,6 +2461,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Oct 12 2015 David Tardon - 1:5.0.3.1-1 +- update to 5.0.3 rc1 + * Thu Oct 08 2015 Caolán McNamara - 1:5.0.2.2-4 - Resolves: rhbz#1269593 declare support for vnd.libreoffice.cmis:// URLs diff --git a/sources b/sources index 0726d0c..e760ee9 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -e3d129dd7a579b14984c9c1231e851a5 libreoffice-5.0.2.2.tar.xz -61217b85dc31902fc97976d482cf064f libreoffice-help-5.0.2.2.tar.xz -5a4f0148a5cbe4c85be7e4e8c378fe61 libreoffice-translations-5.0.2.2.tar.xz +e69eae50c31a0458cc242f7d3a11433f libreoffice-5.0.3.1.tar.xz +db459d40448679f611724874ab935e3a libreoffice-help-5.0.3.1.tar.xz +de025d0a76d3df86d1eacab48857afc1 libreoffice-translations-5.0.3.1.tar.xz