From 55afdc5e5a99e6333af7c2aa24c9dadecde05376 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 11 Sep 2024 16:37:01 -0500 Subject: [PATCH] 24.8.1.2 --- .gitignore | 6 + ...default-to-sifr-for-gnome-light-mode.patch | 58 ----- ...eoffice-7.5.8.2-icu-74-compatibility.patch | 218 ------------------ libreoffice.spec | 12 +- py313.patch | 47 ---- sources | 12 +- 6 files changed, 14 insertions(+), 339 deletions(-) delete mode 100644 0001-default-to-sifr-for-gnome-light-mode.patch delete mode 100644 libreoffice-7.5.8.2-icu-74-compatibility.patch delete mode 100644 py313.patch diff --git a/.gitignore b/.gitignore index a859034..d26368e 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,9 @@ /libreoffice-translations-24.8.0.3.tar.xz /libreoffice-translations-24.8.0.3.tar.xz.asc /Java-WebSocket-1.5.6.tar.gz +/libreoffice-24.8.1.2.tar.xz +/libreoffice-24.8.1.2.tar.xz.asc +/libreoffice-help-24.8.1.2.tar.xz +/libreoffice-help-24.8.1.2.tar.xz.asc +/libreoffice-translations-24.8.1.2.tar.xz +/libreoffice-translations-24.8.1.2.tar.xz.asc diff --git a/0001-default-to-sifr-for-gnome-light-mode.patch b/0001-default-to-sifr-for-gnome-light-mode.patch deleted file mode 100644 index 01617ff..0000000 --- a/0001-default-to-sifr-for-gnome-light-mode.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ffceb48dd576ababe346c9548b12ca18f31d3293 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 10 Mar 2023 11:41:45 +0000 -Subject: [PATCH] default to sifr for gnome light mode - -https://pagure.io/fedora-workstation/issue/361 - -"Fedora Workstation currently uses the rather outdated-looking -Elementary icon theme for LibreOffice, instead of the Sifr icon theme -which was designed to fit in with GNOME's icons. The Sifr theme saw a -nice update with LibreOffice 7.5, the version being shipped in Fedora -Linux 38, which makes the icons fit better with the current GNOME design -language." - -Change-Id: Ic37bbe8e7ad754ab070ead06dc0b006c6ccf3adb ---- - vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 4 ++-- - vcl/source/app/IconThemeSelector.cxx | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx -index 72ee344b1437..8d1aea0c3889 100644 ---- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx -+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx -@@ -85,7 +85,7 @@ IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop() - std::vector themes = GetFakeInstalledThemes(); - vcl::IconThemeSelector s; - OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome"); -- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r); -+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is returned for gnome desktop", OUString("sifr"), r); - } - - void -@@ -96,7 +96,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme() - s.SetPreferredIconTheme(preferred, false); - std::vector themes = GetFakeInstalledThemes(); - OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome"); -- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected); -+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is overridden by breeze", preferred, selected); - } - - void -diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx -index 6b8dfc0f42c7..ee30e577f3f5 100644 ---- a/vcl/source/app/IconThemeSelector.cxx -+++ b/vcl/source/app/IconThemeSelector.cxx -@@ -86,7 +86,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi - desktopEnvironment.equalsIgnoreAsciiCase("mate") || - desktopEnvironment.equalsIgnoreAsciiCase("unity") ) { - if (!bPreferDarkIconTheme) -- r = "elementary"; -+ r = "sifr"; - else - r = "sifr_dark"; - } else --- -2.40.1 - diff --git a/libreoffice-7.5.8.2-icu-74-compatibility.patch b/libreoffice-7.5.8.2-icu-74-compatibility.patch deleted file mode 100644 index 6ac57a4..0000000 --- a/libreoffice-7.5.8.2-icu-74-compatibility.patch +++ /dev/null @@ -1,218 +0,0 @@ -https://bugs.gentoo.org/917618 -https://bugs.documentfoundation.org/show_bug.cgi?id=158108 - -From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Mon, 20 Nov 2023 14:47:28 +0200 -Subject: [PATCH] Remove use of the now removed LBCMNoChain options - -* This change removes its use and explicitly prevents chaining where - the rule would have applied. - -https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96 -https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87 - -Signed-off-by: Alfred Wingate ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -14,7 +14,6 @@ - # - - !!chain; --!!LBCMNoChain; - - - !!lookAheadHardBreak; -@@ -206,13 +205,13 @@ $CR $LF {100}; - # - $LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks. - $CAN_CM $CM* $LB4Breaks {100}; --$CM+ $LB4Breaks {100}; -+^$CM+ $LB4Breaks {100}; - - # LB 7 x SP - # x ZW - $LB4NonBreaks [$SP $ZW]; - $CAN_CM $CM* [$SP $ZW]; --$CM+ [$SP $ZW]; -+^$CM+ [$SP $ZW]; - - # - # LB 8 Break after zero width space -@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]]; - # See definition of $CAN_CM. - - $CAN_CM $CM+; # Stick together any combining sequences that don't match other rules. --$CM+; -+^$CM+; - - # - # LB 11 Do not break before or after WORD JOINER & related characters. - # - $CAN_CM $CM* $WJcm; - $LB8NonBreaks $WJcm; --$CM+ $WJcm; -+^$CM+ $WJcm; - - $WJcm [^$CAN_CM]; - $WJcm $CAN_CM $CM*; -@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*; - # - # (!SP) x GL - [$LB8NonBreaks-$SP] $CM* $GLcm; --$CM+ $GLcm; -+^$CM+ $GLcm; - - # GL x - $GLcm ($LB8Breaks | $SP); -@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B - # - $LB8NonBreaks $CL; - $CAN_CM $CM* $CL; --$CM+ $CL; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $EX; - $CAN_CM $CM* $EX; --$CM+ $EX; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $IS; - $CAN_CM $CM* $IS; --$CM+ $IS; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL - - $LB8NonBreaks $SY; - $CAN_CM $CM* $SY; --$CM+ $SY; # by rule 10, stand-alone CM behaves as AL -+^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL - - - # -@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP]; - # LB 19 - # x QU - $LB18NonBreaks $CM* $QUcm; --$CM+ $QUcm; -+^$CM+ $QUcm; - - # QU x - $QUcm .?; -@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?; - - # LB 22 - ($ALcm | $HLcm) $INcm; --$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL -+^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; - $NUcm $INcm; -@@ -341,7 +340,7 @@ $NUcm $INcm; - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 - $HLcm $NUcm; --$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL -+^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; - $NUcm $HLcm; - -@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - # LB 28 Do not break between alphabetics - # - ($ALcm | $HLcm) ($ALcm | $HLcm); --$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL -+^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm); - # and opening or closing punctuation - # - ($ALcm | $HLcm | $NUcm) $OPcm; --$CM+ $OPcm; -+^$CM+ $OPcm; - $CLcm ($ALcm | $HLcm | $NUcm); - - # -@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm); - - !!reverse; - --$CM+ $ALPlus; --$CM+ $BA; --$CM+ $BB; --$CM+ $B2; --$CM+ $CL; --$CM+ $EX; --$CM+ $GL; --$CM+ $HL; --$CM+ $HY; --$CM+ $H2; --$CM+ $H3; --$CM+ $ID; --$CM+ $IN; --$CM+ $IS; --$CM+ $JL; --$CM+ $JV; --$CM+ $JT; --$CM+ $NS; --$CM+ $NU; --$CM+ $OP; --$CM+ $PO; --$CM+ $PR; --$CM+ $QU; --$CM+ $SY; --$CM+ $WJ; --$CM+; -+^$CM+ $ALPlus; -+^$CM+ $BA; -+^$CM+ $BB; -+^$CM+ $B2; -+^$CM+ $CL; -+^$CM+ $EX; -+^$CM+ $GL; -+^$CM+ $HL; -+^$CM+ $HY; -+^$CM+ $H2; -+^$CM+ $H3; -+^$CM+ $ID; -+^$CM+ $IN; -+^$CM+ $IS; -+^$CM+ $JL; -+^$CM+ $JV; -+^$CM+ $JT; -+^$CM+ $NS; -+^$CM+ $NU; -+^$CM+ $OP; -+^$CM+ $PO; -+^$CM+ $PR; -+^$CM+ $QU; -+^$CM+ $SY; -+^$CM+ $WJ; -+^$CM+; - - - # -@@ -468,7 +467,7 @@ $LF $CR; - # X $CM needs to behave like X, where X is not $SP or controls. - # $CM not covered by the above needs to behave like $AL - # Stick together any combining sequences that don't match other rules. --$CM+ $CAN_CM; -+^$CM+ $CAN_CM; - - - # LB 11 -@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - !!safe_reverse; - - # LB 7 --$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; --$CM+ $SP / .; -+^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; -+^$CM+ $SP / .; - - # LB 9 - $SP+ $CM* $OP; --- -2.42.1 - diff --git a/libreoffice.spec b/libreoffice.spec index bd5766a..738d1ac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 24.8.0 +%global libo_version 24.8.1 # 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. @@ -81,7 +81,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.3 +Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -319,19 +319,11 @@ Patch0: 0001-don-t-suppress-crashes.patch Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch # rhbz#1736810 disable opencl by default again Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -# backported -#Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch -# backported -#Patch4: py313.patch # not upstreamed # fix FTB in ppc64le from sharkcz # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html Patch11: lo-7.6-ppc64le-tests.patch Patch12: cflags.patch -# icu 74 compatibility patch, from gentoo, via arch linux -# https://bugs.gentoo.org/917618 -# https://bugs.documentfoundation.org/show_bug.cgi?id=158108 -#Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html Patch501: kahansum_test_fix_for_aarc64_s390x.patch diff --git a/py313.patch b/py313.patch deleted file mode 100644 index aa94173..0000000 --- a/py313.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx -index 05a03fe72c4d..44fc885a3dc0 100644 ---- a/pyuno/source/loader/pyuno_loader.cxx -+++ b/pyuno/source/loader/pyuno_loader.cxx -@@ -105,7 +105,7 @@ static PyRef getObjectFromLoaderModule( const char * func ) - return object; - } - --static void setPythonHome ( const OUString & pythonHome ) -+static void setPythonHome ( const OUString & pythonHome, PyConfig * config ) - { - OUString systemPythonHome; - osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) ); -@@ -129,9 +129,7 @@ static void setPythonHome ( const OUString & pythonHome ) - PyErr_SetString(PyExc_SystemError, "python home path is too long"); - return; - } --SAL_WNODEPRECATED_DECLARATIONS_PUSH -- Py_SetPythonHome(wide); // deprecated since python 3.11 --SAL_WNODEPRECATED_DECLARATIONS_POP -+ config->home = wide; - } - - static void prependPythonPath( std::u16string_view pythonPathBootstrap ) -@@ -183,11 +181,13 @@ void pythonInit() { - if ( Py_IsInitialized()) // may be inited by getComponentContext() already - return; - -+ PyConfig config; - OUString pythonPath; - OUString pythonHome; - OUString path( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("pythonloader.uno" )); - rtl::Bootstrap::expandMacros(path); //TODO: detect failure - rtl::Bootstrap bootstrap(path); -+ PyConfig_InitPythonConfig( &config ); - - // look for pythonhome - bootstrap.getFrom( "PYUNO_LOADER_PYTHONHOME", pythonHome ); -@@ -196,7 +196,7 @@ void pythonInit() { - // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console - // sadly, there is no api for setting the pythonpath, we have to use the environment variable - if( !pythonHome.isEmpty() ) -- setPythonHome( pythonHome ); -+ setPythonHome( pythonHome, &config ); - - if( !pythonPath.isEmpty() ) - prependPythonPath( pythonPath ); diff --git a/sources b/sources index ce30098..43ccda1 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (libreoffice-24.8.0.3.tar.xz) = 92aece843cdc62d161cc78c61deebf3226da073e1bdd3e91a32cc16f06ee7f1435ea5f8b2fdc681500b95e645e744b33860107b5fc6e3ee6323d4cfdfbe18210 -SHA512 (libreoffice-24.8.0.3.tar.xz.asc) = 47238a34c2c39454ba3974bd2757d98c984992147c2dd6a81b01e3aa1a3a26b9620573ecf25d21fcb24598cdf3ec3bfd59284c96c44875dc7fa3371e0918eb81 -SHA512 (libreoffice-help-24.8.0.3.tar.xz) = cc3fc4dec46d62b83b191eb5d9e47163821fd9536914e0613f54e52b7959d066ac4a99e5aefbacdfce6c5584d60ca36cc615a02b4c164ab4a9bbf6c22e58eeb5 -SHA512 (libreoffice-help-24.8.0.3.tar.xz.asc) = 47db6c2eef2c1f3e2b81cf2370f6f08b45bcd946ec79007cbf70bf6b4b2011acb63c9315f81f126de483ad1d3ca56f9fb31433a54b3bc07836ff53fd71db8f65 -SHA512 (libreoffice-translations-24.8.0.3.tar.xz) = 36817a41801a6b112f7a30c9166dfe90c45f756ac6d98530e38cc600365e9fe5e7ad6e0a188138bd013647362e41821c213db4fea22806c921fabcb460414791 -SHA512 (libreoffice-translations-24.8.0.3.tar.xz.asc) = 5ecc4bc66e2f278b83313b5cd7b4816196b45d88f7c52fbd07afb6c0b8fda7b7244a80eb12a0f64ba893316fc078971381db7c4fb8dbadf07cc6fa047ab142e8 +SHA512 (libreoffice-24.8.1.2.tar.xz) = 4d7049c79f188ddf347231dea0112c375e95909a3204385827da7e3e4a4b93bef017891d49a40fec4d41094ced548967872f7639584a8d004518621931c3dbdf +SHA512 (libreoffice-24.8.1.2.tar.xz.asc) = 95fb3bef476f1624a03566d87adce0441376a75a62c90e72a21674afecb50e4493095c69557a4c1b2361523a13381cad5551464af74e69a8382330b3678b733d +SHA512 (libreoffice-help-24.8.1.2.tar.xz) = a080a16d2d1cacb7f4e9b0de288271df251ce6a774306da9a71e244dd69c8e1a46c619c7b9d43f853b706781852dd4ac1956a3ba6fde5c3c548974db88a71598 +SHA512 (libreoffice-help-24.8.1.2.tar.xz.asc) = 968d307db3d366e853377552fc5834c00fc37f509ff1b3e6fb1c7db04114720385eb0aaac830463acc1f1590c8013de99755a1565b453a35cea89d966ac49ff7 +SHA512 (libreoffice-translations-24.8.1.2.tar.xz) = 56a1eaa454c019b03cbdb06ea1f6f2d97aa1c98a496ed2dbf8c51086c1b5a6d8cf1e6d992ee874c9242a5485c62ea28e9f9e636e639cb6bac82810f7d1c9a666 +SHA512 (libreoffice-translations-24.8.1.2.tar.xz.asc) = d2e1bf3d1e1993612f624022fe52dff35c732486150e6dcf656998f07b645e0109062518a555c6af2a7f83066a4bc9b27dd90e0d42cad344052612eba7f212aa SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a