diff --git a/.gitignore b/.gitignore index 4c70349..a5b62e8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ /libwps-0.4.6.tar.xz /libzmf-0.0.1.tar.bz2 /mdds-1.2.2.tar.bz2 -/xmlsec1-1.2.24.tar.gz +/xmlsec1-1.2.25.tar.gz /libreoffice-5.4.2.1.tar.xz /libreoffice-help-5.4.2.1.tar.xz /libreoffice-translations-5.4.2.1.tar.xz @@ -38,3 +38,9 @@ /libreoffice-help-5.4.3.1.tar.xz.asc /libreoffice-translations-5.4.3.1.tar.xz /libreoffice-translations-5.4.3.1.tar.xz.asc +/libreoffice-6.0.0.0.alpha1.tar.xz +/libreoffice-6.0.0.0.alpha1.tar.xz.asc +/libreoffice-help-6.0.0.0.alpha1.tar.xz +/libreoffice-help-6.0.0.0.alpha1.tar.xz.asc +/libreoffice-translations-6.0.0.0.alpha1.tar.xz +/libreoffice-translations-6.0.0.0.alpha1.tar.xz.asc diff --git a/0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch b/0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch new file mode 100644 index 0000000..8ab39d9 --- /dev/null +++ b/0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch @@ -0,0 +1,32 @@ +From c2097d5078896a71b8e1ac4074cc03766f5d7098 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 24 Oct 2017 14:56:30 +0200 +Subject: [PATCH] Make testUtf8StringLiterals work when char is unsigned + +...as is reportedly the case for Linux AArch64 + +Change-Id: I7e11c42f4437c8aad9dd734603fa7e0d458c9754 +--- + sal/qa/rtl/strings/test_ostring.cxx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx +index 110831758916..3732f7488bde 100644 +--- a/sal/qa/rtl/strings/test_ostring.cxx ++++ b/sal/qa/rtl/strings/test_ostring.cxx +@@ -111,9 +111,9 @@ void Test::testUtf8StringLiterals() + { + const OString sIn(u8"ßa"); + CPPUNIT_ASSERT_EQUAL(static_cast(3), sIn.getLength()); +- CPPUNIT_ASSERT_EQUAL(-61, static_cast(sIn[0])); +- CPPUNIT_ASSERT_EQUAL(-97, static_cast(sIn[1])); +- CPPUNIT_ASSERT_EQUAL(97, static_cast(sIn[2])); ++ CPPUNIT_ASSERT_EQUAL(195, int(static_cast(sIn[0]))); ++ CPPUNIT_ASSERT_EQUAL(159, int(static_cast(sIn[1]))); ++ CPPUNIT_ASSERT_EQUAL(97, int(static_cast(sIn[2]))); + } + + CPPUNIT_TEST_SUITE_REGISTRATION(Test); +-- +2.14.1 + diff --git a/0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch b/0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch new file mode 100644 index 0000000..c807791 --- /dev/null +++ b/0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch @@ -0,0 +1,30 @@ +From 7e389ae76965fdbd4cdf0a8482592295489a48d7 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 24 Oct 2017 11:03:24 +0200 +Subject: [PATCH] allow to override ENABLE_STRIP in the installer + +... because we set ENABLE_STRIP in +instsetoo_native/CustomTarget_install.mk . + +Change-Id: I4eaf66c53a0ec680688bf819b3a396865e7a3e33 +--- + solenv/bin/modules/installer/environment.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm +index 8afe3c12c782..38448a8ba9fb 100644 +--- a/solenv/bin/modules/installer/environment.pm ++++ b/solenv/bin/modules/installer/environment.pm +@@ -122,8 +122,8 @@ sub set_global_environment_variables + if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; } + if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; } + if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; } +- if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; } + if (( $ENV{'ENABLE_STRIP'} ) && ( $ENV{'ENABLE_STRIP'} ne '' )) { $installer::globals::strip = 1; } ++ if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; } + + if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; } + # Special handling, if LOCALINSTALLDIR contains "~" in the path +-- +2.14.1 + diff --git a/0001-blind-attempt-to-fix-build-on-big-endian.patch b/0001-blind-attempt-to-fix-build-on-big-endian.patch new file mode 100644 index 0000000..a09c4d2 --- /dev/null +++ b/0001-blind-attempt-to-fix-build-on-big-endian.patch @@ -0,0 +1,39 @@ +From cb0eb72ec40210ea7bade415ab3e78824e705c29 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 26 Oct 2017 22:24:55 +0200 +Subject: [PATCH] blind attempt to fix build on big endian + +Change-Id: I4dc2d5a5fbbded5f4c7a1417c150fe6b1a73a69d +--- + drawinglayer/source/tools/emfphelperdata.cxx | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx +index be8f17acc02f..75f1c3c8f3f3 100644 +--- a/drawinglayer/source/tools/emfphelperdata.cxx ++++ b/drawinglayer/source/tools/emfphelperdata.cxx +@@ -42,6 +42,21 @@ + + namespace emfplushelper + { ++ ++#ifdef OSL_BIGENDIAN ++ // little endian <-> big endian switch ++ static float GetSwapFloat(SvStream& rStream) ++ { ++ float fTmp; ++ sal_Int8* pPtr = (sal_Int8*)&fTmp; ++ rStream.ReadSChar(pPtr[3]); ++ rStream.ReadSChar(pPtr[2]); ++ rStream.ReadSChar(pPtr[1]); ++ rStream.ReadSChar(pPtr[0]); ++ return fTmp; ++ } ++#endif ++ + const char* emfTypeToName(sal_uInt16 type) + { + switch (type) +-- +2.14.1 + diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 0000000..14937c6 --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,30 @@ +From db6673bb32bb131b6446dc976fe09b1f8df72d49 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 24 Oct 2017 17:07:24 +0200 +Subject: [PATCH] fix build error + +Change-Id: I1e65f075a0519db86836b3aa09848178796a020b +--- + libreofficekit/source/gtk/lokdocview.cxx | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx +index d2bfefcc089e..607a8624ecc3 100644 +--- a/libreofficekit/source/gtk/lokdocview.cxx ++++ b/libreofficekit/source/gtk/lokdocview.cxx +@@ -177,10 +177,8 @@ struct LOKDocViewPrivateImpl + /// Cached document type, returned by getDocumentType(). + LibreOfficeKitDocumentType m_eDocumentType; + +- /** +- * Contains a freshly set zoom level: logic size of a tile. +- * It gets reset back to 0 when LOK was informed about this zoom change. +- */ ++ /// Contains a freshly set zoom level: logic size of a tile. ++ /// It gets reset back to 0 when LOK was informed about this zoom change. + int m_nTileSizeTwips; + + GdkRectangle m_aVisibleArea; +-- +2.14.1 + diff --git a/0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch b/0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch new file mode 100644 index 0000000..b712ab9 --- /dev/null +++ b/0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch @@ -0,0 +1,155 @@ +From a3cb93b3917608f5b329321caea8d699b80b1ddf Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Fri, 27 Oct 2017 11:51:28 +0200 +Subject: [PATCH] remove GetSwapFloat nonsense from all 3 EMF readers + +SvStream::ReadFloat already does that, and SvStream is initialised +to SvStreamEndian::LITTLE by default. + +Change-Id: I5859e43014533bcebef9d4b8f0678c516193b92e +--- + cppcanvas/source/inc/implrenderer.hxx | 23 ----------------------- + drawinglayer/source/tools/emfphelperdata.cxx | 23 ----------------------- + emfio/source/reader/emfreader.cxx | 14 -------------- + emfio/source/reader/mtftools.cxx | 9 --------- + 4 files changed, 69 deletions(-) + +diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx +index 15b610306304..e61f3407169a 100644 +--- a/cppcanvas/source/inc/implrenderer.hxx ++++ b/cppcanvas/source/inc/implrenderer.hxx +@@ -133,20 +133,6 @@ namespace cppcanvas + eDy = eDx*f.eM12 + eDy*f.eM22 + f.eDy; + } + +-#ifdef OSL_BIGENDIAN +-// little endian <-> big endian switch +-static float GetSwapFloat( SvStream& rSt ) +-{ +- float fTmp; +- sal_Int8* pPtr = (sal_Int8*)&fTmp; +- rSt.ReadSChar( pPtr[3] ); +- rSt.ReadSChar( pPtr[2] ); +- rSt.ReadSChar( pPtr[1] ); +- rSt.ReadSChar( pPtr[0] ); +- return fTmp; +-} +-#endif +- + friend SvStream& ReadXForm( SvStream& rIn, XForm& rXForm ) + { + if ( sizeof( float ) != 4 ) +@@ -156,17 +142,8 @@ static float GetSwapFloat( SvStream& rSt ) + } + else + { +-#ifdef OSL_BIGENDIAN +- rXForm.eM11 = GetSwapFloat( rIn ); +- rXForm.eM12 = GetSwapFloat( rIn ); +- rXForm.eM21 = GetSwapFloat( rIn ); +- rXForm.eM22 = GetSwapFloat( rIn ); +- rXForm.eDx = GetSwapFloat( rIn ); +- rXForm.eDy = GetSwapFloat( rIn ); +-#else + rIn.ReadFloat( rXForm.eM11 ).ReadFloat( rXForm.eM12 ).ReadFloat( rXForm.eM21 ).ReadFloat( rXForm.eM22 ) + .ReadFloat( rXForm.eDx ).ReadFloat( rXForm.eDy ); +-#endif + } + return rIn; + } +diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx +index 75f1c3c8f3f3..79ce930a5358 100644 +--- a/drawinglayer/source/tools/emfphelperdata.cxx ++++ b/drawinglayer/source/tools/emfphelperdata.cxx +@@ -43,20 +43,6 @@ + namespace emfplushelper + { + +-#ifdef OSL_BIGENDIAN +- // little endian <-> big endian switch +- static float GetSwapFloat(SvStream& rStream) +- { +- float fTmp; +- sal_Int8* pPtr = (sal_Int8*)&fTmp; +- rStream.ReadSChar(pPtr[3]); +- rStream.ReadSChar(pPtr[2]); +- rStream.ReadSChar(pPtr[1]); +- rStream.ReadSChar(pPtr[0]); +- return fTmp; +- } +-#endif +- + const char* emfTypeToName(sal_uInt16 type) + { + switch (type) +@@ -265,16 +251,7 @@ namespace emfplushelper + float eM22(0.0); + float eDx(0.0); + float eDy(0.0); +-#ifdef OSL_BIGENDIAN +- eM11 = GetSwapFloat(rIn); +- eM12 = GetSwapFloat(rIn); +- eM21 = GetSwapFloat(rIn); +- eM22 = GetSwapFloat(rIn); +- eDx = GetSwapFloat(rIn); +- eDy = GetSwapFloat(rIn); +-#else + rIn.ReadFloat(eM11).ReadFloat(eM12).ReadFloat(eM21).ReadFloat(eM22).ReadFloat(eDx).ReadFloat(eDy); +-#endif + rTarget = basegfx::B2DHomMatrix( + eM11, eM21, eDx, + eM12, eM22, eDy); +diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx +index 8ff413b79033..f865487e00d1 100644 +--- a/emfio/source/reader/emfreader.cxx ++++ b/emfio/source/reader/emfreader.cxx +@@ -305,20 +305,6 @@ record_type_name(sal_uInt32 nRecType) + #endif + } + +-#ifdef OSL_BIGENDIAN +-// little endian <-> big endian switch +-static float GetSwapFloat(SvStream& rStream) +-{ +- float fTmp; +- sal_Int8* pPtr = (sal_Int8*)&fTmp; +- rStream.ReadSChar(pPtr[3]); +- rStream.ReadSChar(pPtr[2]); +- rStream.ReadSChar(pPtr[1]); +- rStream.ReadSChar(pPtr[0]); +- return fTmp; +-} +-#endif +- + struct BLENDFUNCTION + { + unsigned char aBlendOperation; +diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx +index b6de61d1f6bc..038000e9a185 100644 +--- a/emfio/source/reader/mtftools.cxx ++++ b/emfio/source/reader/mtftools.cxx +@@ -56,21 +56,12 @@ namespace emfio + } + else + { +-#ifdef OSL_BIGENDIAN +- rXForm.eM11 = GetSwapFloat(rInStream); +- rXForm.eM12 = GetSwapFloat(rInStream); +- rXForm.eM21 = GetSwapFloat(rInStream); +- rXForm.eM22 = GetSwapFloat(rInStream); +- rXForm.eDx = GetSwapFloat(rInStream); +- rXForm.eDy = GetSwapFloat(rInStream); +-#else + rInStream.ReadFloat(rXForm.eM11); + rInStream.ReadFloat(rXForm.eM12); + rInStream.ReadFloat(rXForm.eM21); + rInStream.ReadFloat(rXForm.eM22); + rInStream.ReadFloat(rXForm.eDx); + rInStream.ReadFloat(rXForm.eDy); +-#endif + } + return rInStream; + } +-- +2.14.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 24b9cc5..fe1d553 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,9 +1,9 @@ # download path contains version without the last (fourth) digit -%global libo_version 5.4.3 +%global libo_version 6.0.0 # 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. -%global libo_prerelease %{nil} +%global libo_prerelease .alpha1 # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor @@ -56,8 +56,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 1%{?libo_prerelease}%{?dist} +Version: %{libo_version}.0 +Release: 0%{?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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -71,7 +71,7 @@ Source6: gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source8: libreoffice-multiliblauncher.sh Source9: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source10: %{external_url}/xmlsec1-1.2.24.tar.gz +Source10: %{external_url}/xmlsec1-1.2.25.tar.gz Source11: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source12: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose @@ -99,7 +99,7 @@ Source102: %{external_url}/mdds-1.2.2.tar.bz2 Source103: %{external_url}/libcmis-0.5.1.tar.gz Source104: %{external_url}/libwps-0.4.6.tar.xz Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2 -Source106: %{external_url}/libzmf-0.0.1.tar.bz2 +Source106: %{external_url}/libzmf-0.0.2.tar.xz Source107: %{external_url}/libstaroffice-0.0.3.tar.xz Source108: %{external_url}/harfbuzz-1.4.8.tar.bz2 Source109: %{external_url}/graphite2-minimal-1.3.10.tgz @@ -107,7 +107,9 @@ Source110: %{external_url}/gpgme-1.8.0.tar.bz2 Source111: %{external_url}/libgpg-error-1.26.tar.bz2 Source112: %{external_url}/libassuan-2.4.3.tar.bz2 Source113: %{external_url}/cppunit-1.14.0.tar.gz -%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit +Source114: %{external_url}/libqxp-0.0.0.tar.xz +Source115: %{external_url}/libepubgen-0.0.1.tar.xz +%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit --without-system-libqxp --without-system-libepubgen %endif # build tools @@ -122,6 +124,7 @@ BuildRequires: findutils BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gdb +BuildRequires: gettext BuildRequires: git BuildRequires: gnupg2 BuildRequires: gperf @@ -141,7 +144,6 @@ BuildRequires: cups-devel BuildRequires: fontpackages-devel BuildRequires: glm-devel BuildRequires: hyphen-devel -BuildRequires: libicu-devel BuildRequires: libjpeg-turbo-devel BuildRequires: lpsolve-devel BuildRequires: openldap-devel @@ -162,6 +164,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) @@ -206,9 +209,11 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libcmis-0.5) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) +BuildRequires: pkgconfig(libepubgen-0.0) BuildRequires: pkgconfig(libgltf-0.1) BuildRequires: pkgconfig(liborcus-0.12) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libzmf-0.0) @@ -244,11 +249,13 @@ Patch0: 0001-don-t-suppress-crashes.patch Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch # not upstreamed Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -Patch3: 0001-rename-IsAutoCapitalizeWordDelim-to-NonFieldWordDeli.patch -Patch4: 0002-consider-field-marks-as-text-for-auto-quotes.patch -Patch5: 0001-gtk3-only-for-3.20.patch -Patch6: 0001-Improve-resizing-chevrons-so-the-control-point-is-a-.patch -Patch7: 0001-Resolves-tdf-42873-videos-in-presenter-console-mispl.patch +# not upstreamed +Patch3: 0001-gtk3-only-for-3.20.patch +Patch4: 0001-allow-to-override-ENABLE_STRIP-in-the-installer.patch +Patch5: 0001-fix-build-error.patch +Patch6: 0001-blind-attempt-to-fix-build-on-big-endian.patch +Patch7: 0001-remove-GetSwapFloat-nonsense-from-all-3-EMF-readers.patch +Patch8: 0001-Make-testUtf8StringLiterals-work-when-char-is-unsign.patch %if 0%{?rhel} # not upstreamed @@ -678,16 +685,15 @@ This package provides gdb pretty printers for package %{name}. %endif -%define _langpack_common(E) \ -%{baseinstdir}/program/resource/*%{1}.res \ +%define _langpack_common(Eg:j:l:) \ %{!-E: \ -%{baseinstdir}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \ -%{baseinstdir}/share/config/soffice.cfg/*/ui/res/%{1}.zip \ -%{baseinstdir}/share/registry/res/registry_%{1}.xcd \ +%{baseinstdir}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES/*.mo \ +%{baseinstdir}/share/registry/res/registry_%{-l*}.xcd \ } \ -%{baseinstdir}/share/template/%{1} \ -%{baseinstdir}/share/registry/Langpack-%{1}.xcd \ -%{baseinstdir}/share/registry/res/fcfg_langpack_%{1}.xcd \ +%{baseinstdir}/share/template/%{-l*} \ +%{baseinstdir}/share/registry/Langpack-%{-l*}.xcd \ +%{baseinstdir}/share/registry/res/fcfg_langpack_%{-l*}.xcd \ +%{baseinstdir}/share/wizards/resources_%{-j:%{-j*}}%{!-j:%{-l*}}.properties \ %{nil} # Defines a language pack subpackage. @@ -710,8 +716,11 @@ This package provides gdb pretty printers for package %{name}. # c: additional config file (just the name stem) # E: base (US English) langpack # Ff: font language dependency +# g: glibc/java locale # Hh: hunspell dependency # i: additional language added to this package +# j: java locale for the additional language +# k: glibc locale for the additional language # L: internal (LibreOffice) language code, used in file names # l: language code, e.g., cs # Mm: mythes dependency @@ -729,8 +738,8 @@ This package provides gdb pretty printers for package %{name}. # libreoffice-langpack-cs: langpack for Czech lang. requiring hyphen-cs, # autocorr-cs, mythes-cs-CZ and suitable font: # %%langpack -l cs -n Czech -H -A -m cs-CZ -# b de g jk q tu z BCD G IJK N PQR U Z0123456789 -%define langpack(Aa:c:EFf:Hh:i:L:l:Mm:n:p:r:S:s:TXx:Yy:) \ +# b de q tu z BCD G IJK N PQR U Z0123456789 +%define langpack(Aa:c:EFf:g:Hh:i:j:k:L:l:Mm:n:p:r:S:s:TXx:Yy:) \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ %define pkgname langpack-%{lang} \ @@ -772,11 +781,11 @@ Provides %{langname} help for LibreOffice. \ } \ \ %files %{pkgname} \ -%{expand:%%_langpack_common %{-E} %{_langpack_lang}} \ +%{expand:%%_langpack_common %{-E} -l %{_langpack_lang} %{-g:-g %{-g*} -j %{-g*}}} \ %{-x:%{baseinstdir}/share/autotext/%{-x*}}%{!-x:%{-X:%{baseinstdir}/share/autotext/%{_langpack_lang}}} \ %{-c:%{baseinstdir}/share/registry/%{-c*}.xcd} \ %{-s:%{baseinstdir}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \ -%{-i:%{expand:%%_langpack_common %{-E} %{-i*}}} \ +%{-i:%{expand:%%_langpack_common %{-E} -l %{-i*} %{-k:-g %{-k*}} %{-j:-j %{-j*}}}} \ %{nil} # Defines an auto-correction subpackage. @@ -808,7 +817,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %{-i:%{_datadir}/autocorr/acor_%{-i*}-*.dat} \ %{nil} -%langpack -l en -n English -F -h en-US -Y -M -A -E -L en-US -T -X +%langpack -l en -n English -F -h en-US -Y -M -A -E -L en-US -T -X -g en_US %if %{with langpacks} @@ -857,10 +866,10 @@ Rules for auto-correcting common %{langname} typing errors. \ %define langpack_lang Northern Sotho %langpack -l nso -n %{langpack_lang} -F -H %langpack -l or -n Odia -F -H -Y -s ctl -%langpack -l pa -n Punjabi -F -H -Y -s ctl -L pa-IN +%langpack -l pa -n Punjabi -F -H -Y -s ctl -L pa-IN -g pa_IN %langpack -l pl -n Polish -F -H -Y -M -A -T -X %define langpack_lang Brazilian Portuguese -%langpack -l pt-BR -n %{langpack_lang} -f pt -h pt -y pt -m pt -a pt -p pt_BR -T -X +%langpack -l pt-BR -n %{langpack_lang} -f pt -h pt -y pt -m pt -a pt -p pt_BR -T -X -g pt_BR %langpack -l pt-PT -n Portuguese -f pt -h pt -y pt -m pt -a pt -p pt_PT -T -L pt -x pt %langpack -l ro -n Romanian -A -F -H -Y -M -T -X %langpack -l ru -n Russian -F -H -Y -M -A -T -X @@ -870,7 +879,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %{baseinstdir}/share/wordbook/sl.dic #rhbz#452379 clump serbian translations together -%langpack -l sr -n Serbian -F -H -Y -A -i sr-Latn +%langpack -l sr -n Serbian -F -H -Y -A -i sr-Latn -k sr@latin -j sr_Latn %langpack -l ss -n Swati -F -H %define langpack_lang Southern Sotho %langpack -l st -n %{langpack_lang} -F -H @@ -885,9 +894,9 @@ Rules for auto-correcting common %{langname} typing errors. \ %langpack -l ve -n Venda -F -H %langpack -l xh -n Xhosa -F -H %define langpack_lang Simplified Chinese -%langpack -l zh-Hans -n %{langpack_lang} -f zh-cn -a zh -p zh_CN -s cjk -T -L zh-CN -x zh-CN +%langpack -l zh-Hans -n %{langpack_lang} -f zh-cn -a zh -p zh_CN -s cjk -T -L zh-CN -x zh-CN -g zh_CN %define langpack_lang Traditional Chinese -%langpack -l zh-Hant -n %{langpack_lang} -f zh-tw -a zh -p zh_TW -s cjk -T -L zh-TW -x zh-TW +%langpack -l zh-Hant -n %{langpack_lang} -f zh-tw -a zh -p zh_TW -s cjk -T -L zh-TW -x zh-TW -g zh_TW %langpack -l zu -n Zulu -F -H -Y %undefine langpack_lang @@ -988,6 +997,7 @@ sed -i -e /CppunitTest_sw_uiwriter/d sw/Module_sw.mk sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # i686 sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # i686 sed -i -e /CppunitTest_services/d postprocess/Module_postprocess.mk # i686 +sed -i -e /CppunitTest_sd_export_ooxml2/d sd/Module_sd.mk # i686 git commit -q -a -m 'temporarily disable failing tests' # Seeing .git dir makes some of the build tools change their behavior. @@ -1124,7 +1134,7 @@ export PRODUCTVERSIONSHORT PRODUCTVERSION # installation install -m 0755 -d %{buildroot}%{instdir} -if ! make instsetoo_native PKGFORMAT=installed EPM=not-used-but-must-be-set; then +if ! make instsetoo_native PKGFORMAT=installed DISABLE_STRIP=1 EPM=not-used-but-must-be-set; then echo - ---dump log start--- cat $WORKDIR/installation/LibreOffice/installed/logging/en-US/log_*_en-US.log echo - ---dump log end--- @@ -1504,6 +1514,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libeditenglo.so %{baseinstdir}/program/libembobj.so %{baseinstdir}/program/libemboleobj.so +%{baseinstdir}/program/libemfiolo.so %{baseinstdir}/program/libevoab*.so %{baseinstdir}/program/libevtattlo.so %{baseinstdir}/program/libgielo.so @@ -1542,7 +1553,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libpdffilterlo.so %{baseinstdir}/program/libprotocolhandlerlo.so %{baseinstdir}/program/librecentfile.so -%{baseinstdir}/program/libreslo.so %{baseinstdir}/program/libsaxlo.so %{baseinstdir}/program/libscnlo.so %{baseinstdir}/program/libscriptframe.so @@ -1659,7 +1669,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/types/offapi.rdb %{baseinstdir}/program/libpasswordcontainerlo.so %{baseinstdir}/program/pagein-common +%if %{with langpacks} %dir %{baseinstdir}/program/resource +%endif %{baseinstdir}/program/senddoc %dir %{baseinstdir}/program/services %{baseinstdir}/program/services/services.rdb @@ -1699,11 +1711,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %dir %{baseinstdir}/share/config/soffice.cfg %{baseinstdir}/share/config/soffice.cfg/modules %{baseinstdir}/share/config/soffice.cfg/*/ui -# UI translations go into langpacks -%if %{with langpacks} -%exclude %{baseinstdir}/share/config/soffice.cfg/modules/*/ui/res/* -%exclude %{baseinstdir}/share/config/soffice.cfg/*/ui/res/* -%endif %dir %{baseinstdir}/share/emojiconfig %{baseinstdir}/share/emojiconfig/emoji.json %{baseinstdir}/share/palette @@ -1966,6 +1973,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/program/libt602filterlo.so %{baseinstdir}/program/libwpftwriterlo.so %{baseinstdir}/program/libwriterfilterlo.so +%{baseinstdir}/program/libwriterlo.so %{baseinstdir}/program/libvbaswobjlo.so %{baseinstdir}/share/registry/writer.xcd %{baseinstdir}/program/pagein-writer diff --git a/sources b/sources index 948355e..2dc0b99 100644 --- a/sources +++ b/sources @@ -6,10 +6,10 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 -SHA512 (xmlsec1-1.2.24.tar.gz) = a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 -SHA512 (libreoffice-5.4.3.1.tar.xz) = cd5e223ba81814ae1b3202d764d5d99559233db9d3f7df40564edff25ff7e054002afa218ebe3114752f39a7cb50a601864945c038c2d8a4b2a2170935c58200 -SHA512 (libreoffice-5.4.3.1.tar.xz.asc) = 2dd5043949314216fe4e9e8dfeb78f67dd4480a858d7d3c46abf2f910a0d72c1c01964bde50a285da4d792d3a132501a6eb63fd89b6257536861c0e2febbcdf2 -SHA512 (libreoffice-help-5.4.3.1.tar.xz) = 2c46fdf58177bde43d233520c62dfa7028ea5076d0fa4ee9f8a920e840893748f0bcc5e21dae9b967b1b739f13a96dbd6305e0d5e3ed316e28e98f75581578bd -SHA512 (libreoffice-help-5.4.3.1.tar.xz.asc) = 248662b1ab3e537551b15de51f4867d42ea935d9e8d07e3a21d90ca8ca9c31a5658b6c5abdfc1eda8b8a25733aaabd55f215525b65383bf9bb5ee3ccf8d2d423 -SHA512 (libreoffice-translations-5.4.3.1.tar.xz) = 81cb886929af651315f5ecf7b58e795258f6202f336340929504066d22a27b30489dbe81225666f6fc7f2250e9ac0cd7e1230ba68c54d011d7f56b3384914732 -SHA512 (libreoffice-translations-5.4.3.1.tar.xz.asc) = 15e25e5d3b5fca72953389d2f9928de1d688da9d7d700fcb1699b749bd451f721c1ad0b3eb376515fc6787d834c225ae9ed981fa2071350f735615bbe502e8f9 +SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6 +SHA512 (libreoffice-6.0.0.0.alpha1.tar.xz) = 77e1e6b50b9e23831a9c08959e63ee4612003afe908d927f33f64f87907012acc4e7ee17651ad49f84c25f74b8f0b9270a69c522be577685590389c630d422cb +SHA512 (libreoffice-6.0.0.0.alpha1.tar.xz.asc) = e14f4ff5567cf931c05c4782792cc3cf8520bddf762696ab47c28a3e04d79de18b8fe724fda620ec1cb9c7ddf13c0ef9d3335ee5e61a302ddeaa90be6907b43f +SHA512 (libreoffice-help-6.0.0.0.alpha1.tar.xz) = 8f1c876e2cd54172f515daebb99325e6ee227c55b518a63ba9a04d0e8f306e2f2055e00a984b3c6c64948eab80766bee8e74c8c41f282bae8c09cb922323a935 +SHA512 (libreoffice-help-6.0.0.0.alpha1.tar.xz.asc) = ec252706ad3d5c4533fb102cb9a928c1e5ba55e0fd5ee94ecbab9da5b9d31b735b4025893ed66f0fa43404b9583236cfc957aabb5a4bb58fca2ed5225ecf4c18 +SHA512 (libreoffice-translations-6.0.0.0.alpha1.tar.xz) = 380f966cd67654be6d604683df0a5f6dcb9f41f9e1d309cf5dbffae7e1621d1974fbaa66e630616a0038f249ca187db273aa5e730edb31623ae369018e7bf382 +SHA512 (libreoffice-translations-6.0.0.0.alpha1.tar.xz.asc) = 032ead42ecd3dc66790d34359e7ac3d7a7185c76ee21be5851d939828072f619565693f5ba68daa79ac24715a8b099429773e00fd3901c818a032c4c69cba576