diff --git a/.gitignore b/.gitignore index 708ea48..4677b35 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ /libreoffice-4.1.0.1.tar.xz /libreoffice-help-4.1.0.1.tar.xz /libreoffice-translations-4.1.0.1.tar.xz +/libreoffice-4.1.0.2.tar.xz +/libreoffice-help-4.1.0.2.tar.xz +/libreoffice-translations-4.1.0.2.tar.xz diff --git a/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch b/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch deleted file mode 100644 index 9ed026a..0000000 --- a/0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 517fc70fb19dd2afb72890aaf7ccee5d422b7aa4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Sun, 23 Jun 2013 20:46:07 +0100 -Subject: [PATCH] Resolves: rhbz#976304 gallery elements may not support - document.Settings - -so the createInstance throws, so the element doesn't get inserted into -the documents. - -regression since f0cd6fe9075cd0aa00162474784ad804a07ed138 - -Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20 ---- - xmloff/source/draw/sdxmlexp.cxx | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx -index 6e86da3..c9149b9 100644 ---- a/xmloff/source/draw/sdxmlexp.cxx -+++ b/xmloff/source/draw/sdxmlexp.cxx -@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() - Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); - if( xFac.is() ) - { -- Reference const xProps( xFac->createInstance( -- "com.sun.star.document.Settings"), UNO_QUERY ); -- if (xProps.is()) -+ try - { -- try // clipboard document doesn't have shell so throws here -- { -- xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts; -- } -- catch (uno::Exception const&) { } -+ Reference const xProps( xFac->createInstance( -+ "com.sun.star.document.Settings"), UNO_QUERY_THROW ); -+ xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts; -+ } -+ catch (...) -+ { -+ // clipboard document doesn't have shell so throws from getPropertyValue -+ // gallery elements may not support com.sun.star.document.Settings so throws from createInstance - } - } - } --- -1.8.2.1 - diff --git a/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch b/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch deleted file mode 100644 index e59bc2f..0000000 --- a/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3090cfc972287da3fbdc567387527b65b3bfd128 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 1 Jul 2013 12:56:17 +0100 -Subject: [PATCH] Resolves: rhbz#979758 crash on 'Diagrammen in LibreOffice' - help page - -Change-Id: I269846840b8e2f67838da525c020a305901cf903 ---- - sw/source/core/unocore/unocrsrhelper.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx -index deeb5ba..66202c0 100644 ---- a/sw/source/core/unocore/unocrsrhelper.cxx -+++ b/sw/source/core/unocore/unocrsrhelper.cxx -@@ -176,7 +176,7 @@ void GetSelectableFromAny(uno::Reference const& xIfc, - if (pRanges) - { - SwUnoCrsr const* pUnoCrsr = pRanges->GetCursor(); -- if (pUnoCrsr->GetDoc() == &rTargetDoc) -+ if (pUnoCrsr && pUnoCrsr->GetDoc() == &rTargetDoc) - { - o_rpPaM = lcl_createPamCopy(*pUnoCrsr); - } --- -1.8.2.1 - diff --git a/0001-buildfix.patch b/0001-buildfix.patch deleted file mode 100644 index 4634e6a..0000000 --- a/0001-buildfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 46c683c740acf324164f188a97abea28fe3c1bf9 Mon Sep 17 00:00:00 2001 -From: Andras Timar -Date: Tue, 18 Jun 2013 16:54:58 +0200 -Subject: [PATCH] buildfix - -Change-Id: I3816b95baba54568d00f7afca8eff0a1882f8886 ---- - source/kk/dbaccess/source/ui/misc.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/kk/dbaccess/source/ui/misc.po b/source/kk/dbaccess/source/ui/misc.po -index c5d8118..a42baf0 100644 ---- a/translations/source/kk/dbaccess/source/ui/misc.po -+++ b/translations/source/kk/dbaccess/source/ui/misc.po -@@ -417,4 +417,4 @@ msgctxt "" - "RID_STR_EXTENSION_NOT_PRESENT\n" - "string.text" - msgid "The report, \"$file$\", requires the Oracle Report Builder feature." --msgstr "\\\"$file$\\\" есептемесі Oracle Report Builder мүмкіндігін талап етеді." -+msgstr "\"$file$\" есептемесі Oracle Report Builder мүмкіндігін талап етеді." --- -1.8.2.1 - diff --git a/0001-convert-the-right-number-of-elements.patch b/0001-convert-the-right-number-of-elements.patch deleted file mode 100644 index 169f87f..0000000 --- a/0001-convert-the-right-number-of-elements.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 24 Jun 2013 13:31:27 +0200 -Subject: [PATCH] convert the right number of elements - -Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c ---- - include/oox/helper/binaryoutputstream.hxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx -index 0882821..56d8065 100644 ---- a/include/oox/helper/binaryoutputstream.hxx -+++ b/include/oox/helper/binaryoutputstream.hxx -@@ -84,7 +84,7 @@ template< typename Type > - void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount ) - { - sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type ); -- ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nWriteSize ) ); -+ ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast< size_t >( nElemCount ) ); - writeMemory( opnArray, nWriteSize, sizeof( Type ) ); - } - --- -1.8.2.1 - diff --git a/0001-do-not-build-LibreOffice_Test.patch b/0001-do-not-build-LibreOffice_Test.patch index 58ce7c3..076fa3c 100644 --- a/0001-do-not-build-LibreOffice_Test.patch +++ b/0001-do-not-build-LibreOffice_Test.patch @@ -20,7 +20,7 @@ index 0962ac8..d3d922285 100644 - $(call instsetoo_native_install_command,not-used,en-US,_Test,,$(PKGFORMAT)) -endif ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS))) - $(foreach lang,$(filter-out $(WITH_POOR_HELP_LOCALIZATIONS),$(instsetoo_native_WITH_LANG)), \ + $(foreach lang,$(gb_HELP_LANGS),\ $(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT))) -- 1.8.1.4 diff --git a/0001-fix-rtf-import-on-big-endian.patch b/0001-fix-rtf-import-on-big-endian.patch deleted file mode 100644 index dda5b0b..0000000 --- a/0001-fix-rtf-import-on-big-endian.patch +++ /dev/null @@ -1,114 +0,0 @@ -From d2dff59c034a65421dee67c86c1b1585d56f29d1 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 19 Jun 2013 12:38:43 +0200 -Subject: [PATCH] fix rtf import on big endian - -(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) - -Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 -Signed-off-by: David Tardon ---- - writerfilter/source/rtftok/rtffly.hxx | 42 +++++++++++++---------------------- - 1 file changed, 15 insertions(+), 27 deletions(-) - -diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx -index ab68cfc..d07a8ac 100644 ---- a/writerfilter/source/rtftok/rtffly.hxx -+++ b/writerfilter/source/rtftok/rtffly.hxx -@@ -17,18 +17,18 @@ namespace writerfilter { - { - public: - RTFVertOrient(sal_uInt16 nValue) -+ : nVal(nValue) - { -- Value.nVal = nValue; - } - - sal_uInt16 GetOrient() const - { -- return Value.Flags.nOrient; -+ return OSL_LONIBBLE(OSL_LOBYTE(nVal)); - } - - sal_uInt16 GetRelation() const - { -- return Value.Flags.nRelOrient; -+ return OSL_HINIBBLE(OSL_LOBYTE(nVal)); - } - - sal_Int32 GetAlign() const -@@ -71,19 +71,11 @@ namespace writerfilter { - - sal_uInt16 GetValue() const - { -- return Value.nVal; -+ return nVal; - } - - private: -- union -- { -- struct -- { -- sal_uInt16 nOrient : 4; -- sal_uInt16 nRelOrient : 4; -- } Flags; -- sal_uInt16 nVal; -- } Value; -+ sal_uInt16 nVal; - }; - - /// Stores the horizontal orientation properties of an RTF fly frame. -@@ -91,18 +83,23 @@ namespace writerfilter { - { - public: - RTFHoriOrient(sal_uInt16 nValue) -+ : nVal(nValue) - { -- Value.nVal = nValue; - } - - sal_uInt16 GetOrient() const - { -- return Value.Flags.nOrient; -+ return OSL_LONIBBLE(OSL_LOBYTE(nVal)); - } - - sal_uInt16 GetRelation() const - { -- return Value.Flags.nRelOrient; -+ return OSL_LONIBBLE(OSL_HIBYTE(nVal)); -+ } -+ -+ sal_uInt16 GetRelAnchor() const -+ { -+ return OSL_HINIBBLE(OSL_LOBYTE(nVal)); - } - - sal_Int32 GetAlign() const -@@ -151,20 +148,11 @@ namespace writerfilter { - - sal_uInt16 GetValue() const - { -- return Value.nVal; -+ return nVal; - } - - private: -- union -- { -- struct -- { -- sal_uInt16 nOrient : 4; -- sal_uInt16 nRelAnchor : 4; -- sal_uInt16 nRelOrient : 4; -- } Flags; -- sal_uInt16 nVal; -- } Value; -+ sal_uInt16 nVal; - }; - } // namespace rtftok - } // namespace writerfilter --- -1.8.2.1 - diff --git a/libreoffice.spec b/libreoffice.spec index b7f867b..d03d9ac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,8 +42,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 8%{?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 and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -248,11 +248,6 @@ Patch16: 0001-do-not-build-LibreOffice_Test.patch Patch17: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch Patch18: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch -Patch20: 0001-buildfix.patch -Patch21: 0001-fix-rtf-import-on-big-endian.patch -Patch22: 0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch -Patch23: 0001-convert-the-right-number-of-elements.patch -Patch24: 0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1001,11 +996,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch17 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch %patch18 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch %patch19 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch -%patch20 -p1 -b .buildfix.patch -%patch21 -p1 -b .fix-rtf-import-on-big-endian.patch -%patch22 -p1 -b .rhbz-976304-gallery-elements-may-not-suppor.patch -%patch23 -p1 -b .convert-the-right-number-of-elements.patch -%patch24 -p1 -b .rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2084,6 +2074,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Jul 04 2013 David Tardon - 1:4.1.0.2-1 +- 4.1.0 rc2 + * Mon Jul 01 2013 Caolán McNamara - 1:4.1.0.1-8 - Resolves: rhbz#979758 crash on Diagrammen in LibreOffice help page diff --git a/sources b/sources index 34b7292..98b83bb 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 -223fccc626e15fd54d196333db1f7704 libreoffice-4.1.0.1.tar.xz -932d9f89fc5f1766c15fcbb9d852c329 libreoffice-help-4.1.0.1.tar.xz -c1063f6e3bd0860cd23ded67f4b04e64 libreoffice-translations-4.1.0.1.tar.xz +fd49e3518a91761dc9f7129476e60f19 libreoffice-4.1.0.2.tar.xz +7d90a8b785d3c7d8dea22ff64689acb7 libreoffice-help-4.1.0.2.tar.xz +6114b92b5c362182eaff3ab0ac787802 libreoffice-translations-4.1.0.2.tar.xz