From 94a9900b339e18deca154cfdee0d7c3bfdf2c494 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 10 Jul 2015 21:55:00 +0200 Subject: [PATCH] update to 5.0.0 rc3 --- .gitignore | 5 +- ...x-langtag-test-with-liblangtag-0.5.7.patch | 29 -------- ...dden-pages-omit-the-hidden-pages-fro.patch | 72 ------------------- libreoffice.spec | 9 +-- sources | 6 +- 5 files changed, 12 insertions(+), 109 deletions(-) delete mode 100644 0001-fix-langtag-test-with-liblangtag-0.5.7.patch delete mode 100644 0001-when-skipping-hidden-pages-omit-the-hidden-pages-fro.patch diff --git a/.gitignore b/.gitignore index 6288d84..c679050 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ /Firebird-2.5.2.26540-0.tar.bz2 /OpenCOLLADA-master-6509aa13af.tar.bz2 /harfbuzz-0.9.40.tar.bz2 -/language-subtag-registry-2014-12-03.tar.bz2 +/language-subtag-registry-2015-06-08.tar.bz2 /lcms2-2.6.tar.gz /libabw-0.1.1.tar.bz2 /libatomic_ops-7_2d.zip @@ -45,3 +45,6 @@ /libreoffice-5.0.0.2.tar.xz /libreoffice-help-5.0.0.2.tar.xz /libreoffice-translations-5.0.0.2.tar.xz +/libreoffice-5.0.0.3.tar.xz +/libreoffice-help-5.0.0.3.tar.xz +/libreoffice-translations-5.0.0.3.tar.xz diff --git a/0001-fix-langtag-test-with-liblangtag-0.5.7.patch b/0001-fix-langtag-test-with-liblangtag-0.5.7.patch deleted file mode 100644 index 735ec30..0000000 --- a/0001-fix-langtag-test-with-liblangtag-0.5.7.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b43fde69caf456585004b3e1da5161d76eadf057 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 8 Jul 2015 09:48:46 +0200 -Subject: [PATCH] fix langtag test with liblangtag 0.5.7 - -Change-Id: Ic8639daa5a32cf98fa17903424b00916cb6d8c6f ---- - i18nlangtag/qa/cppunit/test_languagetag.cxx | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx -index 81ec2df..b76547c 100644 ---- a/i18nlangtag/qa/cppunit/test_languagetag.cxx -+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx -@@ -601,7 +601,10 @@ void TestLanguageTag::testAllTags() - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); - /* TODO: at least some (those we know) grandfathered tags should be - * recognized by the replacement code. */ -- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-GB-oed", &aCanonicalized) && aCanonicalized == "en-GB-oed" ); -+ CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-GB-oed", &aCanonicalized) ); -+ // en-GB-oed has become deprecated in updated language-subtag-registry database -+ // (liblangtag 0.5.7) -+ CPPUNIT_ASSERT( ( aCanonicalized == "en-GB-oxendict" ) || ( aCanonicalized == "en-GB-oed" ) ); - #else - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-Latn-DE" ); - #endif --- -2.1.0 - diff --git a/0001-when-skipping-hidden-pages-omit-the-hidden-pages-fro.patch b/0001-when-skipping-hidden-pages-omit-the-hidden-pages-fro.patch deleted file mode 100644 index a6430f5..0000000 --- a/0001-when-skipping-hidden-pages-omit-the-hidden-pages-fro.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 74879ff0ef14db47365650819bbe7c9f105b057a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 8 Jul 2015 12:24:46 +0100 -Subject: [PATCH] when skipping hidden pages omit the hidden pages from page - bookmarks - -three slides, set second to hidden, export to pdf (without toggling -on include hidden slides), in evince/acroread click on the "slide 3" -title, and the viewers will not jump to that slide, seeing as the -index is mis-calculated assuming 1-1 export-import pages - -Change-Id: I2f21eb655684ac4cb06384a8e9a17b419f644f3f ---- - sd/source/ui/unoidl/unomodel.cxx | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx -index 2d72378..472edac 100644 ---- a/sd/source/ui/unoidl/unomodel.cxx -+++ b/sd/source/ui/unoidl/unomodel.cxx -@@ -1851,6 +1851,25 @@ bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const - return bPrintable; - - } -+ -+namespace -+{ -+ sal_Int16 CalcOutputPageNum(vcl::PDFExtOutDevData* pPDFExtOutDevData, SdDrawDocument *pDoc, sal_Int16 nPageNumber) -+ { -+ //export all pages, simple one to one case -+ if (pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides()) -+ return nPageNumber-1; -+ //check all preceding pages, and only count non-hidden ones -+ sal_Int16 nRet = 0; -+ for (sal_Int16 i = 0; i < nPageNumber-1; ++i) -+ { -+ if (!(pDoc->GetSdPage(i, PK_STANDARD))->IsExcluded()) -+ ++nRet; -+ } -+ return nRet; -+ } -+} -+ - void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection, - const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) -@@ -2135,9 +2154,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r - OUString aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName(); - if( !aPageName.isEmpty() ) - { -+ // Destination PageNum -+ const sal_Int32 nDestPageNum = CalcOutputPageNum(pPDFExtOutDevData, mpDoc, nPageNumber); -+ - // insert the bookmark to this page into the NamedDestinations - if( pPDFExtOutDevData->GetIsExportNamedDestinations() ) -- pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect, nPageNumber - 1 ); -+ pPDFExtOutDevData->CreateNamedDest(aPageName, aPageRect, nDestPageNum); - - // add the name to the outline, (almost) same code as in sc/source/ui/unoobj/docuno.cxx - // issue #i40318. -@@ -2146,7 +2168,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r - { - // Destination Export - const sal_Int32 nDestId = -- pPDFExtOutDevData->CreateDest( aPageRect , nPageNumber - 1 ); -+ pPDFExtOutDevData->CreateDest(aPageRect , nDestPageNum); - - // Create a new outline item: - pPDFExtOutDevData->CreateOutlineItem( -1 , aPageName, nDestId ); --- -2.4.0 - diff --git a/libreoffice.spec b/libreoffice.spec index b1fd2ee..a791518 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.3 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 @@ -94,7 +94,7 @@ Source21: %{external_url}/lcms2-2.6.tar.gz Source22: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 Source23: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 Source24: %{external_url}/harfbuzz-0.9.40.tar.bz2 -Source25: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2 +Source25: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2 %global bundling_options %{?bundling_options} --without-system-mythes --without-system-redland --without-system-libexttextcat --without-system-clucene --without-system-lcms2 --without-system-liblangtag --without-system-boost --without-system-harfbuzz %endif Source26: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz @@ -329,8 +329,6 @@ Patch19: 0001-rhbz-1233420-handle-inexistent-cond.-format.patch Patch20: 0001-allow-slide-design-to-affect-multiple-standard-pages.patch Patch21: 0001-implement-equalize-width-and-height-for-impress-draw.patch Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch -Patch23: 0001-fix-langtag-test-with-liblangtag-0.5.7.patch -Patch24: 0001-when-skipping-hidden-pages-omit-the-hidden-pages-fro.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2442,6 +2440,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri Jul 10 2015 David Tardon - 1:5.0.0.3-1 +- update to 5.0.0 rc3 + * Sun Jun 28 2015 David Tardon - 1:5.0.0.2-1 - update to 5.0.0 rc2 diff --git a/sources b/sources index 481d8dd..38368a6 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 -6b2bedc02373dfcf683353178d4c9f03 libreoffice-5.0.0.2.tar.xz -66853cc2b37a24b9113a5cb0d118dc50 libreoffice-help-5.0.0.2.tar.xz -3671a8068cec6698d2532174eba3457a libreoffice-translations-5.0.0.2.tar.xz +1f7fc147d284ac2b5829cc41b03834e8 libreoffice-5.0.0.3.tar.xz +3a7f814bd6876c070b01df2eb79f685e libreoffice-help-5.0.0.3.tar.xz +200fbad7c78a609786fd4c8587558ee5 libreoffice-translations-5.0.0.3.tar.xz