| author | Andreas Radke
<andyrtr@archlinux.org> 2023-12-13 21:23:08 UTC |
| committer | Andreas Radke
<andyrtr@archlinux.org> 2023-12-13 21:23:08 UTC |
| parent | ca73f02a2b6b3894224c0440d09f8281527213e0 |
| .SRCINFO | +3 | -1 |
| PKGBUILD | +6 | -1 |
| libreoffice-7.5.8.2-icu-74-compatibility.patch | +218 | -0 |
diff --git a/.SRCINFO b/.SRCINFO index f7ac047..069f2c9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libreoffice-still pkgver = 7.5.9 - pkgrel = 1 + pkgrel = 2 url = https://www.libreoffice.org/ arch = x86_64 license = LGPL3 @@ -143,6 +143,7 @@ pkgbase = libreoffice-still source = make-pyuno-work-with-system-wide-module-install.diff source = 623ea5c.diff source = fix-build-against-system-libxml-2.12.diff + source = libreoffice-7.5.8.2-icu-74-compatibility.patch source = soffice-template.desktop.in source = libreoffice-still.sh source = libreoffice-still.csh @@ -176,6 +177,7 @@ pkgbase = libreoffice-still sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563 sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5 sha256sums = 793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648 + sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599 sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879 sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e sha256sums = 66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff diff --git a/PKGBUILD b/PKGBUILD index 74fd983..0dad510 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') _LOver=7.5.9.2 pkgver=7.5.9 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -62,6 +62,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} make-pyuno-work-with-system-wide-module-install.diff 623ea5c.diff fix-build-against-system-libxml-2.12.diff + libreoffice-7.5.8.2-icu-74-compatibility.patch soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -115,6 +116,7 @@ sha256sums=('372a7a131c940d0984c4fdeb5e03adc389a520a6adc397b649d3f267ad1188d6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5' '793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648' + 'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e' '66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff') @@ -144,6 +146,9 @@ prepare() { # fix build with libxml2 2.12 patch -Np1 -i "${srcdir}"/fix-build-against-system-libxml-2.12.diff + # fix build with icu 74 + patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in diff --git a/libreoffice-7.5.8.2-icu-74-compatibility.patch b/libreoffice-7.5.8.2-icu-74-compatibility.patch new file mode 100644 index 0000000..6ac57a4 --- /dev/null +++ b/libreoffice-7.5.8.2-icu-74-compatibility.patch @@ -0,0 +1,218 @@ +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 <parona@protonmail.com> +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 <parona@protonmail.com> +--- 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 +