From 925f48444c57a6a951a86c8e7d00d65a2bbcc9da Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 10 Aug 2014 21:01:27 +0200 Subject: [PATCH] update to 4.3.1 rc1 --- .gitignore | 3 + ...-do-apply-possible-changed-GraphicSt.patch | 81 ------------------- 0001-allow-build-with-icu-4.2.patch | 36 --------- ...1113-always-run-the-actual-detection.patch | 69 ---------------- ...eload-font-list-from-shell-on-change.patch | 30 ------- libreoffice.spec | 19 +++-- sources | 6 +- 7 files changed, 15 insertions(+), 229 deletions(-) delete mode 100644 0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch delete mode 100644 0001-allow-build-with-icu-4.2.patch delete mode 100644 0001-fdo-81113-always-run-the-actual-detection.patch delete mode 100644 0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch diff --git a/.gitignore b/.gitignore index ec3807b..84a65a2 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,6 @@ /libreoffice-4.3.0.4.tar.xz /libreoffice-help-4.3.0.4.tar.xz /libreoffice-translations-4.3.0.4.tar.xz +/libreoffice-4.3.1.1.tar.xz +/libreoffice-help-4.3.1.1.tar.xz +/libreoffice-translations-4.3.1.1.tar.xz diff --git a/0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch b/0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch deleted file mode 100644 index 4070305..0000000 --- a/0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e67d8d221326e1c753457d4283e2cff16b8b5f52 Mon Sep 17 00:00:00 2001 -From: Oliver-Rainer Wittmann -Date: Wed, 23 Jul 2014 08:53:15 +0000 -Subject: [PATCH] Resolves: #i125289# do apply possible changed - ... - -only for embedded images which already have its stream inside the package - -fixes also issue 125290 - -(cherry picked from commit 9602a121b458e7456fc533dad86f434f846a72ba) - -Conflicts: - xmloff/source/draw/shapeexport2.cxx - -Change-Id: I5af0093b20f2f291d3a94c690bfbdb59a59320c3 -(cherry picked from commit fd641c7b23ce4205c29fc0c564b73336cb2cfb07) -Reviewed-on: https://gerrit.libreoffice.org/10487 -Reviewed-by: David Tardon -Tested-by: David Tardon ---- - xmloff/source/draw/shapeexport.cxx | 32 +++++++++++++++++++------------- - 1 file changed, 19 insertions(+), 13 deletions(-) - -diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx -index c4bb166..ec8adfa 100644 ---- a/xmloff/source/draw/shapeexport.cxx -+++ b/xmloff/source/draw/shapeexport.cxx -@@ -2256,9 +2256,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape( - OUString aResolveURL( sImageURL ); - const OUString sPackageURL( "vnd.sun.star.Package:" ); - -- // trying to preserve the filename -+ // trying to preserve the filename for embedded images which already have its stream inside the package -+ bool bIsEmbeddedImageWithExistingStreamInPackage = false; - if ( aStreamURL.match( sPackageURL, 0 ) ) - { -+ bIsEmbeddedImageWithExistingStreamInPackage = true; -+ - OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); - sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1; - if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) ) -@@ -2278,20 +2281,23 @@ void XMLShapeExport::ImpExportGraphicObjectShape( - - if( !aStr.isEmpty() ) - { -- aStreamURL = sPackageURL; -- if( aStr[ 0 ] == '#' ) -- { -- aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) ); -- } -- else -+ // apply possible changed stream URL to embedded image object -+ if ( bIsEmbeddedImageWithExistingStreamInPackage ) - { -- aStreamURL = aStreamURL.concat( aStr ); -- } -+ aStreamURL = sPackageURL; -+ if ( aStr[0] == '#' ) -+ { -+ aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) ); -+ } -+ else -+ { -+ aStreamURL = aStreamURL.concat( aStr ); -+ } - -- // update stream URL for load on demand -- uno::Any aAny; -- aAny <<= aStreamURL; -- xPropSet->setPropertyValue("GraphicStreamURL", aAny ); -+ uno::Any aAny; -+ aAny <<= aStreamURL; -+ xPropSet->setPropertyValue( OUString("GraphicStreamURL"), aAny ); -+ } - - mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); --- -1.9.3 - diff --git a/0001-allow-build-with-icu-4.2.patch b/0001-allow-build-with-icu-4.2.patch deleted file mode 100644 index 8cd8a04..0000000 --- a/0001-allow-build-with-icu-4.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8180370d32d7a6af2b38ffb6bcfa614c1951434c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 2 Jul 2014 12:35:11 +0100 -Subject: [PATCH] allow build with icu 4.2 - -Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56 ---- - i18npool/source/collator/collator_unicode.cxx | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx -index 42dfef3..35c237d 100644 ---- a/i18npool/source/collator/collator_unicode.cxx -+++ b/i18npool/source/collator/collator_unicode.cxx -@@ -308,6 +308,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: - if (func && funclen) { - const sal_uInt8* ruleImage=func(); - size_t ruleImageSize = funclen(); -+ -+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2) -+ uca_base = new RuleBasedCollator(static_cast(NULL), status); -+#else - // Not only changed ICU 53.1 the API behavior that a negative - // length (ruleImageSize) now leads to failure, but also that - // the base RuleBasedCollator passed as uca_base here needs to -@@ -319,6 +323,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: - // NULL (default) locale does not. - uca_base = static_cast(icu::Collator::createInstance( - icu::Locale::getRoot(), status)); -+#endif - if (! U_SUCCESS(status)) throw RuntimeException(); - collator = new RuleBasedCollator( - reinterpret_cast(ruleImage), ruleImageSize, uca_base, status); --- -1.9.3 - diff --git a/0001-fdo-81113-always-run-the-actual-detection.patch b/0001-fdo-81113-always-run-the-actual-detection.patch deleted file mode 100644 index e566d58..0000000 --- a/0001-fdo-81113-always-run-the-actual-detection.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c10390a681a4d4696d45a6d38f7d01829f368daa Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 16 Jul 2014 15:13:36 +0200 -Subject: [PATCH] fdo#81113 always run the actual detection - -The old code only run detection if an UCBContent property was passed. -That means that any time the function got only InputStream, it claimed -that it was a Keynote presentation. - -Change-Id: I377828229e7e95384257bde247612d7768307581 ---- - .../source/impress/KeynoteImportFilter.cxx | 36 +++++++++++----------- - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx -index 5edbfa9..4b7b029 100644 ---- a/writerperfect/source/impress/KeynoteImportFilter.cxx -+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx -@@ -247,29 +247,29 @@ throw( com::sun::star::uno::RuntimeException, std::exception ) - { - return OUString(); - } -+ } - -- libetonyek::EtonyekDocument::Type type = libetonyek::EtonyekDocument::TYPE_UNKNOWN; -- const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported( input.get(), &type ); -- if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) || (libetonyek::EtonyekDocument::TYPE_KEYNOTE != type)) -- return OUString(); -+ libetonyek::EtonyekDocument::Type type = libetonyek::EtonyekDocument::TYPE_UNKNOWN; -+ const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported( input.get(), &type ); -+ if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) || (libetonyek::EtonyekDocument::TYPE_KEYNOTE != type)) -+ return OUString(); - -- if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART ) -- { -- assert( !bIsPackage ); -+ if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART ) -+ { -+ assert( !bIsPackage ); - -- const Reference < container::XChild > xChild( xContent, UNO_QUERY ); -- if ( xChild.is() ) -+ const Reference < container::XChild > xChild( xContent, UNO_QUERY ); -+ if ( xChild.is() ) -+ { -+ const Reference < ucb::XContent > xPackageContent( xChild->getParent(), UNO_QUERY ); -+ if ( xPackageContent.is() ) - { -- const Reference < ucb::XContent > xPackageContent( xChild->getParent(), UNO_QUERY ); -- if ( xPackageContent.is() ) -+ input.reset( new writerperfect::DirectoryStream( xPackageContent ) ); -+ if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT == libetonyek::EtonyekDocument::isSupported( input.get() ) ) - { -- input.reset( new writerperfect::DirectoryStream( xPackageContent ) ); -- if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT == libetonyek::EtonyekDocument::isSupported( input.get() ) ) -- { -- xContent = xPackageContent; -- bUCBContentChanged = true; -- bIsPackage = true; -- } -+ xContent = xPackageContent; -+ bUCBContentChanged = true; -+ bIsPackage = true; - } - } - } --- -1.9.3 - diff --git a/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch b/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch deleted file mode 100644 index 5c56321..0000000 --- a/0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0497864bd4f603605997938d504ef9598623e713 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 25 Jul 2014 15:40:27 +0200 -Subject: [PATCH] rhbz#1121254 reload font list from shell on change - -Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb ---- - svx/source/tbxctrls/tbcontrl.cxx | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx -index 816afbe..5728791 100644 ---- a/svx/source/tbxctrls/tbcontrl.cxx -+++ b/svx/source/tbxctrls/tbcontrl.cxx -@@ -891,6 +891,12 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) - Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); - SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT)); - } -+ else if ( rDCEvt.GetType() == DATACHANGED_FONTS ) -+ { -+ // The old font list in shell has likely been destroyed at this point, so we need to get -+ // the new one before doing anything further. -+ lcl_GetDocFontList( &pFontList, this ); -+ } - - FontNameBox::DataChanged( rDCEvt ); - } --- -1.9.3 - diff --git a/libreoffice.spec b/libreoffice.spec index 48c2842..aec8db9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 4.3.0 +%define libo_version 4.3.1 # 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. @@ -45,7 +45,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.4 +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 Group: Applications/Productivity @@ -303,14 +303,10 @@ Patch13: 0001-add-X-TryExec-entries-to-desktop-files.patch # not upstreamed Patch14: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch Patch15: 0001-rhbz-1111216-allow-to-export-an-empty-sheet-to-PDF.patch -Patch16: 0001-allow-build-with-icu-4.2.patch -Patch17: 0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch -Patch18: 0001-scrolling-very-slow-in-calc.patch -Patch19: 0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch -Patch20: 0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch -Patch21: 0001-fdo-81113-always-run-the-actual-detection.patch -Patch22: 0001-Resolves-i125289-do-apply-possible-changed-GraphicSt.patch -Patch23: 0001-rhbz-1121254-reload-font-list-from-shell-on-change.patch +Patch16: 0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch +Patch17: 0001-scrolling-very-slow-in-calc.patch +Patch18: 0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch +Patch19: 0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2283,6 +2279,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sun Aug 10 2014 David Tardon - 1:4.3.1.1-1 +- update to 4.3.1 rc1 + * Mon Jul 28 2014 David Tardon - 1:4.3.0.4-1 - update to 4.3.0 rc4 diff --git a/sources b/sources index 5520d38..3b8afb1 100644 --- a/sources +++ b/sources @@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh -de0d9322f3aaeb20abd5e06c5c0972bb libreoffice-4.3.0.4.tar.xz -89d9da0ff2d5ea07f8c30c680fee2b0a libreoffice-help-4.3.0.4.tar.xz -8e2f7905a0f827f655a1e21d93c6ddf7 libreoffice-translations-4.3.0.4.tar.xz +07ac38572f70a650d7c795a11f69dc30 libreoffice-4.3.1.1.tar.xz +354aae9d196a9322b7f23e2b04a05bd0 libreoffice-help-4.3.1.1.tar.xz +08cb1fd3eeb0aafe7425ebefda50d6f9 libreoffice-translations-4.3.1.1.tar.xz