From f8f1a336ef0b136d3d3c56a0a0c503c0415f9fe9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 17 Jul 2012 17:37:40 +0200 Subject: [PATCH] 3.6.0 rc2 --- .gitignore | 4 ++++ ...6937-insanely-slow-with-Zemberek-ins.patch | 21 ++++++++----------- libreoffice.spec | 7 +++++-- sources | 8 +++---- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 102c3e2..32fe0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,7 @@ /libreoffice-core-3.6.0.1.tar.xz /libreoffice-help-3.6.0.1.tar.xz /libreoffice-translations-3.6.0.1.tar.xz +/libreoffice-binfilter-3.6.0.2.tar.xz +/libreoffice-core-3.6.0.2.tar.xz +/libreoffice-help-3.6.0.2.tar.xz +/libreoffice-translations-3.6.0.2.tar.xz diff --git a/0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch b/0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch index 2da4456..0e4a891 100644 --- a/0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch +++ b/0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch @@ -50,7 +50,7 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/inc/editeng/unolingu.hxx libreoffice-3 diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3.5.5.3/editeng/source/misc/unolingu.cxx --- libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx 2012-07-13 12:37:15.900267806 +0100 +++ libreoffice-3.5.5.3/editeng/source/misc/unolingu.cxx 2012-07-16 08:52:53.919596778 +0100 -@@ -90,368 +90,6 @@ +@@ -90,365 +90,6 @@ return xRes; } @@ -80,7 +80,7 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - const OUString *pEntry = rCfgSvcs.getConstArray(); - for (sal_Int32 i = 0; i < nEntries; ++i) - { -- if (pEntry[i].getLength() && lcl_FindEntry( pEntry[i], rAvailSvcs )) +- if (!pEntry[i].isEmpty() && lcl_FindEntry( pEntry[i], rAvailSvcs )) - pRes[ nCnt++ ] = pEntry[i]; - } - @@ -139,7 +139,7 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - const OUString *pEntry = rAvailSvcs.getConstArray(); - for (sal_Int32 i = 0; i < nLen; ++i) - { -- if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], rLastFoundSvcs )) +- if (!pEntry[i].isEmpty() && !lcl_FindEntry( pEntry[i], rLastFoundSvcs )) - pRes[ nCnt++ ] = pEntry[i]; - } - @@ -166,7 +166,7 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - const OUString *pEntry = rSeq.getConstArray(); - for (sal_Int32 i = 0; i < nLen; ++i) - { -- if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], aRes )) +- if (!pEntry[i].isEmpty() && !lcl_FindEntry( pEntry[i], aRes )) - pRes[ nCnt++ ] = pEntry[i]; - } - } @@ -186,9 +186,6 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - { - typedef OUString OUstring_t; - typedef Sequence< OUString > Sequence_OUString_t; -- typedef std::vector< OUstring_t > OUString_vector_t; -- typedef std::set< OUstring_t > OUString_set_t; -- std::vector< OUString_vector_t > aVector; - typedef std::map< OUstring_t, Sequence_OUString_t > list_entry_map_t; - - RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::UpdateAll - updating..." ); @@ -232,8 +229,8 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - Sequence< OUString > aAvailSvcs( - xLngSvcMgr->getAvailableServices( aService, aLocale )); -#if OSL_DEBUG_LEVEL > 1 -- const OUString * pCfgSvcs = aCfgSvcs.getConstArray();; -- const OUString * pAvailSvcs = aAvailSvcs.getConstArray();; +- const OUString * pCfgSvcs = aCfgSvcs.getConstArray(); +- const OUString * pAvailSvcs = aAvailSvcs.getConstArray(); - (void) pCfgSvcs; - (void) pAvailSvcs; -#endif @@ -416,7 +413,7 @@ diff -ru libreoffice-3.5.5.3.orig/editeng/source/misc/unolingu.cxx libreoffice-3 - return nNeedUpdating == 1; -} - - + //! Dummy implementation in order to avoid loading of lingu DLL //! when only the XSupportedLocales interface is used. @@ -520,10 +158,6 @@ @@ -511,8 +508,8 @@ diff -ru libreoffice-3.5.5.3.orig/linguistic/source/lngsvcmgr.cxx libreoffice-3. { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -483,11 +482,98 @@ - pNames[2] = A2OU( "ServiceManager/HyphenatorList" ); - pNames[3] = A2OU( "ServiceManager/ThesaurusList" ); + pNames[2] = "ServiceManager/HyphenatorList"; + pNames[3] = "ServiceManager/ThesaurusList"; EnableNotification( aNames ); + + UpdateAll(); diff --git a/libreoffice.spec b/libreoffice.spec index fc58001..0ff9394 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,8 +28,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 3%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -2004,6 +2004,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Tue Jul 17 2012 David Tardon - 1:3.6.0.2-1 +- 3.6.0 rc2 + * Mon Jul 16 2012 Caolán McNamara - 1:3.6.0.1-3 - Resolves: rhbz#836937 insanely slow with Zemberek diff --git a/sources b/sources index 3afd138..7e9b14f 100644 --- a/sources +++ b/sources @@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -371a6aae826e734b4dccdd39abf10f35 libreoffice-binfilter-3.6.0.1.tar.xz -700285297d1fbcc2b4e49dc23428b6c7 libreoffice-core-3.6.0.1.tar.xz -cf2c4c5173680e27b19fe10741e053fb libreoffice-help-3.6.0.1.tar.xz -2b4a090c5d0bb9deff4dbc64f862843b libreoffice-translations-3.6.0.1.tar.xz +6de72e4b2f8a06bc74a04e83d2fbf32c libreoffice-binfilter-3.6.0.2.tar.xz +7f3355275c50fdfb82e432a9d621c621 libreoffice-core-3.6.0.2.tar.xz +80c525396cb25c6c8910534c7656802e libreoffice-help-3.6.0.2.tar.xz +e2ae45ce4d2cd3874e9071170ad73ac8 libreoffice-translations-3.6.0.2.tar.xz