diff --git a/.gitattributes b/.gitattributes index ad0e1bf..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -185d60944ea767075d27247c3162b3bc-unowinreg.dll filter=lfs diff=lfs merge=lfs -text diff --git a/185d60944ea767075d27247c3162b3bc-unowinreg.dll b/185d60944ea767075d27247c3162b3bc-unowinreg.dll deleted file mode 100644 index 1000c5e..0000000 --- a/185d60944ea767075d27247c3162b3bc-unowinreg.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 -size 12288 diff --git a/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt b/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt deleted file mode 100644 index 206fbb9..0000000 --- a/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 -size 49659 diff --git a/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip b/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip deleted file mode 100644 index 3e8531c..0000000 --- a/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 -size 9796 diff --git a/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip b/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip deleted file mode 100644 index e5ed61e..0000000 --- a/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 -size 1521926 diff --git a/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 b/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 deleted file mode 100644 index 4653c9c..0000000 --- a/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3 -size 64057 diff --git a/Java-WebSocket-1.5.4.tar.gz b/Java-WebSocket-1.5.4.tar.gz deleted file mode 100644 index 2d5f3c0..0000000 --- a/Java-WebSocket-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720 -size 189725 diff --git a/Java-WebSocket-1.5.6.tar.gz b/Java-WebSocket-1.5.6.tar.gz new file mode 100644 index 0000000..f4a8da2 --- /dev/null +++ b/Java-WebSocket-1.5.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f +size 190604 diff --git a/boost_1_82_0.tar.xz b/boost_1_82_0.tar.xz deleted file mode 100644 index 3b92869..0000000 --- a/boost_1_82_0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de -size 17903080 diff --git a/boost_1_85_0.tar.xz b/boost_1_85_0.tar.xz new file mode 100644 index 0000000..93a2f09 --- /dev/null +++ b/boost_1_85_0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a +size 18298588 diff --git a/curl-8.7.1.tar.xz b/curl-8.7.1.tar.xz deleted file mode 100644 index b5f255a..0000000 --- a/curl-8.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd -size 2707016 diff --git a/curl-8.9.0.tar.xz b/curl-8.9.0.tar.xz new file mode 100644 index 0000000..2622342 --- /dev/null +++ b/curl-8.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 +size 2781828 diff --git a/cve-2024-5261.patch b/cve-2024-5261.patch deleted file mode 100644 index 4436e18..0000000 --- a/cve-2024-5261.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit bdb47881a214b659b6102c78e5e082197ecf15c7 -Author: Thorsten Behrens -Date: Thu May 16 17:43:38 2024 +0200 - - Revert "tdf#109347: don't verify SSL certificate for crashreport upload" - - With recent improvements in libcurl CA usage on Linux, this workaround - is no longer needed. See also 11f439b861922b9286b2e47ed326f3508a48d44e - - This reverts commit ec4229bc49a315f3f17664bb43e61d3b2e13fb87. - - Change-Id: I09124691687297f3b6ae0b9ca64652809caf3a11 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167752 - Reviewed-by: Thorsten Behrens - Tested-by: Jenkins - Reviewed-by: Michael Stahl - -diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx -index 90d23f51acf3..6e0b0141869d 100644 ---- a/desktop/source/minidump/minidump.cxx -+++ b/desktop/source/minidump/minidump.cxx -@@ -119,7 +119,6 @@ static bool uploadContent(std::map& parameters, std::s - - curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); - curl_easy_setopt(curl, CURLOPT_USERAGENT, kUserAgent); -- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); - // Set proxy information if necessary. - if (!proxy.empty()) - { diff --git a/fontconfig-2.14.2.tar.xz b/fontconfig-2.14.2.tar.xz deleted file mode 100644 index b6a612a..0000000 --- a/fontconfig-2.14.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b -size 1440844 diff --git a/fontconfig-2.15.0.tar.xz b/fontconfig-2.15.0.tar.xz new file mode 100644 index 0000000..7b7b2b6 --- /dev/null +++ b/fontconfig-2.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e +size 1447820 diff --git a/freetype-2.13.0.tar.xz b/freetype-2.13.0.tar.xz deleted file mode 100644 index 73237ba..0000000 --- a/freetype-2.13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c -size 2492440 diff --git a/freetype-2.13.2.tar.xz b/freetype-2.13.2.tar.xz new file mode 100644 index 0000000..cc414c4 --- /dev/null +++ b/freetype-2.13.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d +size 2501764 diff --git a/harfbuzz-8.2.2.tar.xz b/harfbuzz-8.2.2.tar.xz deleted file mode 100644 index 5e89d41..0000000 --- a/harfbuzz-8.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3 -size 18905228 diff --git a/harfbuzz-8.5.0.tar.xz b/harfbuzz-8.5.0.tar.xz new file mode 100644 index 0000000..9cb317c --- /dev/null +++ b/harfbuzz-8.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27 +size 19468172 diff --git a/icu-74-compatibility.patch b/icu-74-compatibility.patch deleted file mode 100644 index 9ed163b..0000000 --- a/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/icu4c-73_2-data.zip b/icu4c-73_2-data.zip deleted file mode 100644 index a14de00..0000000 --- a/icu4c-73_2-data.zip +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ab8a085..0000000 --- a/icu4c-73_2-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 -size 26519906 diff --git a/icu4c-74_2-data.zip b/icu4c-74_2-data.zip new file mode 100644 index 0000000..65c5bd6 --- /dev/null +++ b/icu4c-74_2-data.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6 +size 19382024 diff --git a/icu4c-74_2-src.tgz b/icu4c-74_2-src.tgz new file mode 100644 index 0000000..6dfe0e4 --- /dev/null +++ b/icu4c-74_2-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c +size 26529443 diff --git a/libassuan-2.5.7.tar.bz2 b/libassuan-2.5.7.tar.bz2 deleted file mode 100644 index 9a1cadc..0000000 --- a/libassuan-2.5.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76 -size 605076 diff --git a/libassuan-3.0.1.tar.bz2 b/libassuan-3.0.1.tar.bz2 new file mode 100644 index 0000000..70b84c7 --- /dev/null +++ b/libassuan-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1 +size 592430 diff --git a/libcmis-0.6.1.tar.xz b/libcmis-0.6.1.tar.xz deleted file mode 100644 index 4469de5..0000000 --- a/libcmis-0.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074 -size 490296 diff --git a/libcmis-0.6.2.tar.xz b/libcmis-0.6.2.tar.xz new file mode 100644 index 0000000..92d0061 --- /dev/null +++ b/libcmis-0.6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644 +size 488736 diff --git a/libgpg-error-1.48.tar.bz2 b/libgpg-error-1.48.tar.bz2 deleted file mode 100644 index 5e1ee45..0000000 --- a/libgpg-error-1.48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f -size 1080417 diff --git a/libgpg-error-1.50.tar.bz2 b/libgpg-error-1.50.tar.bz2 new file mode 100644 index 0000000..043db7b --- /dev/null +++ b/libgpg-error-1.50.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a +size 1082003 diff --git a/libreoffice-24.2.5.2.tar.xz b/libreoffice-24.2.5.2.tar.xz deleted file mode 100644 index c02d16e..0000000 --- a/libreoffice-24.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c16e4f7415521e42dda48d76a614e18e78fc5e5fae689b4bbe8139ed8a70a0e -size 280162592 diff --git a/libreoffice-24.2.5.2.tar.xz.asc b/libreoffice-24.2.5.2.tar.xz.asc deleted file mode 100644 index 37b6e69..0000000 --- a/libreoffice-24.2.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIyBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmaOpuQACgkQ9DSh76/u -rqN2YA/3a3Uk78OIx+RLLGEQo40ABYqjWfsmC0r8mpxMG657i7SkO7WZsE6YCMFp -RCmMwOqN7WEQWEkaYg5Lpt+9lHpFaxN3/XIpe7h8PZQtlNyJkdMP4YQSeXTwnI1x -U5bG/xF7F2hkilwTD2OSUGGyJCYBEb2L4hxtGn2FJiaWMy0KJyvUgQeFUPjOxthj -baFUFodnAX9KZWzke28u6yGYQg0202Moa6L/gEqTZK+zdtXJBOIwQwnIJ6tZdQSJ -AOEdOpvUTtP6g8TtGXst3Ffg/SUycdRiOF3jpi5YcyO2Mz8ZQct+LqPN2P7kj5nP -0QY4X48zAKiQ3hELOa2DNyQkWJKUdaSok7nzqZ4PWT5sdwLUEoyDU4Iu5g4C9Nvr -R131zeR0TtIbfPyNOijknW6DvMTMkI+khcEQ0alPYMblGdWJA2LS/1Ocgz9Vn6NO -+e3tdYg9n6Gves8DrXSIjKElFY1guYnRC0SuO05Owh1tkwB2XFq8VmTvttc0KWt+ -BUR6U5IeHATsq/IlRmRa6Wgb1GBj6XrR31NF8CMVzfLMQo+2pZvWd8FDWSs1KwKS -EDrLVSTfNs0YKRmVh2XLoCYLxOoJd2wwwnq/Vd7xh4iPsfvdncNZYV1RJQirzXJd -E7hjo7GVtTjY17YnSbNxc8NafCbWkChaMEVbFTVg3TKb0j/2Aw== -=aVgl ------END PGP SIGNATURE----- diff --git a/libreoffice-24.8.0.3.tar.xz b/libreoffice-24.8.0.3.tar.xz new file mode 100644 index 0000000..75d5bff --- /dev/null +++ b/libreoffice-24.8.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1 +size 280371320 diff --git a/libreoffice-24.8.0.3.tar.xz.asc b/libreoffice-24.8.0.3.tar.xz.asc new file mode 100644 index 0000000..f208604 --- /dev/null +++ b/libreoffice-24.8.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M1wACgkQ9DSh76/u +rqONlg//bGo6O1y56ddR424Z7Ptpu0RCp28YwndzmrDq5BPaPNJeW7tJSebRdYsH +UY5+F3DippF1RN6WAL0OK0d0XR/zdZqbO9x2RuAnTrr8rxwxVDSuQ3gbkGnSAMJ1 +bvQ9i92yIf6A7/QqOFea2+6UJpzoSbLprSkXMUkbpH8p9BUvPgmRLC5GhrbcmjAb +304BNIERUQcycfB3ej09l7ybFF7lMd5X75Nu0+LemMxHFjo9urTa2UC2dZl3hqTg +bFnwa0Adea/DX2s69uwPmLicpvu9/AkmG0E1expfxQixLf4bY3i4sPxYdGF69WCp +Khyvc1wRMfLDnadO8PXhQHpBRt0caVr9FzTpvzsdXt+OxI6RqXjSkRD0ozvHTb73 +VZiw+uOLgGYAfXJtkACreZlsWVOBOnRCorv7SbwZmu7QuWI5hSditw5tbKa8sD7x +q1P3y85JwMKFH6nyj0saQ5SxiISJKv9kcxHxXHdVqgPejKgAmMbsZESett1AwdzP +Yl06EENPWMV6KA2kNkEApmFl2e+LjzOyIm9ExTYdHCbbZZRIgzjo8/1l1KOJqDxB +4IvlmIE6dZ5/BCAa9Oz6XP607i8BTAwkBgpY1ihw2WVejGNUcM8JZf2as5WKb+1J +vZLlxlEnb5jSIigbRLvMV1phnrpr0tO4Nc/Q+seKfhLhihznrr4= +=STeL +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-24.2.5.2.tar.xz b/libreoffice-help-24.2.5.2.tar.xz deleted file mode 100644 index 52bb2da..0000000 --- a/libreoffice-help-24.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:545fdbcbb00ddff1acda18d33cfceec792d0a2ac0f92f4ecbe3f16691b8a1724 -size 167013608 diff --git a/libreoffice-help-24.2.5.2.tar.xz.asc b/libreoffice-help-24.2.5.2.tar.xz.asc deleted file mode 100644 index 4928ab3..0000000 --- a/libreoffice-help-24.2.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmaOpukACgkQ9DSh76/u -rqOZZw//ZKvkUB72G2H19awUeWu6eFLE36ftppLd7ceDEJJlnNGrSGWlevZ5EFaf -OZCb/urw6sP100zQmEq/AwwPKO61h7IH+prrzjrfcMxXmKcDDYCIFjXtZNx6/DMD -YHqXLZuQphv79um/CAbDOJuWx/hd08XEefjIlc3Y0P4B90DTVLiy2JwTRMEMdxpp -1C5YeD7bT72K7xj5sYvFg58UsGGRQhpK2+QPgT2qu/tHtLD53ujPpoB81RX5SpIA -3gMJpTGn5ycvV797A5RpQUeC14aYc2eEvUid2nFSCdtPLMsvImYCC0YHuFq4X/Hi -ItfqYot1JpT0wUX4539IwwsZjM9LW2OLa8mfOHeSu8owB8TJx1ykAAOuQACZfRBq -DTf0BraRYBk43plU2Gk45aWlmOULNKi31hWsGjvy1q5sE1cPfX/wjAGnXc40UzPw -BX6vbYpNWBtA5Vktpm73bNoyTxQdozZJCRCZij7yjsGOquQ2c8GFrXpR+6DSbJaS -7R4kfJ5Jt7I7BllBY8ipOXnNVW80WOtfYEjNvZAljBOyUD4hKYnlgH6V8Xdf4CNm -Z1VDlU1h74xOf8QQ0MBCVevoXETOFM3O4Yyhk8WvpmpiVTZvd12SpNazvVAViif3 -4IChjzwwpUbs8a1Aznq/uEykOchaTU1P6TwQ1tQmYFScz+uO6LA= -=kaQ0 ------END PGP SIGNATURE----- diff --git a/libreoffice-help-24.8.0.3.tar.xz b/libreoffice-help-24.8.0.3.tar.xz new file mode 100644 index 0000000..688dadd --- /dev/null +++ b/libreoffice-help-24.8.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7653e34fa2139fa6818d644208a0fc9e4e43be18d669c020f38c8dab161671ed +size 166984832 diff --git a/libreoffice-help-24.8.0.3.tar.xz.asc b/libreoffice-help-24.8.0.3.tar.xz.asc new file mode 100644 index 0000000..675c4d3 --- /dev/null +++ b/libreoffice-help-24.8.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M2cACgkQ9DSh76/u +rqNTyRAAlz0k1zVqXS5CwGXGUtv/Ub2u1+7NkAWNG7SvY3JMy8tZolNZkVf0EEw1 +jvE/o7zjroXkJLj8mJgrFrnOtIlTvatbSTWqDO7zU3bGghsi1ZRKnm3sTu+hz5B/ +qJ4n3eai03SFjhmGPPtltyYPPNiFS1CUIZgG29pp8ucu9PIcjCKctgRMYRgu1dot +8YMh+I07CmmLssb4yFny7AZsDvImfX4QOMarnuYTS2FfCWfQeydVkQhCoGzl7VLj +4Q5zrkkYPnapipI/QUWRSNm5DeU6Cc+kxOStgTM0COzrrqbbXe1ru5TRQHVzRFbL +Q6B4c/Bah8Xo1lS3zg/fp52dHprl8JFANHafvIuu7FdppDMnhNIx9sT0LJoHnH2m +icy7U5QLAdtMx0RBQPJ7u2ntWJjRPCIcSsBu8GY+VgqrfJzcRwtoku+V5GkJMU+2 +DzTWvGhhuXoBZhrrmsIkQ6j4NmBm95/tMAjS/R8Y3aCBiR+U8EZ2PabeIPhmxUJA +SqhqBNw7DQ3lh2C/4xgZOpUOqfj/qbOP3sCQSiUc2K15MTZzKV1KBKgFM0oS/dkV +O+dkUEMgRdBbe+HdiyjAg0WnMK48FdegTTjB2hVy+pY8HSogZwEXU46xKnF63KR1 +9UCftYveZxq49Kslr/CB3QIo94XRpVXFg64AcqkzNGhcWNyT7l0= +=rteW +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-24.2.5.2.tar.xz b/libreoffice-translations-24.2.5.2.tar.xz deleted file mode 100644 index 0b6bb19..0000000 --- a/libreoffice-translations-24.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cb01f83a3a605082b2054874741c74db69b8bdbd0c009304515fe547c20313b -size 219379548 diff --git a/libreoffice-translations-24.2.5.2.tar.xz.asc b/libreoffice-translations-24.2.5.2.tar.xz.asc deleted file mode 100644 index 247e02c..0000000 --- a/libreoffice-translations-24.2.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmaOpukACgkQ9DSh76/u -rqMdxw/+M6B0ocSeZbTrKc3r2hG0Pawg9uKjuo8RNRZsWc1gkaH1PotPmDckVyhk -62gokHB0R2Zk4KpuxAF/tpJHAaLE0bhq+C4tvvne9XmerIfJS9dXW7nVNvec3uJQ -QxN/yI4tiEeXx46lPxfVNY10oj73mDrLQrtlrssjC0VE6GxvQI0Fe/dCJJQj812B -cI7IsFU/ODqpE5ljnx3XspL6hkkgaoab3uBlDaw4d5RbsXzJ4dsPj0deZR4DNrTh -mJGeDNHUU0bYIuO+RaMyf2SmO1CHB2leTgolkIdzpf3IM251rXXTx6hvwP7GCffS -g4NaJykqlOIVGiULbFtfzVIBa/T/zcODlSlnSVT3Qt9G5NGuPR9ihxyGRGCC+jdH -cME3Sn+O83Nca4RHpdiME1Y3wk/ExRhQnuGPM3YQQF5VPgcyBwTE9YwSvn9ne9IF -Zb+ebcSsSYx2tH0QAnx2XHRsKnMyI/fXR6vIzSRIoMKdIaY/5AtSLaM/asaBoS4W -BifSMPx4jQ91j/PmdFWk0uTkXP5NLlp4XZXUR4CYHZ2wgOBV2OE7dQowijsbYWFu -pe6/sbPG0b4c9Z3Qdc95CAIOEyYFlOxpKadUNmu+SPyw41hRhfGSyNs/FZeSCa10 -I4pJBG9lvT3M3OgQEOmhuKzBL+McpT87lyrNf5+WkzGVBd0rlI0= -=hwn7 ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-24.8.0.3.tar.xz b/libreoffice-translations-24.8.0.3.tar.xz new file mode 100644 index 0000000..63b4bf5 --- /dev/null +++ b/libreoffice-translations-24.8.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e2706a6b0339b3424a3fb75c83b73817603722baf8fa11a9b84dc9a65ece55c +size 221897784 diff --git a/libreoffice-translations-24.8.0.3.tar.xz.asc b/libreoffice-translations-24.8.0.3.tar.xz.asc new file mode 100644 index 0000000..5c2e14b --- /dev/null +++ b/libreoffice-translations-24.8.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M2cACgkQ9DSh76/u +rqMRGw//ZECPZxdP0C3wpCK/UeVN5L/qviy1PffX2uf+QtC5K6FnwfDzUXsUMNfM +KIgvvhA0DicHXCGLFVR/32P8xVjEcvQr577QyO0esIMVnUYI8pLwFO/as81InPOE +q4/ZpUcezofZw7lWFFexlTzZMqNTaSzk6sxNbJw6HGn/uQ4UINQU5noKa8YdXaWf +8umIGYXsO6D7Nc6Ktxsb4tQqQSLewD7A9bUZqZnV4o2IfMQpYNZCL/udDBdOrI+G +MeQUEOs3vi9zfLyo1Q0QWpHJS7OkrHt12UWLJRvCTkVzgzyEUjnnpyr6316UQxdL +YyxEYw1LE/Y8FOP2CcW/gqIIB69yvkp0mklm8MvLKoeOcwnsftwvX8RQBmsU/Gzo +UzzK3zcuLJWmgcUB4NqBibDm8LlTCK7CONWSvA3vvQaBvwPbArY0asAVIjCRigfd +EC9MNDGrgNSzzeIoi20rLTCUSeGJm47We/xM+iP0ob0tEH1Yx5nQWRRAbzfNFa8m +JTnY5NUU2vsyU5aoRQCCuyaZ4RPnlZfdYNfQEd/97PHSXmTJyppIOdMdcCcHN6oJ +mK+UPu3WQwCqcEEU+NwFk35mzFXo19yO+ezcxqSPNTS5qSXEYoIY7j2cgfWdemSp +o+tI5WMyJnoQ5pWShRYgHWH5zXgNn597/3oBqUSjNRG756Idqd8= +=18Ej +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 054609d..267688a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,22 @@ +Thu Aug 22 15:14:06 UTC 2024 - Fridrich Strba + +- Make the libassuan requirement more generic (bsc#1229103) + +------------------------------------------------------------------- +Thu Aug 22 10:23:08 UTC 2024 - Fridrich Strba + +- Update to 24.8.0.3 (24.8.0 final) + https://wiki.documentfoundation.org/Releases/24.8.0/Beta1, + https://wiki.documentfoundation.org/Releases/24.8.0/RC1, + https://wiki.documentfoundation.org/Releases/24.8.0/RC2 and + https://wiki.documentfoundation.org/Releases/24.8.0/RC3 +- Removed patches: + * cve-2024-5261.patch + * icu-74-compatibility.patch + * pdfium-optional.patch + * use-fixmath-shared-library.patch + + not needed with this version + ------------------------------------------------------------------- Thu Jul 18 16:19:37 UTC 2024 - Bernhard Wiedemann diff --git a/libreoffice.spec b/libreoffice.spec index 3c2d6df..f6c655c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -78,7 +78,7 @@ %global with_gcc 12 %endif Name: libreoffice -Version: 24.2.5.2 +Version: 24.8.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -98,32 +98,22 @@ Source99: %{name}-rpmlintrc Source100: %{name}.changes # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt -# used extensions sources -Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.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 # hsqldb simply does not work with new system version, but luckily we migrate to firebird Source2002: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Provides: bundled(hsqldb) = 1.8.0 -# Heavily patched and not possible to use system one -Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Provides: bundled(rhino) = 1.5R5 # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # Needed for integration tests Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-6179.tar.bz2 +Source2008: %{external_url}/pdfium-6425.tar.bz2 # Single C file with patches from LO Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way Source2010: %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz -Source2012: %{external_url}/libcmis-0.6.1.tar.xz -Provides: bundled(libcmis) = 0.6.1 +Source2012: %{external_url}/libcmis-0.6.2.tar.xz +Provides: bundled(libcmis) = 0.6.2 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -131,14 +121,11 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: pdfium-optional.patch # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error 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 -# PATCH-FIX-SUSE use fixmath shared library -Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install Patch15: fix-sdk-idl.patch # try to save space by using hardlinks @@ -147,10 +134,6 @@ Patch990: install-with-hardlinks.diff Patch991: libreoffice-no-destdircheck.patch # Fix build on sle12 Patch992: python34-no-f-strings.patch -# Fix build with icu 74 (bsc#1224309) -Patch993: icu-74-compatibility.patch -# PATCH-FIX-UPSTREAM CVE-2024-5261 (bsc#1226975) -Patch994: cve-2024-5261.patch # PATCH-FIX-OPENSUSE override date in clucene files (boo#1047218) Patch995: reproducible-clucene.patch BuildRequires: %{name}-share-linker @@ -171,8 +154,8 @@ BuildRequires: zxcvbn-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.7.1.tar.xz -Provides: bundled(curl) = 8.7.1 +Source2013: %{external_url}/curl-8.9.0.tar.xz +Provides: bundled(curl) = 8.9.0 %endif # Needed for tests BuildRequires: dejavu-fonts @@ -191,7 +174,6 @@ BuildRequires: gperf >= 3.1 BuildRequires: graphviz BuildRequires: hyphen-devel BuildRequires: junit4 -BuildRequires: libassuan0 BuildRequires: libbase BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: liberation-fonts @@ -212,6 +194,7 @@ BuildRequires: pentaho-reporting-flow-engine BuildRequires: pkgconfig BuildRequires: python3-lxml BuildRequires: python3-xml +BuildRequires: rhino BuildRequires: sac BuildRequires: ucpp BuildRequires: unixODBC-devel @@ -241,13 +224,13 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(harfbuzz) >= 2.6.8 BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else -Source2025: %{external_url}/harfbuzz-8.2.2.tar.xz +Source2025: %{external_url}/harfbuzz-8.5.0.tar.xz Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz Provides: bundled(graphite2) = 1.3.14 -Provides: bundled(harfbuzz) = 8.2.2 +Provides: bundled(harfbuzz) = 8.5.0 %endif # Java-WebSocket -Source3000: %{external_url}/Java-WebSocket-1.5.4.tar.gz +Source3000: %{external_url}/Java-WebSocket-1.5.6.tar.gz BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) @@ -319,12 +302,12 @@ 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_82_0.tar.xz -Source2023: %{external_url}/poppler-23.09.0.tar.xz +Source2020: %{external_url}/boost_1_85_0.tar.xz +Source2023: %{external_url}/poppler-24.06.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz -Source2030: %{external_url}/tiff-4.6.0.tar.xz -Provides: bundled(boost) = 1.82.0 -Provides: bundled(poppler) = 23.06.0 +Source2030: %{external_url}/tiff-4.6.0t.tar.xz +Provides: bundled(boost) = 1.85.0 +Provides: bundled(poppler) = 24.06.0 Provides: bundled(poppler-data) = 0.4.12 %else BuildRequires: libboost_date_time-devel @@ -338,12 +321,12 @@ BuildRequires: pkgconfig(poppler-cpp) %endif %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 +Source2021: %{external_url}/icu4c-74_2-src.tgz +Source2022: %{external_url}/icu4c-74_2-data.zip Source2027: %{external_url}/phc-winner-argon2-20190702.tar.gz -Source2028: %{external_url}/fontconfig-2.14.2.tar.xz -Source2029: %{external_url}/freetype-2.13.0.tar.xz -Provides: bundled(icu) = 73.2 +Source2028: %{external_url}/fontconfig-2.15.0.tar.xz +Source2029: %{external_url}/freetype-2.13.2.tar.xz +Provides: bundled(icu) = 74.2 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel Requires(post): update-desktop-files @@ -368,11 +351,11 @@ BuildRequires: python-rpm-macros BuildRequires: libgpgmepp-devel >= 1.14 %else Source1000: %{external_url}/gpgme-1.23.2.tar.bz2 -Source1001: %{external_url}/libgpg-error-1.48.tar.bz2 -Source1002: %{external_url}/libassuan-2.5.7.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.50.tar.bz2 +Source1002: %{external_url}/libassuan-3.0.1.tar.bz2 Provides: bundled(gpgme) = 1.23.2 -Provides: bundled(libassuan) = 2.5.6 -Provides: bundled(libgpg-error) = 1.47 +Provides: bundled(libassuan) = 3.0.1 +Provides: bundled(libgpg-error) = 1.50 %endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -406,6 +389,8 @@ BuildRequires: cmake(KF6KIO) BuildRequires: cmake(KF6WindowSystem) BuildRequires: pkgconfig(Qt6Core) BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Multimedia) +BuildRequires: pkgconfig(Qt6MultimediaWidgets) BuildRequires: pkgconfig(Qt6Network) BuildRequires: pkgconfig(Qt6Widgets) BuildRequires: pkgconfig(xcb-icccm) @@ -1094,22 +1079,18 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch -P 2 %patch -P 3 -%patch -P 4 %patch -P 6 -p1 %patch -P 9 -p1 %if 0%{?suse_version} < 1500 %patch -P 10 -p1 %patch -P 11 -p1 %endif -%patch -P 14 -p1 %patch -P 15 -p1 %patch -P 990 -p1 %patch -P 991 -p1 %if 0%{?suse_version} < 1550 %patch -P 992 -p1 %endif -%patch -P 993 -p1 -%patch -P 994 -p1 # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 @@ -1139,8 +1120,6 @@ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk if grep -q setSegmentInfoStartVersion /usr/include/CLucene/index/IndexWriter.h ; then %patch -P 995 -p1 fi -# fix build with icu 75.1, remove breaking test breaking rule (bsc#1224309) -sed -i "109d" i18npool/source/breakiterator/data/sent.txt # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile diff --git a/pdfium-6179.tar.bz2 b/pdfium-6179.tar.bz2 deleted file mode 100644 index e9e56fc..0000000 --- a/pdfium-6179.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c -size 9907097 diff --git a/pdfium-6425.tar.bz2 b/pdfium-6425.tar.bz2 new file mode 100644 index 0000000..72d2879 --- /dev/null +++ b/pdfium-6425.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c +size 9931138 diff --git a/pdfium-optional.patch b/pdfium-optional.patch deleted file mode 100644 index 523abde..0000000 --- a/pdfium-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- external/pdfium/annot.patch.1 -+++ external/pdfium/annot.patch.1 -@@ -2,6 +2,17 @@ diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp - index bc1f7f7eb..075baf1df 100644 - --- a/fpdfsdk/fpdf_annot.cpp - +++ b/fpdfsdk/fpdf_annot.cpp -+@@ -8,6 +8,10 @@ -+ #include -+ #include -+ #include -++#ifdef USE_SYSTEM_ABSEIL -++#include -++#include -++#endif -+ -+ #include "constants/annotation_common.h" -+ #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h" - @@ -1366,6 +1366,42 @@ FPDFAnnot_GetFontSize(FPDF_FORMHANDLE hHandle, - return true; - } -@@ -32,7 +40,7 @@ index bc1f7f7eb..075baf1df 100644 - + if (!pWidget) - + return false; - + --+ std::optional text_color = pWidget->GetTextColor(); -++ absl::optional text_color = pWidget->GetTextColor(); - + if (!text_color) - + return false; - + diff --git a/poppler-23.09.0.tar.xz b/poppler-23.09.0.tar.xz deleted file mode 100644 index effe959..0000000 --- a/poppler-23.09.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55 -size 1888836 diff --git a/poppler-24.06.0.tar.xz b/poppler-24.06.0.tar.xz new file mode 100644 index 0000000..206edb5 --- /dev/null +++ b/poppler-24.06.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76 +size 1910016 diff --git a/tiff-4.6.0.tar.xz b/tiff-4.6.0.tar.xz deleted file mode 100644 index 69e233d..0000000 --- a/tiff-4.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2 -size 2124388 diff --git a/tiff-4.6.0t.tar.xz b/tiff-4.6.0t.tar.xz new file mode 100644 index 0000000..d5fb8b8 --- /dev/null +++ b/tiff-4.6.0t.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b +size 2336816 diff --git a/use-fixmath-shared-library.patch b/use-fixmath-shared-library.patch deleted file mode 100644 index 4e57060..0000000 --- a/use-fixmath-shared-library.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: libreoffice-7.5.0.2/configure.ac -=================================================================== ---- libreoffice-7.5.0.2.orig/configure.ac -+++ libreoffice-7.5.0.2/configure.ac -@@ -10559,7 +10559,7 @@ if test "$with_system_libfixmath" = "yes - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([libfixmath/fix16.hpp], [], - [AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], []) -- AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) -+ AC_SEARCH_LIBS([fix16_mul], [fixmath libfixmath], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) - AC_LANG_POP([C++]) - else - AC_MSG_RESULT([internal]) -Index: libreoffice-7.5.0.2/tools/Library_tl.mk -=================================================================== ---- libreoffice-7.5.0.2.orig/tools/Library_tl.mk -+++ libreoffice-7.5.0.2/tools/Library_tl.mk -@@ -115,7 +115,7 @@ endif - - ifeq ($(SYSTEM_LIBFIXMATH),TRUE) - $(eval $(call gb_Library_add_libs,tl,\ -- -llibfixmath \ -+ -lfixmath \ - )) - endif - -Index: libreoffice-7.5.0.2/vcl/Library_vcl.mk -=================================================================== ---- libreoffice-7.5.0.2.orig/vcl/Library_vcl.mk -+++ libreoffice-7.5.0.2/vcl/Library_vcl.mk -@@ -572,7 +572,7 @@ vcl_headless_freetype_code=\ - - ifeq ($(SYSTEM_LIBFIXMATH),TRUE) - $(eval $(call gb_Library_add_libs,vcl,\ -- -llibfixmath \ -+ -lfixmath \ - )) - endif -