diff --git a/app-office/libreoffice/libreoffice-24.2.3.1.recipe b/app-office/libreoffice/libreoffice-24.2.3.1.recipe index 4e60cc584..b3bd7c50b 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.1.recipe +++ b/app-office/libreoffice/libreoffice-24.2.3.1.recipe @@ -223,7 +223,7 @@ BUILD_REQUIRES=" devel:libqxp_0.0$secondaryArchSuffix devel:libraptor2$secondaryArchSuffix devel:librdf$secondaryArchSuffix - devel:libreadline$secondaryArchSuffix >= 7 + devel:libreadline$secondaryArchSuffix >= 8 devel:librevenge_0.0$secondaryArchSuffix devel:libsane$secondaryArchSuffix devel:libssl$secondaryArchSuffix @@ -241,16 +241,15 @@ BUILD_REQUIRES=" devel:mdds >= 2.1 " BUILD_PREREQUIRES=" + icu74_tools cmd:aclocal cmd:autoconf + cmd:awk >= 3 cmd:bison cmd:find cmd:flex cmd:fontforge cmd:gcc$secondaryArchSuffix - cmd:genbrk - cmd:genccode - cmd:gencmn cmd:git cmd:gperf cmd:grep diff --git a/app-office/libreoffice/patches/libreoffice-24.2.3.1.patchset b/app-office/libreoffice/patches/libreoffice-24.2.3.1.patchset index 83ca7f0c1..578d8713e 100644 --- a/app-office/libreoffice/patches/libreoffice-24.2.3.1.patchset +++ b/app-office/libreoffice/patches/libreoffice-24.2.3.1.patchset @@ -1,6 +1,6 @@ -From 5fdf380e598f1a29c41f7d704e67b83791716797 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sat, 15 Feb 2020 14:52:59 +0300 +From 4001427ec30201754a00419d3f2b339d545cf6e6 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 17 Feb 2024 23:58:59 +1000 Subject: Make Elementary the default on Haiku @@ -22,9 +22,9 @@ index eb79752..a380bcc 100644 2.43.2 -From cc6a5a6f85b70516ea6b1c9b024e199a281436d4 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Fri, 7 Aug 2020 12:14:40 +0300 +From e3acfd81c556b6c2799ef9ad68c7d6b89d98375c Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 17 Feb 2024 23:59:23 +1000 Subject: Show used vcl backend in About window on Haiku @@ -45,9 +45,9 @@ index e1e12db..9c78078 100644 2.43.2 -From 69042b553ce10521a5c3766de4f711b939960ac9 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Wed, 24 Oct 2018 17:01:34 +0300 +From ee9921d77c842aed6ecb71c69f49e2559de3e431 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 17 Feb 2024 23:59:55 +1000 Subject: Identify Haiku in about window @@ -88,9 +88,9 @@ index 191d87c..949155f 100644 2.43.2 -From f5e101ff40d300a8ff1e7c1c943cefc788e29032 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sat, 15 Feb 2020 15:04:53 +0300 +From f9984fdb655f6edbea24687127219c38f6b8eff9 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 18 Feb 2024 00:00:15 +1000 Subject: Implement ShellExec on Haiku @@ -112,9 +112,9 @@ index 153827a..008a90f 100644 2.43.2 -From fd3243a8cef13cd7dd450938d293a507b57a9529 Mon Sep 17 00:00:00 2001 +From 5efd6ebaa1d149e0cb15f71bfb325acc67f39536 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 11 Aug 2019 11:47:40 +1000 +Date: Sun, 18 Feb 2024 00:00:52 +1000 Subject: Add XP_HAIKU defs for xmlsec @@ -156,9 +156,9 @@ index 615c3eb..5e10e08 100644 2.43.2 -From 8f4ff0582cc8e275855c4b568ff00d5ac1b185ed Mon Sep 17 00:00:00 2001 +From c49dc1ea95a18d5e73223eca7c2aa31e19dac3d6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 8 Feb 2021 21:47:12 +1000 +Date: Sun, 18 Feb 2024 00:03:20 +1000 Subject: Don't use fontconfig @@ -182,15 +182,15 @@ index 19837d5..4704d8b 100644 2.43.2 -From 73bed16462d8b58e3694157e7b5aba54255f00a8 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Fri, 7 Aug 2020 12:47:56 +0300 +From 9b92a800f5db46958eff11c2b20e6d8b72725576 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 18 Feb 2024 00:04:18 +1000 Subject: Revert fstack-protector check removal in 9db11a8ab648f4d04e59e6bb94cd640f64835447 diff --git a/config_host.mk.in b/config_host.mk.in -index 2ac32c2..ef8d8bd 100644 +index 14569b3..58a1bf9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -312,6 +312,7 @@ export HAVE_DLLEXPORTINLINES=@HAVE_DLLEXPORTINLINES@ @@ -202,7 +202,7 @@ index 2ac32c2..ef8d8bd 100644 export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@ export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@ diff --git a/configure.ac b/configure.ac -index a773f80..556341d 100644 +index 7f65586..8593c57 100644 --- a/configure.ac +++ b/configure.ac @@ -1121,6 +1121,7 @@ haiku*) @@ -213,7 +213,7 @@ index a773f80..556341d 100644 test_kf6=yes enable_odk=no enable_coinmp=no -@@ -7374,6 +7375,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then +@@ -7376,6 +7377,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then AC_MSG_RESULT([no]) fi @@ -231,7 +231,7 @@ index a773f80..556341d 100644 AC_MSG_CHECKING([whether $CC_BASE supports atomic functions]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ int v = 0; -@@ -7511,6 +7523,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then +@@ -7513,6 +7525,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then fi AC_SUBST(HAVE_GCC_AVX) @@ -239,7 +239,7 @@ index a773f80..556341d 100644 AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC) AC_SUBST(HAVE_GCC_STACK_CLASH_PROTECTION) -@@ -13227,17 +13240,17 @@ dnl =================================================================== +@@ -13225,17 +13238,17 @@ dnl =================================================================== QT6_CFLAGS="" QT6_LIBS="" @@ -260,7 +260,7 @@ index a773f80..556341d 100644 fi qt6_test_include="QtWidgets/qapplication.h" -@@ -13330,12 +13343,12 @@ then +@@ -13328,12 +13341,12 @@ then for lib_dir in $qt6_libdirs; do if test -z "$qt6_libexec_dirs"; then @@ -311,14 +311,14 @@ index 7ea7a16..b8518db 100644 2.43.2 -From a55ad44fb1c6d8eaf3d051882c9a715202b56d2a Mon Sep 17 00:00:00 2001 +From 5aad806cfcfd258b1df71e65e9da9ba60d58d4ea Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 20 Aug 2021 23:33:13 +1000 +Date: Sun, 18 Feb 2024 00:04:51 +1000 Subject: Qt::Popup window handling diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx -index 24dcb5f..cd8aa52 100644 +index 6aff814..91fdbe0 100644 --- a/vcl/qt5/QtFrame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -139,7 +139,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) @@ -359,9 +359,9 @@ index 996a0a7..dd167a2 100644 2.43.2 -From 13baa536d2d0f6f89fc5d98bbce0d2c4c0f90241 Mon Sep 17 00:00:00 2001 +From dd09c0869f4a230ace5ab2c06aba5f5565527ff1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 4 May 2022 21:46:48 +1000 +Date: Sun, 18 Feb 2024 00:05:09 +1000 Subject: Use Noto Sans as default font @@ -385,9 +385,9 @@ index 26ceda8..a590249 100644 2.43.2 -From 5e382c416089c6ffe88086058789ca18d2bad6ed Mon Sep 17 00:00:00 2001 +From a0fbebabec543068baa0666b4ae5e817a03a0c13 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 6 May 2022 10:55:46 +1000 +Date: Sun, 18 Feb 2024 00:05:33 +1000 Subject: Use system font @@ -436,14 +436,14 @@ index a1138de..fd81fcb 100644 2.43.2 -From 6c03021ef53986689df5d5347c0f05ef98de6f7d Mon Sep 17 00:00:00 2001 +From 76281fdd45aa1a9317e40a8f8a88124cae6d7143 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 17 Oct 2023 13:36:15 +1000 +Date: Sun, 18 Feb 2024 00:05:45 +1000 Subject: Don't use Cairo diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx -index 4880c1b..cfe870a 100644 +index f87cdef..8736077 100644 --- a/vcl/qt5/QtInstance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -220,7 +220,11 @@ OUString QtInstance::constructToolkitID(std::u16string_view sTKname) @@ -462,7 +462,7 @@ index 4880c1b..cfe870a 100644 2.43.2 -From 062ca98d8a5b0cbad98717fb5269c1598368e55a Mon Sep 17 00:00:00 2001 +From 771348f1833b5c72b528b4ef03718ddaf98a2fea Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 18 Mar 2024 20:44:31 +1000 Subject: Add alias for SIGIOT signal @@ -486,3 +486,218 @@ index 50c260f..5bcdd1b 100644 -- 2.43.2 + +From 51398f308642bb8d2ca6f02ac9a7d151974326f6 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. + + +diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt +index ff3f3ea..206e212 100644 +--- 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.43.2 +