From 869c2fb7b77e4e9a59e765765edf0669b1ec45c56a8c0e04ddba7baedee50704 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Aug 2023 19:35:18 +0000 Subject: [PATCH 01/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1088 --- 0002-Revert-Require-HarfBuzz-5.1.0.patch | 79 ++++++++++-------------- 1 file changed, 31 insertions(+), 48 deletions(-) diff --git a/0002-Revert-Require-HarfBuzz-5.1.0.patch b/0002-Revert-Require-HarfBuzz-5.1.0.patch index f04eefb..d68289c 100644 --- a/0002-Revert-Require-HarfBuzz-5.1.0.patch +++ b/0002-Revert-Require-HarfBuzz-5.1.0.patch @@ -1,21 +1,6 @@ -From 187d3e94f0bd28b63c934bac84ba7c5fb7beb049 Mon Sep 17 00:00:00 2001 -From: Danilo Spinella -Date: Tue, 14 Mar 2023 16:31:09 +0100 -Subject: [PATCH 2/2] Revert "Require HarfBuzz 5.1.0" - -This reverts commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee. ---- - configure.ac | 1 - - vcl/inc/font/LogicalFontInstance.hxx | 2 ++ - vcl/source/font/LogicalFontInstance.cxx | 13 ++++++++++++- - vcl/source/gdi/CommonSalLayout.cxx | 9 +++++++-- - 4 files changed, 21 insertions(+), 4 deletions(-) - -Index: libreoffice-7.5.3.2/configure.ac -=================================================================== ---- libreoffice-7.5.3.2.orig/configure.ac -+++ libreoffice-7.5.3.2/configure.ac -@@ -10848,7 +10848,7 @@ AC_SUBST(SYSTEM_LIBORCUS) +--- libreoffice-7.6.0.1/configure.ac 2023-08-07 21:28:19.740514309 +0200 ++++ libreoffice-7.6.0.1/configure.ac 2023-08-07 21:28:32.847268581 +0200 +@@ -10868,7 +10868,7 @@ dnl =================================================================== dnl HarfBuzz dnl =================================================================== @@ -23,12 +8,10 @@ Index: libreoffice-7.5.3.2/configure.ac +harfbuzz_required_version=0.93 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC" - GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite" -Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/inc/font/LogicalFontInstance.hxx -+++ libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx -@@ -156,8 +156,10 @@ private: + HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src" +--- libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx 2023-08-07 21:28:16.093823265 +0200 ++++ libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx 2023-08-07 21:28:32.847268581 +0200 +@@ -156,8 +156,10 @@ // The value is initialized and used in NeedOffsetCorrection(). std::optional m_xeFontFamilyEnum; @@ -39,11 +22,9 @@ Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx }; inline hb_font_t* LogicalFontInstance::GetHbFont() -Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/source/font/LogicalFontInstance.cxx -+++ libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx -@@ -54,8 +54,10 @@ LogicalFontInstance::~LogicalFontInstanc +--- libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx 2023-08-07 21:28:15.910488707 +0200 ++++ libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx 2023-08-07 21:31:44.758551351 +0200 +@@ -54,8 +54,10 @@ if (m_pHbFontUntransformed) hb_font_destroy(m_pHbFontUntransformed); @@ -54,7 +35,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx } hb_font_t* LogicalFontInstance::InitHbFont() -@@ -73,10 +75,12 @@ hb_font_t* LogicalFontInstance::InitHbFo +@@ -73,10 +75,12 @@ if (!aVariations.empty()) hb_font_set_variations(pHbFont, aVariations.data(), aVariations.size()); @@ -67,7 +48,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx ImplInitHbFont(pHbFont); -@@ -87,6 +91,7 @@ hb_font_t* LogicalFontInstance::GetHbFon +@@ -87,6 +91,7 @@ { auto* pHbFont = const_cast(this)->GetHbFont(); @@ -75,7 +56,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx if (NeedsArtificialItalic()) // || NeedsArtificialBold() { if (!m_pHbFontUntransformed) -@@ -98,7 +103,7 @@ hb_font_t* LogicalFontInstance::GetHbFon +@@ -98,7 +103,7 @@ } return m_pHbFontUntransformed; } @@ -84,7 +65,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx return pHbFont; } -@@ -254,6 +259,7 @@ bool LogicalFontInstance::NeedsArtificia +@@ -254,6 +259,7 @@ return m_aFontSelData.GetItalic() != ITALIC_NONE && m_pFontFace->GetItalic() == ITALIC_NONE; } @@ -92,34 +73,36 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx namespace { void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, float to_x, float to_y, -@@ -288,10 +294,12 @@ void close_path_func(hb_draw_funcs_t*, v +@@ -288,9 +294,12 @@ pPoly->clear(); } } +#endif - bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph, - basegfx::B2DPolyPolygon& rPolyPoly) const + basegfx::B2DPolyPolygon LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph) const { ++ basegfx::B2DPolyPolygon aPolyPoly; +#if HB_VERSION_ATLEAST(4, 0, 0) if (!m_pHbDrawFuncs) { m_pHbDrawFuncs = hb_draw_funcs_create(); -@@ -312,6 +320,9 @@ bool LogicalFontInstance::GetGlyphOutlin - hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &rPolyPoly); +@@ -305,12 +314,12 @@ + hb_draw_funcs_set_close_path_func(m_pHbDrawFuncs, close_path_func, pUserData, nullptr); + } + +- basegfx::B2DPolyPolygon aPolyPoly; + #if HB_VERSION_ATLEAST(7, 0, 0) + hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly); + #else + hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly); #endif - return true; -+#else -+ return false; +#endif + return aPolyPoly; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx -=================================================================== ---- libreoffice-7.5.3.2.orig/vcl/source/gdi/CommonSalLayout.cxx -+++ libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx -@@ -421,10 +421,10 @@ bool GenericSalLayout::LayoutText(vcl::t +--- libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx 2023-08-07 21:28:15.910488707 +0200 ++++ libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx 2023-08-07 21:28:32.850601937 +0200 +@@ -421,10 +421,10 @@ const int nRunLen = nEndRunPos - nMinRunPos; int nHbFlags = HB_BUFFER_FLAGS_DEFAULT; @@ -132,7 +115,7 @@ Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx if (nMinRunPos == 0) nHbFlags |= HB_BUFFER_FLAG_BOT; /* Beginning-of-text */ if (nEndRunPos == nLength) -@@ -545,8 +545,13 @@ bool GenericSalLayout::LayoutText(vcl::t +@@ -545,8 +545,13 @@ if (hb_glyph_info_get_glyph_flags(&pHbGlyphInfos[i]) & HB_GLYPH_FLAG_UNSAFE_TO_BREAK) nGlyphFlags |= GlyphItemFlags::IS_UNSAFE_TO_BREAK; From d7ce0b6ca9d6373a12df288f89383c8467ec5f52d016de6c816ee181b6a2967c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Aug 2023 20:31:50 +0000 Subject: [PATCH 02/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1089 --- libassuan-2.5.5.tar.bz2 | 3 --- libassuan-2.5.6.tar.bz2 | 3 +++ libreoffice.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 libassuan-2.5.5.tar.bz2 create mode 100644 libassuan-2.5.6.tar.bz2 diff --git a/libassuan-2.5.5.tar.bz2 b/libassuan-2.5.5.tar.bz2 deleted file mode 100644 index 17eaf44..0000000 --- a/libassuan-2.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 -size 572263 diff --git a/libassuan-2.5.6.tar.bz2 b/libassuan-2.5.6.tar.bz2 new file mode 100644 index 0000000..30baba7 --- /dev/null +++ b/libassuan-2.5.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 +size 577012 diff --git a/libreoffice.spec b/libreoffice.spec index 5e175af..623c04c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -75,7 +75,7 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t # GPGME bundle list Source1000: %{external_url}/gpgme-1.18.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.43.tar.bz2 -Source1002: %{external_url}/libassuan-2.5.5.tar.bz2 +Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 # Internal bundled stuff we can't remove # To build this we would pull cygwin; not worth it Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll From 1fb71fcf084eb1a440bfd118726adfcb1c30c84688e6c5c33e9753fa14df188e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Aug 2023 20:40:26 +0000 Subject: [PATCH 03/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1090 --- boost_1_80_0.tar.xz | 3 --- boost_1_82_0.tar.xz | 3 +++ libreoffice.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 boost_1_80_0.tar.xz create mode 100644 boost_1_82_0.tar.xz diff --git a/boost_1_80_0.tar.xz b/boost_1_80_0.tar.xz deleted file mode 100644 index fb1e1be..0000000 --- a/boost_1_80_0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666 -size 17696788 diff --git a/boost_1_82_0.tar.xz b/boost_1_82_0.tar.xz new file mode 100644 index 0000000..3b92869 --- /dev/null +++ b/boost_1_82_0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de +size 17903080 diff --git a/libreoffice.spec b/libreoffice.spec index 623c04c..4e4e3e5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -279,7 +279,7 @@ Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system -Source2020: %{external_url}/boost_1_80_0.tar.xz +Source2020: %{external_url}/boost_1_82_0.tar.xz Source2023: %{external_url}/poppler-22.12.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.11.tar.gz %else From bd4f7efad773d1db1e4fda97a7719ea5c7c1eed9d19de1eada6d87ea8f2c1ac1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Aug 2023 23:53:28 +0000 Subject: [PATCH 04/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1091 --- curl-8.0.1.tar.xz | 3 --- curl-8.1.2.tar.xz | 3 +++ icu4c-72_1-data.zip | 3 --- icu4c-72_1-src.tgz | 3 --- icu4c-73_2-data.zip | 3 +++ icu4c-73_2-src.tgz | 3 +++ libreoffice.spec | 12 ++++++------ poppler-22.12.0.tar.xz | 3 --- poppler-23.06.0.tar.xz | 3 +++ poppler-data-0.4.11.tar.gz | 3 --- poppler-data-0.4.12.tar.gz | 3 +++ 11 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 curl-8.0.1.tar.xz create mode 100644 curl-8.1.2.tar.xz delete mode 100644 icu4c-72_1-data.zip delete mode 100644 icu4c-72_1-src.tgz create mode 100644 icu4c-73_2-data.zip create mode 100644 icu4c-73_2-src.tgz delete mode 100644 poppler-22.12.0.tar.xz create mode 100644 poppler-23.06.0.tar.xz delete mode 100644 poppler-data-0.4.11.tar.gz create mode 100644 poppler-data-0.4.12.tar.gz diff --git a/curl-8.0.1.tar.xz b/curl-8.0.1.tar.xz deleted file mode 100644 index f9a29ad..0000000 --- a/curl-8.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 -size 2575544 diff --git a/curl-8.1.2.tar.xz b/curl-8.1.2.tar.xz new file mode 100644 index 0000000..31663b9 --- /dev/null +++ b/curl-8.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 +size 2612652 diff --git a/icu4c-72_1-data.zip b/icu4c-72_1-data.zip deleted file mode 100644 index fe53d76..0000000 --- a/icu4c-72_1-data.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea -size 19612531 diff --git a/icu4c-72_1-src.tgz b/icu4c-72_1-src.tgz deleted file mode 100644 index 730e41b..0000000 --- a/icu4c-72_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68 -size 26303933 diff --git a/icu4c-73_2-data.zip b/icu4c-73_2-data.zip new file mode 100644 index 0000000..a14de00 --- /dev/null +++ b/icu4c-73_2-data.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701 +size 19990179 diff --git a/icu4c-73_2-src.tgz b/icu4c-73_2-src.tgz new file mode 100644 index 0000000..ab8a085 --- /dev/null +++ b/icu4c-73_2-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 +size 26519906 diff --git a/libreoffice.spec b/libreoffice.spec index 4e4e3e5..cb67960 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -137,7 +137,7 @@ BuildRequires: zlib-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.0.1.tar.xz +Source2013: %{external_url}/curl-8.1.2.tar.xz %endif # Needed for tests BuildRequires: dejavu-fonts @@ -280,8 +280,8 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system Source2020: %{external_url}/boost_1_82_0.tar.xz -Source2023: %{external_url}/poppler-22.12.0.tar.xz -Source2024: %{external_url}/poppler-data-0.4.11.tar.gz +Source2023: %{external_url}/poppler-23.06.0.tar.xz +Source2024: %{external_url}/poppler-data-0.4.12.tar.gz %else BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel @@ -291,10 +291,10 @@ BuildRequires: libboost_system-devel BuildRequires: pkgconfig(poppler) >= 21.01.0 BuildRequires: pkgconfig(poppler-cpp) %endif -%if 0%{?suse_version} < 1500 +%if 1 # 0%{?suse_version} < 1500 # Too old icu on the system -Source2021: %{external_url}/icu4c-72_1-src.tgz -Source2022: %{external_url}/icu4c-72_1-data.zip +Source2021: %{external_url}/icu4c-73_2-src.tgz +Source2022: %{external_url}/icu4c-73_2-data.zip BuildRequires: java-devel >= 1.8 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel diff --git a/poppler-22.12.0.tar.xz b/poppler-22.12.0.tar.xz deleted file mode 100644 index 77e8aa6..0000000 --- a/poppler-22.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 -size 1845856 diff --git a/poppler-23.06.0.tar.xz b/poppler-23.06.0.tar.xz new file mode 100644 index 0000000..247243e --- /dev/null +++ b/poppler-23.06.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65 +size 1867384 diff --git a/poppler-data-0.4.11.tar.gz b/poppler-data-0.4.11.tar.gz deleted file mode 100644 index 2ee4a7e..0000000 --- a/poppler-data-0.4.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c -size 4497282 diff --git a/poppler-data-0.4.12.tar.gz b/poppler-data-0.4.12.tar.gz new file mode 100644 index 0000000..a289c5b --- /dev/null +++ b/poppler-data-0.4.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 +size 4504754 From 2781ddb0e1872e8bca7fc60c9e5d4d59526c1fa978f1e0e789d1ea8af677199a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:00:59 +0000 Subject: [PATCH 05/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1092 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index cb67960..ba4b4a5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -291,7 +291,7 @@ BuildRequires: libboost_system-devel BuildRequires: pkgconfig(poppler) >= 21.01.0 BuildRequires: pkgconfig(poppler-cpp) %endif -%if 1 # 0%{?suse_version} < 1500 +%if 0%{?suse_version} < 1500 # Too old icu on the system Source2021: %{external_url}/icu4c-73_2-src.tgz Source2022: %{external_url}/icu4c-73_2-data.zip From 05ea4a38be8eead1e4927e8fa042e9bd0c08957ce81e29803212ec449ce98a1c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:04:50 +0000 Subject: [PATCH 06/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1093 --- libreoffice.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index ba4b4a5..af383d2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -320,11 +320,11 @@ BuildRequires: pkgconfig(libopenjp2) %endif # Dragonbox requires gcc11 %if 0%{?suse_version} > 1550 -BuildRequires: gcc >= 11 -BuildRequires: gcc-c++ >= 11 +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 %else -BuildRequires: gcc11 -BuildRequires: gcc11-c++ +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -1099,8 +1099,8 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS %if 0%{?suse_version} < 1550 -export CC=gcc-11 -export CXX=g++-11 +export CC=gcc-7 +export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files From 0eefa9bf4a43067259e94d30c5fe0d62ccd4c3f5f9ba50bd42e9a135ea8c5ee5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:09:18 +0000 Subject: [PATCH 07/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1094 --- libreoffice.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index af383d2..ba4b4a5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -320,11 +320,11 @@ BuildRequires: pkgconfig(libopenjp2) %endif # Dragonbox requires gcc11 %if 0%{?suse_version} > 1550 -BuildRequires: gcc >= 7 -BuildRequires: gcc-c++ >= 7 +BuildRequires: gcc >= 11 +BuildRequires: gcc-c++ >= 11 %else -BuildRequires: gcc7 -BuildRequires: gcc7-c++ +BuildRequires: gcc11 +BuildRequires: gcc11-c++ %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -1099,8 +1099,8 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS %if 0%{?suse_version} < 1550 -export CC=gcc-7 -export CXX=g++-7 +export CC=gcc-11 +export CXX=g++-11 %endif # Fake the epoch stuff in generated zip files From 5729f44470c7cf02f1c1fffe25abbe32ce5f6a644f593d1e677ae907ddd03f19 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:19:46 +0000 Subject: [PATCH 08/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1095 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index ba4b4a5..50f207e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -319,7 +319,7 @@ BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif # Dragonbox requires gcc11 -%if 0%{?suse_version} > 1550 +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 BuildRequires: gcc >= 11 BuildRequires: gcc-c++ >= 11 %else @@ -1098,7 +1098,7 @@ CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -%if 0%{?suse_version} < 1550 +%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 export CC=gcc-11 export CXX=g++-11 %endif From d5e3e3dd3ffe078e94b75c1645202ca82121834faa4fe5357f0678e3c3a343fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:21:01 +0000 Subject: [PATCH 09/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1096 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 50f207e..302adeb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -320,8 +320,8 @@ BuildRequires: pkgconfig(libopenjp2) %endif # Dragonbox requires gcc11 %if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 -BuildRequires: gcc >= 11 -BuildRequires: gcc-c++ >= 11 +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 %else BuildRequires: gcc11 BuildRequires: gcc11-c++ From 8fa0d4716db5f854fd4981f5454bdbec9f9a223bd0110a1e7f83eee5e8c07180 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:30:59 +0000 Subject: [PATCH 10/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1097 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 302adeb..f089090 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1095,7 +1095,7 @@ ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ - ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" %endif CFLAGS="$ARCH_FLAGS" -CXXFLAGS="$ARCH_FLAGS" +CXXFLAGS="-std=c++17 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS %if !0%{?is_opensuse} && 0%{?sle_version} < 150000 From 6a07642c576b1c6d9fb86529a6957d410fe496b21a91e53e6c7df1e6d9b0834c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:35:41 +0000 Subject: [PATCH 11/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1098 --- libreoffice.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f089090..bb9ff71 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -318,13 +318,13 @@ BuildConflicts: java-devel < 9 BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif -# Dragonbox requires gcc11 +# Dragonbox requires C++17 %if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 %else -BuildRequires: gcc11 -BuildRequires: gcc11-c++ +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -1099,8 +1099,8 @@ CXXFLAGS="-std=c++17 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS %if !0%{?is_opensuse} && 0%{?sle_version} < 150000 -export CC=gcc-11 -export CXX=g++-11 +export CC=gcc-7 +export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files From 0361321df84e5cae76d0c8f15754d5c5789cd90c1d5f9a66fea4f36f5d0a9899 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:41:49 +0000 Subject: [PATCH 12/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1099 --- libreoffice.spec | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index bb9ff71..94d9689 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -457,12 +457,7 @@ Obsoletes: %{name}-base-drivers-mysql %if %{with firebird} Requires: %{name}-base-drivers-firebird %else -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %endif %description base @@ -675,12 +670,7 @@ Software Development Kit (SDK). Summary: OfficeBean Java Bean component for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description officebean With the OfficeBean, a developer can easily write Java applications, @@ -706,12 +696,7 @@ Requires: libreoffice-calc = %{version} Requires: libreoffice-pyuno = %{version} Requires(pre): libreoffice = %{version} # the watchWindow extension is written in java -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description calc-extensions This package provides extensions for LibreOffice Calc: @@ -726,12 +711,7 @@ Group: Productivity/Office/Suite Requires: libreoffice-writer = %{version} Requires(pre): libreoffice = %{version} # the wiki extension is written in java -%ifarch %{ix86} -Requires: jre-32 >= 1.8 -%endif -%ifarch x86_64 aarch64 ppc64le riscv64 -Requires: jre-64 >= 1.8 -%endif +Requires: jre >= 1.8 %description writer-extensions This package provides extensions for LibreOffice Writer: From 8ace7e09be2baa51c69a73ffab86580b74cd552c9a38b1f6bc3cbe6424ec2449 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 07:55:56 +0000 Subject: [PATCH 13/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1100 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 94d9689..81b03b1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -202,8 +202,8 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 -BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 -BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 +BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 +BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) From a37c555c5025a722eb010f2c32d2c1e33bc181d2295f76c6911e20d19bfcccdd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 08:04:01 +0000 Subject: [PATCH 14/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1101 --- harfbuzz-7.3.0.tar.xz | 3 +++ libreoffice.spec | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 harfbuzz-7.3.0.tar.xz diff --git a/harfbuzz-7.3.0.tar.xz b/harfbuzz-7.3.0.tar.xz new file mode 100644 index 0000000..93ecb47 --- /dev/null +++ b/harfbuzz-7.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb +size 18867940 diff --git a/libreoffice.spec b/libreoffice.spec index 81b03b1..277b984 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -38,6 +38,7 @@ %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %bcond_without system_gpgme %bcond_without system_curl +%bcond without system_harfbuzz %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages @@ -46,6 +47,7 @@ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme %bcond_with system_curl +%bcond_with system_harfbuzz %endif %bcond_with firebird Name: libreoffice @@ -202,8 +204,12 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +%if %{with system_harfbuzz} BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 +%else +Source2023: %{external_url}/harfbuzz-7.3.0.tar.xz +%endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) @@ -1182,6 +1188,11 @@ export NOCONFIGURE=yes --with-system-curl \ %else --without-system-curl \ +%endif +%if %{with system_harfbuzz} + --with-system-harfbuzz \ +%else + --without-system-harfbuzz \ %endif --enable-evolution2 \ --enable-dbus \ From 9701e978a447045082df4e9bcccc1f7ddcf585a914b60d7aadbd8c8d9be727b0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 08:06:52 +0000 Subject: [PATCH 15/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1102 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 277b984..1abf8b5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -38,7 +38,7 @@ %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %bcond_without system_gpgme %bcond_without system_curl -%bcond without system_harfbuzz +%bcond_without system_harfbuzz %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages From c53c8ca08bb786d1cae33cefdaae836878b8de3cd6be28c2b6a57d883b47bb81 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 08:10:13 +0000 Subject: [PATCH 16/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1103 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 1abf8b5..d27d16b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -208,7 +208,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else -Source2023: %{external_url}/harfbuzz-7.3.0.tar.xz +Source2025: %{external_url}/harfbuzz-7.3.0.tar.xz %endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) From 653b3f8e0644d5635916a57cc0d7e11aa2a63cd6f09fa752d39d8ff543990505 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 08:21:46 +0000 Subject: [PATCH 17/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1104 --- graphite2-minimal-1.3.14.tgz | 3 +++ libreoffice.spec | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 graphite2-minimal-1.3.14.tgz diff --git a/graphite2-minimal-1.3.14.tgz b/graphite2-minimal-1.3.14.tgz new file mode 100644 index 0000000..37526dc --- /dev/null +++ b/graphite2-minimal-1.3.14.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc +size 149974 diff --git a/libreoffice.spec b/libreoffice.spec index d27d16b..cd78b08 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -200,15 +200,16 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 %if %{with system_harfbuzz} +BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else Source2025: %{external_url}/harfbuzz-7.3.0.tar.xz +Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz %endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) @@ -1191,8 +1192,10 @@ export NOCONFIGURE=yes %endif %if %{with system_harfbuzz} --with-system-harfbuzz \ + --with-system-graphite \ %else --without-system-harfbuzz \ + --without-system-graphite \ %endif --enable-evolution2 \ --enable-dbus \ From 54218c0472c1fe99f24bf9a92ca0d9918bdf2a1f28a909dbeb3cb4967c94d496 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 11:14:56 +0000 Subject: [PATCH 18/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1105 --- libreoffice.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index cd78b08..acabb33 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1211,7 +1211,11 @@ export NOCONFIGURE=yes --enable-symbols \ --with-gdrive-client-secret="${google_default_client_secret}" \ --with-gdrive-client-id="${google_default_client_id}" \ +%ifnarch s390x ppc64 ppc --enable-skia \ +%else + --disable-skia \ +%endif --with-libbase-jar=/usr/share/java/libbase.jar \ --with-libxml-jar=/usr/share/java/libxml.jar \ --with-flute-jar=/usr/share/java/flute.jar \ From 4a108b9853d88b2a59307a44d5873773238d22cb60c8319d742f3a1aa2f1c962 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 14:02:40 +0000 Subject: [PATCH 19/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1107 --- libreoffice.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index acabb33..46a77cc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,6 +16,7 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} # extensions %define numbertext_version 0.9.5 # Urls @@ -1215,6 +1216,11 @@ export NOCONFIGURE=yes --enable-skia \ %else --disable-skia \ +%endif +%ifarch %{aarch64} +%if 0%{?suse_version} < 1550 + --disable-pdfium \ +%endif %endif --with-libbase-jar=/usr/share/java/libbase.jar \ --with-libxml-jar=/usr/share/java/libxml.jar \ From ac50a5796717325b3c423c9611ddb2e24f5a4e15f3a75723f83c3fa7515bfa55 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 19:35:37 +0000 Subject: [PATCH 20/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1108 --- fix_harfbuzz_on_sle12_sp5.patch | 26 ------------ harfbuzz-7.3.0.tar.xz | 3 -- harfbuzz-8.0.0.tar.xz | 3 ++ libreoffice-7.6.0.1.tar.xz | 3 -- libreoffice-7.6.0.1.tar.xz.asc | 16 ------- libreoffice-7.6.0.2.tar.xz | 3 ++ libreoffice-7.6.0.2.tar.xz.asc | 16 +++++++ libreoffice-help-7.6.0.1.tar.xz | 3 -- libreoffice-help-7.6.0.1.tar.xz.asc | 16 ------- libreoffice-help-7.6.0.2.tar.xz | 3 ++ libreoffice-help-7.6.0.2.tar.xz.asc | 16 +++++++ libreoffice-translations-7.6.0.1.tar.xz | 3 -- libreoffice-translations-7.6.0.1.tar.xz.asc | 16 ------- libreoffice-translations-7.6.0.2.tar.xz | 3 ++ libreoffice-translations-7.6.0.2.tar.xz.asc | 16 +++++++ libreoffice.spec | 11 +++-- python34-no-f-strings.patch | 47 +++++++++++++++++++++ 17 files changed, 114 insertions(+), 90 deletions(-) delete mode 100644 fix_harfbuzz_on_sle12_sp5.patch delete mode 100644 harfbuzz-7.3.0.tar.xz create mode 100644 harfbuzz-8.0.0.tar.xz delete mode 100644 libreoffice-7.6.0.1.tar.xz delete mode 100644 libreoffice-7.6.0.1.tar.xz.asc create mode 100644 libreoffice-7.6.0.2.tar.xz create mode 100644 libreoffice-7.6.0.2.tar.xz.asc delete mode 100644 libreoffice-help-7.6.0.1.tar.xz delete mode 100644 libreoffice-help-7.6.0.1.tar.xz.asc create mode 100644 libreoffice-help-7.6.0.2.tar.xz create mode 100644 libreoffice-help-7.6.0.2.tar.xz.asc delete mode 100644 libreoffice-translations-7.6.0.1.tar.xz delete mode 100644 libreoffice-translations-7.6.0.1.tar.xz.asc create mode 100644 libreoffice-translations-7.6.0.2.tar.xz create mode 100644 libreoffice-translations-7.6.0.2.tar.xz.asc create mode 100644 python34-no-f-strings.patch diff --git a/fix_harfbuzz_on_sle12_sp5.patch b/fix_harfbuzz_on_sle12_sp5.patch deleted file mode 100644 index 408f1d3..0000000 --- a/fix_harfbuzz_on_sle12_sp5.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx -=================================================================== ---- libreoffice-7.5.1.2.orig/vcl/source/font/fontmetric.cxx -+++ libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx -@@ -549,20 +549,7 @@ void ImplFontMetricData::ImplInitBaselin - double fScale = 0; - pFontInstance->GetScale(nullptr, &fScale); - hb_position_t nBaseline = 0; -- -- if (hb_ot_layout_get_baseline(pHbFont, -- HB_OT_LAYOUT_BASELINE_TAG_HANGING, -- HB_DIRECTION_INVALID, -- HB_SCRIPT_UNKNOWN, -- HB_TAG_NONE, -- &nBaseline)) -- { -- mnHangingBaseline = nBaseline * fScale; -- } -- else -- { -- mnHangingBaseline = 0; -- } -+ mnHangingBaseline = 0; - } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/harfbuzz-7.3.0.tar.xz b/harfbuzz-7.3.0.tar.xz deleted file mode 100644 index 93ecb47..0000000 --- a/harfbuzz-7.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb -size 18867940 diff --git a/harfbuzz-8.0.0.tar.xz b/harfbuzz-8.0.0.tar.xz new file mode 100644 index 0000000..952d92e --- /dev/null +++ b/harfbuzz-8.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79 +size 18793316 diff --git a/libreoffice-7.6.0.1.tar.xz b/libreoffice-7.6.0.1.tar.xz deleted file mode 100644 index 4c93b67..0000000 --- a/libreoffice-7.6.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c2d7b942c062c22198586e5c41f8ab4b7ef8214dc8c4a67eaec979a35983630 -size 279453164 diff --git a/libreoffice-7.6.0.1.tar.xz.asc b/libreoffice-7.6.0.1.tar.xz.asc deleted file mode 100644 index 65c5b7b..0000000 --- a/libreoffice-7.6.0.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ+4ACgkQ9DSh76/u -rqNDUw/6AlRcokNFLM1DYSgubB1INEHA68V4Apx673zwX5YKdCUBnEYVSLVNIAyM -XFl/N5OyyMXak6052rdjUAlAwwOlzoCv/N9trFPOO/XHerdv4AVf4EFPwsCQKfaM -tSNMHcXiC0Q9N56uVlcKe9zG0ZEghMnW3HxHdf0GZ8R4QTPmHOt3Dgre7ItAtk5d -r6xqIQnUlqJ1tVXh3mbyfa92Xs4E+1pj5wufYZEmFPrpRSeclCcHQfaAXKozcU7r -eBun4iC6ZJ5bCN5OvGOh+KsyKO7fwdRsqFIwAakYGa++fStihiI0SnC8wtUxjgZ0 -w0GK+o8xSoUjNlvfB5BhjQ5sRRNdW5/axESxXTpUg7QfUzvcE35JZVPinWtQbAxP -lsSrgFFqabk6RVYoRmTgET+er3IoOSxXqfZx6qc76aySjyCWnbFyifrRvZ831Qx3 -EvD0LefzGtm79vSdPk1A41eczfrMrlTaaIwX78kmX+Fa/OJtOtPqBvOHjuyfC7a3 -Y+uMKUupfTF6uxfdmabwdRb+RjMFZJX77zw0aIcD7Lx48gVQ4Gtd3xRhVCGzO92X -OXwyiaxJ0mpQu6XC9LsK3B9ZvgSiWw6NV+oNSdKV9RiOnTzS6fVj/iUZr5YOIdUq -nYKFgSZx4hcyV36d7YkGlgK2y3GuFm3Mt1FD7fLKO99nkbdMdng= -=qUMt ------END PGP SIGNATURE----- diff --git a/libreoffice-7.6.0.2.tar.xz b/libreoffice-7.6.0.2.tar.xz new file mode 100644 index 0000000..8b37524 --- /dev/null +++ b/libreoffice-7.6.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b782a7c1189efdb3205e58423fde9241cf37ebfbb3da4c7300f2de6bb45147cd +size 279991368 diff --git a/libreoffice-7.6.0.2.tar.xz.asc b/libreoffice-7.6.0.2.tar.xz.asc new file mode 100644 index 0000000..6e3b7c5 --- /dev/null +++ b/libreoffice-7.6.0.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBtUACgkQ9DSh76/u +rqOnkg//UUUkyhZwjsH64RoRYZN9FmOErlWfTKHclcgGmj1TB3+x9qGBBx0yG5xV +/p/RudPE4GVZ7r52HWdbsg8ptL44H1aXzkFEtLztX2Sq3YB7LCn9rDR3lEv5jxUW +TYtBzpR8aIh1jXWTphJpUCA/8R3TIa+ifpV2AD69OZysLUlmKmRIYWq1y2IP2dY8 +hO0Nwgfs/Rz7KsCqHXlpQJJayNdmWn2OiPnQUrLIkXgsjaAIVQ8OWkaSqQBtvxhI +NZtHbf8fy7PTmATYWeaTqfd0M1PjxOudB6HS/Om0PrScHoLBnVpgiraR5SMiUwGp +atT6151ceVLFe80JMg+j8xWTZmad1m8INOxzbqK1byZJMtNWdBj91oEeZRk7Iv0m +nfX2qyqtiQ3rXT/uR7SUivRMixIVnCLlq/wlYZmX0Jj5R/pgBa1dEByG5i5w4ZM3 +6UCH1n6005PLdPL5SFUUiMcYqexbDKha+1mK7be8e27hhDOIuQ9RdiqdiykmhvF4 +A9VxbQSdtoVUTNWu4pw+XrksuXZIQpTZITVTKTcJgIq+H+rgSnkW3MvKzevjFN4w +L483al9aRtGuXSZrgn1GIKRbbeb5Q5MVdMeJMa4JTzKItLY558+ItXlmfLEA4/+V +yjo3vUR+iL0eaEeqXDr2egPo3Wxe0qPGrTg+lOCLP2x/m0Pqn1o= +=cvu3 +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.6.0.1.tar.xz b/libreoffice-help-7.6.0.1.tar.xz deleted file mode 100644 index a7895b3..0000000 --- a/libreoffice-help-7.6.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7b85e9f0fa3a224060c01401be4eb580ecacfb2bf23a5ef16f183785a367e99 -size 166959152 diff --git a/libreoffice-help-7.6.0.1.tar.xz.asc b/libreoffice-help-7.6.0.1.tar.xz.asc deleted file mode 100644 index c588964..0000000 --- a/libreoffice-help-7.6.0.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u -rqOWHA//baxlyJ+ilzTG0JFpfnKAo4IHZ2ynyZLgQ9glbei1hOIu2q8DZ2WgFpow -L6hOAbV50bxkzEmJ6R+JQYu9uOkQdQaTm12ypjyZHYm2BcyNuT80yLpU4nQSRU8h -c5rQahVevVFL8Mx6Et/Yn7CF96x/vh7DjAr8qUzByMb7WDc9qVz8f6kDT6XTlFlB -nPKlXr/VbToh80Pb3ZEnxMGjLpsAOCztVAgZfLYpIKARRn2yNiGydmb4W4vTrdYp -wGEfB49wA5DbZYxMlJN8d3ZWsvde6QqqiRGbvYygCTfeb6hz0efzJkTFHTkzHzqp -VOBnXu1XsK28tMU/izZwJ/DqJRSfJoaPI+2gNsVqByyrMkRPihCxbniSWKkBqlvQ -0/b9qyG9KeDK7SEF0MV9mPl18L84wF0AyGc7uPGOqLXWCSeld/ZDI7RWo5pcO0CP -uhMuO4/TQ7fTV4mohlo+DXrSiq7LGk3snNbPDxTxQx2vRESn6WOod5IWmyT0tf/n -nO9vs/ftJIz9AQ4nRE5wIHPMARgRbaXN5M6Y5C2MWrIJCzQT4midgRxmTGHV178Y -tCcdwMMhgW1TU21MrnR9oUiXR3ExGDEMebTf72/K3al4d81dyECwda7fr4iYwb8a -hcyvR46JZk+Wx2n9LLn6QrgYgsK191fxLCiiPFVkzcRjJBPe7DM= -=aVms ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.6.0.2.tar.xz b/libreoffice-help-7.6.0.2.tar.xz new file mode 100644 index 0000000..f5c6c33 --- /dev/null +++ b/libreoffice-help-7.6.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7ce1b54bf03b54bf788d8bd81241e38060362e983883b202f0c453e7622f9ea +size 166959328 diff --git a/libreoffice-help-7.6.0.2.tar.xz.asc b/libreoffice-help-7.6.0.2.tar.xz.asc new file mode 100644 index 0000000..d4556b9 --- /dev/null +++ b/libreoffice-help-7.6.0.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt4ACgkQ9DSh76/u +rqM/Ew/+NjyznVZGI6qRZ9uLtLdWYlhifamrTgh6UZoS7D2iIS15reQpvmO20PHH +TkwALkbUC33V/dKWAy8+e8dYX94Lgh/Z35HRvSRfscKns92aADRk/lbbMHx7Jsc0 +LAC2GMG7wm5sEVIvWBACGpf9qhrg8i20C+66SEDZej2/UarbDyj6kWzwQ6vKW4QE +qbCT+pfEsYSin+RMHZhvlhuV56PCpUSsXSwXAVfdvQDFgd7cQ3xRoIO+MK2G24QT +LA600yq4F7VyK9GQPYyMVmXw7lyJH/L56Jm8jip18uUdvNSKjom2iYARw6sHyqk3 +Is5RXtmLlOzjPCBTircco6CHhchi9oybMNplBGlBk1fDmhrt3TM6DfmxnS0aO9HF +jEITwKWY06RclznbMvX9H9zwiNidGkFNVTrDLBzHPMMNbrtLvLWACzT5BOQI7Zz2 +Ep2nZZ0QLdKSVqa6GU4j7/UyBZbwNlsjodRo+Z6/rUxQB3CkoPEGSPFMO+MjmTJq +FnnE9cMOt3aeBMlzvJwKmcDprqexw4p2j5qH0x3tqfNjGTDjyz0cR+K8Cf6HglHJ +1JVOznzFVycv5jixhzG6WfwUropasyyUXXxtcUhCzgg/DKFt0mu1MxlBYaWdyBmg +NRsqxEi9zPinmoa5N9zcEEyuPhQt5mZOAGSC8ZXBbvDSae/BPSE= +=SUwA +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.6.0.1.tar.xz b/libreoffice-translations-7.6.0.1.tar.xz deleted file mode 100644 index b5c1937..0000000 --- a/libreoffice-translations-7.6.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8edd2fb3c8f4f80416f52b40fdfeca775469b1660706721a07d10e5711a245b -size 216354424 diff --git a/libreoffice-translations-7.6.0.1.tar.xz.asc b/libreoffice-translations-7.6.0.1.tar.xz.asc deleted file mode 100644 index 625e284..0000000 --- a/libreoffice-translations-7.6.0.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u -rqMV0xAAuvFagEKJYKEqG5CccoHuSJiWSWw+1nPVW7w15GEp+8F78yTbi9LL4tt4 -A4Gh4OZFR40Rfb5OK9SBV6+7ybvCPuHthOGd/C7ltJ3ZBK1BbYAIaaAwh9Fj3hct -LIgIuS/3wWtSqjoB3/+kLFDXVnX2OUKQePYAjtugIzLC92n2KMHcmd2WbJUrQkX/ -5h+I+vVRKBmfbuGxekmIhU22Rv5GdL9VatGh9QnzXy+WDwn5s9QutpUsKPsVBkwa -iSj5C9cM+fJulrBc5JjfDhXYhj6Z8LgtnJZ+tGJYDK3ezKzoAvoycgwCRUMzLPLK -pF6HsCzRDEjmhSbG0t5/PbXGo/70AFy/oNdXppnhFjB3/FkTl0XVNoG5q6nsxjoJ -nqogQjRmdkKTTXB3L4Tm5DROo6ftkoofhhoCweYwYTcq5kunCUj8rXv6Gi7igOSL -kmWu45UKRKQH0Pf7SWBY2pbkm7oeKUg+B6a/YI73j7bIBHmy5jqPLV09NQhf6P/d -GWb7GSTL6hxwC1NaZ4V/MHa8Nh580vgSkkPbp3lWy6yOAXmfERmwg0JSOMnqqjD5 -4WPrrj45AaUARyBoiemPlp45TBpOLYudwOgjbt1LiMvxk8ZidJ8kd13vhkrBJq0P -brvz4iIEtBjnLQ23Kaejm9As1BdAR8jg93hJMzPUVQg1knnomXU= -=x9Ly ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.6.0.2.tar.xz b/libreoffice-translations-7.6.0.2.tar.xz new file mode 100644 index 0000000..a4c3e28 --- /dev/null +++ b/libreoffice-translations-7.6.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42a3591d5db65c452247e2dac84ac8371cff0e32b2d3d6ee946743223a92c73a +size 216453452 diff --git a/libreoffice-translations-7.6.0.2.tar.xz.asc b/libreoffice-translations-7.6.0.2.tar.xz.asc new file mode 100644 index 0000000..fa51668 --- /dev/null +++ b/libreoffice-translations-7.6.0.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt8ACgkQ9DSh76/u +rqOFyQ//UptJxlC3wWNEK49oIAIc713BbnfvMluN3JSRif6X2x1MAy6jG6fyjpQw +fimvxZOQbW/iDKdyXrqJf1rqjPu2F0JTfehAlVpaZAWnjNuucfkhI5vdJ0wqyBxY +BT7ZaCgNh7OXRafUTzHVagZ3Kshy4GEAp6UQIk/9PxrEdq6hcAUk2+0kD/Nuwr9X +N831jizcInON45zmHad3kDJU+M/U4tpF9KsKp0KFqJ60O3s26ow+3b58LkZ8CTP4 +Ogt4hUWXZPspeIiGyD7oKwzaa3y2Q5ecpkyJfylnsgxm11MoNPf9tZXjmWwT1hhY +QdXIShGqw823r3uyCzd08LTGWzAOK449mc5EPBFG/mrVQ9l4vu0E1LfmapI345u7 +CspJFp8xTgs+6w14PD0aofAfNBhxOFRVIksB+wSPCeuCVEmIEIkzh/i3184kscJQ +U/gB/o5refJo4tz7PPA6E8G4YtIPj3u23c+6BT/1qtMQ636IHD0ssfCDPrkuNl65 +hNkom3uYKGSgZZVvRVrkXPWliPMWUWr6vv+cHOvmEUNGe7Z/i0g1fGoFvU2tcBxS +CTJfVdso4vCW3BQ2LDA7HEdhylOPf2Psp4W43YNZANvnhS9e0AThebfwMsP/HujN +srQ+qBrweuebJB+a37u/bNAsVC3vbYmJ906Mjy7YcZAcu/UHqas= +=0rMO +-----END PGP SIGNATURE----- diff --git a/libreoffice.spec b/libreoffice.spec index 46a77cc..bcf18c6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.6.0.1 +Version: 7.6.0.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -111,7 +111,6 @@ Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch Patch11: fix_webp_on_sle12_sp5.patch -Patch12: fix_harfbuzz_on_sle12_sp5.patch # PATCH-FIX-SUSE use fixmath shared library Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install @@ -126,6 +125,8 @@ Patch990: install-with-hardlinks.diff Patch991: libreoffice-no-destdircheck.patch # Fix build on i586 Patch992: atklistener-32bit-type-mismatch.patch +# Fix build on sle12 +Patch993: python34-no-f-strings.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -209,7 +210,7 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else -Source2025: %{external_url}/harfbuzz-7.3.0.tar.xz +Source2025: %{external_url}/harfbuzz-8.0.0.tar.xz Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz %endif BuildRequires: pkgconfig(hunspell) @@ -1023,7 +1024,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %if 0%{?suse_version} < 1500 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %patch101 -p1 %endif %patch14 -p1 @@ -1034,6 +1034,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch990 -p1 %patch991 -p1 %patch992 -p1 +%if 0%{?suse_version} < 1550 +%patch993 -p1 +%endif # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 diff --git a/python34-no-f-strings.patch b/python34-no-f-strings.patch new file mode 100644 index 0000000..e6cab58 --- /dev/null +++ b/python34-no-f-strings.patch @@ -0,0 +1,47 @@ +--- libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:29:16.088847384 +0200 ++++ libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:36:37.413324064 +0200 +@@ -62,7 +62,7 @@ + o = parser.parse_args() + + if o.template_dir is None: +- template_dir = f"{o.workdir}/{o.prefix}" ++ template_dir = '{}/{}'.format(o.workdir, o.prefix) + else: + template_dir = o.template_dir + +@@ -85,7 +85,7 @@ + entry = {} + # For every section in the specified ulf file there should exist + # a template file in $workdir .. +- entry["outfile"] = f"{template_dir}{template}.{o.ext}" ++ entry["outfile"] = "{}{}.{}".format(template_dir, template, o.ext) + entry["translations"] = {} + entry["key"] = key + templates[heading] = entry +@@ -130,12 +130,12 @@ + if o.ext == "str": + continue + sys.exit( +- f"Warning: No template found for item '{template}' : '{outfilename}'\n" ++ "Warning: No template found for item '{}' : '{}'\n".format(template, outfilename) + ) + processed += 1 + + # open output file +- tmpfilename = f"{outfilename}.tmp" ++ tmpfilename = '{}.tmp'.format(outfilename) + outfile = io.open(tmpfilename, "w", encoding="utf-8") + + # emit the template to the output file +@@ -157,9 +157,9 @@ + if o.ext in ("desktop", "str"): + if o.ext == "desktop": + value = encode_desktop_string(value) +- outfile.write(f"{OUTKEY}[{locale}]={value}\n") ++ outfile.write(u"""{}[{}]={}\n""".format(OUTKEY, locale, value)) + else: +- outfile.write(f"\t[{locale}]{OUTKEY}={value}\n") ++ outfile.write(u"""\t[{}]{}={}\n""".format(locale, OUTKEY, value)) + + template_file.close() + From e82d95abe0ae8ce787abab6529d43c9d94247fcb6073ff986656a4c802d3dd69 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 19:39:43 +0000 Subject: [PATCH 21/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1109 --- atklistener-32bit-type-mismatch.patch | 71 --------------------------- libreoffice.spec | 7 +-- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 atklistener-32bit-type-mismatch.patch diff --git a/atklistener-32bit-type-mismatch.patch b/atklistener-32bit-type-mismatch.patch deleted file mode 100644 index 08f4cb3..0000000 --- a/atklistener-32bit-type-mismatch.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 469fc646ec782f42e42947f480d5931b97e686ab Mon Sep 17 00:00:00 2001 -From: Michael Weghorn -Date: Fri, 7 Jul 2023 17:57:03 +0200 -Subject: gtk3 a11y: Use sal_Int32 consistently to fix i386 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -... after - - commit 3b7db802731826b6cc3b55100470b0c61c1f2dfa - Date: Thu May 4 10:06:14 2023 +0200 - - tdf#105404 [API CHANGE] add index to accessiblity change event - -Reported to fail like this: - - /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:164:6: error: no declaration matches 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference&, const com::sun::star::uno::Reference&, sal_Int32)' - 164 | void AtkListener::handleChildAdded( - | ^~~~~~~~~~~ - In file included from /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:29: - /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.hxx:54:10: note: candidate is: 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference&, const com::sun::star::uno::Reference&, int)' - 54 | void handleChildAdded( - | ^~~~~~~~~~~~~~~~ - -Change-Id: I03caa5480ef133091ccd5c9ae682629cec3a789b -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154190 -Tested-by: René Engelhard -Reviewed-by: René Engelhard -Tested-by: Jenkins ---- - vcl/unx/gtk3/a11y/atklistener.cxx | 2 +- - vcl/unx/gtk3/a11y/atklistener.hxx | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx -index 854e43133112..b9a053d83a7b 100644 ---- a/vcl/unx/gtk3/a11y/atklistener.cxx -+++ b/vcl/unx/gtk3/a11y/atklistener.cxx -@@ -207,7 +207,7 @@ void AtkListener::handleChildAdded( - void AtkListener::handleChildRemoved( - const uno::Reference< accessibility::XAccessibleContext >& rxParent, - const uno::Reference< accessibility::XAccessible>& rxChild, -- int nChildIndexHint) -+ sal_Int32 nChildIndexHint) - { - sal_Int32 nIndex = nChildIndexHint; - if (nIndex != -1 && (nIndex < 0 || nIndex >= static_cast(m_aChildList.size()))) -diff --git a/vcl/unx/gtk3/a11y/atklistener.hxx b/vcl/unx/gtk3/a11y/atklistener.hxx -index 546c5e9456fb..e286f40e5a19 100644 ---- a/vcl/unx/gtk3/a11y/atklistener.hxx -+++ b/vcl/unx/gtk3/a11y/atklistener.hxx -@@ -54,13 +54,13 @@ private: - void handleChildAdded( - const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent, - const css::uno::Reference< css::accessibility::XAccessible>& rxChild, -- int nIndexHint); -+ sal_Int32 nIndexHint); - - // Process CHILD_EVENT notifications with a child removed - void handleChildRemoved( - const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent, - const css::uno::Reference< css::accessibility::XAccessible>& rxChild, -- int nIndexHint); -+ sal_Int32 nIndexHint); - - // Process INVALIDATE_ALL_CHILDREN notification - void handleInvalidateChildren( --- -cgit v1.2.1 - diff --git a/libreoffice.spec b/libreoffice.spec index bcf18c6..f07e1ac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -123,10 +123,8 @@ Patch101: 0001-Revert-java-9-changes.patch Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep Patch991: libreoffice-no-destdircheck.patch -# Fix build on i586 -Patch992: atklistener-32bit-type-mismatch.patch # Fix build on sle12 -Patch993: python34-no-f-strings.patch +Patch992: python34-no-f-strings.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -1033,9 +1031,8 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif %patch990 -p1 %patch991 -p1 -%patch992 -p1 %if 0%{?suse_version} < 1550 -%patch993 -p1 +%patch992 -p1 %endif # Disable some of the failing tests (some are random) From dbb6cb8b65fca5174d94ca0139230b592f73dd12b43371d6f9abdc15fbc54c9e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 23:27:21 +0000 Subject: [PATCH 22/23] 7.6.0.2 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1110 --- libreoffice.changes | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 49898e0..3051295 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Aug 8 21:34:27 UTC 2023 - Fridrich Strba + +- Update to 7.6.0.2: + https://wiki.documentfoundation.org/ReleaseNotes/7.6 + https://wiki.documentfoundation.org/Releases/7.6.0/RC1 +- Update bundled dependencies: + * boost_1_80_0.tar.xz - > boost_1_82_0.tar.xz + * curl-8.0.1.tar.xz -> curl-8.1.2.tar.xz + * icu4c-72_1-data.zip -> icu4c-73_2-data.zip + * icu4c-72_1-src.tgz -> icu4c-73_2-src.tgz + * libassuan-2.5.5.tar.bz2 -> libassuan-2.5.6.tar.bz2 + * poppler-22.12.0.tar.xz -> poppler-23.06.0.tar.xz + * poppler-data-0.4.11.tar.gz -> poppler-data-0.4.12.tar.gz +- New bundled dependencies: + * graphite2-minimal-1.3.14.tgz + * harfbuzz-8.0.0.tar.xz + + needed for SLE12-SP2, where harfbuzz is really old +- Removed patches: + * atklistener-32bit-type-mismatch.patch + + integrated upstream + * fix_harfbuzz_on_sle12_sp5.patch + + not needed, since SLE12-SP5 uses now the bundled harfbuzz +- Added patch: + * python34-no-f-strings.patch + + Applied on SLE12-SP5 + + Do not format using F-strings, since it is python 3.6+ feature + and SLE12-SP5 has python 3.4 +- Refreshed patch: + * 0002-Revert-Require-HarfBuzz-5.1.0.patch + ------------------------------------------------------------------- Mon Aug 7 18:15:51 UTC 2023 - Fridrich Strba From 67c7b4f8bd0f81dc62de3d92c1d0d91c59f3e9624bd2f6b3773e299f5a22f70f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 9 Aug 2023 05:56:54 +0000 Subject: [PATCH 23/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1111 --- python34-no-f-strings.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python34-no-f-strings.patch b/python34-no-f-strings.patch index e6cab58..00830ee 100644 --- a/python34-no-f-strings.patch +++ b/python34-no-f-strings.patch @@ -38,10 +38,10 @@ if o.ext == "desktop": value = encode_desktop_string(value) - outfile.write(f"{OUTKEY}[{locale}]={value}\n") -+ outfile.write(u"""{}[{}]={}\n""".format(OUTKEY, locale, value)) ++ outfile.write("{}[{}]={}\n".format(OUTKEY, locale, value)) else: - outfile.write(f"\t[{locale}]{OUTKEY}={value}\n") -+ outfile.write(u"""\t[{}]{}={}\n""".format(locale, OUTKEY, value)) ++ outfile.write("\t[{}]{}={}\n".format(locale, OUTKEY, value)) template_file.close()