From 57b6e912d66fb93190f7eaad3eba2833e803861b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 12 Aug 2022 15:41:30 +0100 Subject: [PATCH] fix layout tests when using --without-fonts --- ...h-substitution-asserts-when-using-wi.patch | 87 +++++++++++++++++++ libreoffice.spec | 3 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 0001-fix-various-glyph-substitution-asserts-when-using-wi.patch diff --git a/0001-fix-various-glyph-substitution-asserts-when-using-wi.patch b/0001-fix-various-glyph-substitution-asserts-when-using-wi.patch new file mode 100644 index 0000000..d42167d --- /dev/null +++ b/0001-fix-various-glyph-substitution-asserts-when-using-wi.patch @@ -0,0 +1,87 @@ +From 03c216d82533e0bc6c2351de4762fcc9d02d9863 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 12 Aug 2022 15:02:41 +0100 +Subject: [PATCH] fix various glyph substitution asserts when using + --without-fonts + +Change-Id: I1824e1a4a0ea03ba83e0a02a9436ce7cd728ebc2 +--- + .../layout/data/LIBREOFFICE-UXTSOREL.rtf | Bin 108970 -> 108970 bytes + sw/qa/extras/layout/data/forcepoint100.html | Bin 21531 -> 21528 bytes + sw/qa/extras/layout/data/forcepoint75-1.rtf | Bin 88709 -> 88709 bytes + sw/qa/extras/layout/data/forcepoint76-1.rtf | 6 +++--- + sw/qa/extras/layout/data/forcepoint99.html | Bin 14034 -> 14035 bytes + 5 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sw/qa/extras/layout/data/LIBREOFFICE-UXTSOREL.rtf b/sw/qa/extras/layout/data/LIBREOFFICE-UXTSOREL.rtf +index 7f7c256a86b88d13b0e4cb8ad4eb0431a1c9ae7c..c2afa178dbcb0b471f8316ed523521c197495e86 100644 +GIT binary patch +delta 58 +zcmZ2=nQhf&whg_HnL0YA3pz1YY`>w&D8@Kh{t@f;FnvZd#?1vUUN~%bP-m25LRNCA +F9ssve7HR+h + +delta 58 +zcmZ2=nQhf&whg_HnHoE$3pz1YY`>w&D8@Kh{t@f;FnvZd#?1vUUN~%bP-m25LRNCA +F9ssqc7F+-T + +diff --git a/sw/qa/extras/layout/data/forcepoint100.html b/sw/qa/extras/layout/data/forcepoint100.html +index 6e9b83a6c95e5ac6c9a6a9964c25f3d5ecc429ae..b973c6e8cdbb07d41fbbc45caa901d335125ea69 100644 +GIT binary patch +delta 27 +jcmbQef^o(Q#tmAcleI;SHphw15T6{VE54aemscGCh_VQo + +delta 33 +pcmbQSf^qf=#tmAcjP;YXM2#33Hpht05NGU~%qOd{Sw{Dd8UVHD3S0mH + +diff --git a/sw/qa/extras/layout/data/forcepoint75-1.rtf b/sw/qa/extras/layout/data/forcepoint75-1.rtf +index 04cb7232768fc6761a0b8f5a56ebc52eb90f5dc1..c317e12a05cf2df4f27e3459a4f5b19039474551 100644 +GIT binary patch +delta 33 +pcmZqO%G$b>bwk%*Muo`>>%=!N`fH%isIWYNlaXorWj)4C+5qzB4I2Oe + +delta 33 +pcmZqO%G$b>bwk%*#`?(%>%=!N`fH%iSid}hlaXorWj)4C+5rFL4cPzy + +diff --git a/sw/qa/extras/layout/data/forcepoint76-1.rtf b/sw/qa/extras/layout/data/forcepoint76-1.rtf +index 6536f22b0053..ca77206ff9f4 100644 +--- a/sw/qa/extras/layout/data/forcepoint76-1.rtf ++++ b/sw/qa/extras/layout/data/forcepoint76-1.rtf +@@ -222,7 +222,7 @@ endnote text;}{\*\cs18 \additive \rtlch \af0 \ltrch \f0\super \sbasedon10 \ssemi + }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc2 + \levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-180\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid74590232} + {\list\listtemplateid1954683936{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat3\levelspace0\levelindent0{\leveltext\'03\'00. ;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24\fbias0 \fi-360\li720\jclisttab\tx720\lin720 } +-{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levempace0\mwvelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn47\leveljc0 ++{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levespace0\mwvelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn47\leveljc0 + \leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\ltrch \afs2 \rtlch \f0\fs24 \fi-180\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1 + \levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext + \'02\'04.;}{\levelnumbers\'01;}\rtlch \af0 \ltrch \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc2\levelnfcn47\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\ltrch \afs2 +@@ -1739,7 +1739,7 @@ The letter deals with five themes: + \af0 \ltrch \i\insrsid4342917\charrsid10509721 Job}{\rtlch \af0 \ltrch \insrsid4342917 42:6.}}}{\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 to write words of comfort over the death of the }{\rtlch \ai\af0 \ltrch + \i\insrsid12391429\charrsid1781117 rabbanit }{\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 who + \par }\pard \ltrpar\ql \li0\ri0\sl480\slmult1\widctlpar\intbl\tx360\faauto\adjustright\rin0\lin0\pararsid16192946 {\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 \tab has passed on. And now I come in short to pray to God, the }{\rtlch \af0 \ltrch +-\insrsid16192946\charrsid1781117 C}{\rtlch \af0 \ltrh \insrsid12391429\charrsid1781117 onsoler of Zion, may she go to rest ++\insrsid16192946\charrsid1781117 C}{\rtlch \af0 \ltr h \insrsid12391429\charrsid1781117 onsoler of Zion, may she go to rest + \par }\pard \ltrpar\ql \li0\ri0\sl480\slmult1\widctlpar\intbl\tx360\faauto\adjustright\rin0\lin0\pararsid11084060 {\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 \tab with }{\rtlch \af0 \ltrch \insrsid2239998\charrsid1781117 unworried}{\rtlch \af0 \ltrch + \insrsid12391429\charrsid1781117 , }{\rtlch \af0 \ltrch \insrsid16192946\charrsid1781117 secure}{\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 ladies.}{\rtlch \af0 \ltrch \cs16\super\insrsid12391429\charrsid1781117 \chftn {\footnote \ltrpar + \pard\plain \ltrpar\s15\ql \li0\ri0\sl360\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0\pararsid1276346 \rtlch \af0\afs20\alang1037 \ltrch \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch \af0 \ltrch \cs16\super\insrsid4342917 +@@ -2393,7 +2393,7 @@ world, and that there is no escape from it, a time to cast away agony and a time + \tx360\faauto\adjustright\rin0\lin0\itap0\pararsid1276346 \rtlch \af0\afs20\alang1037 \ltrch \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch \af0 \ltrch \cs16\super\insrsid4342917 \chftn }{\rtlch \af0 \ltrch \insrsid4342917 }{\rtlch \af0 + \ltrch \i\insrsid4342917\charrsid10509721 Job}{\rtlch \af0 \ltrch \insrsid4342917 4:18.}}}{\rtlch \af0 \ltrch \insrsid12391429\charrsid1781117 for they quarreled as did the armies of the heavens, and the great lights withdrew their brightness.}{\rtlch + \af0 \ltrch \cs16\super\insrsid12391429\charrsid1781117 \chftn {\footnote \ltrpar \pard\plain \ltrpar\s15\ql \li0\ri0\sl360\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0\pararsid1276346 \rtlch \af0\afs20\alang1037 \ltrch +-\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch \af0 \ltrch \cs16\super\insrsid4342917 \chftn }{\rtlch \af0 \ltrch \insrsid442917 Stet in the ms. [}{\rtlch \ai\af0 \ltrch \i\insrsid4342917 nokham}{\rtlch \af0 \ltrch \insrsid4342917 ++\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch \af0 \ltrch \cs16\super\insrsid4342917 \chftn }{\rtlch \af0 \ltrch \insrsid44 2917 Stet in the ms. [}{\rtlch \ai\af0 \ltrch \i\insrsid4342917 nokham}{\rtlch \af0 \ltrch \insrsid4342917 + ], should be }{\rtlch \ai\af0 \ltrch \i\insrsid4342917 nogham}{\rtlch \af0 \ltrch \insrsid4342917 . }{\rtlch \af0 \ltrch \i\insrsid4342917\charrsid16335552 Joel}{\rtlch \af0 \ltrch \insrsid4342917 2:10; 4:15.}}}{\rtlch \af0 \ltrch + \insrsid12391429\charrsid1781117 God put Abraham to the test}{\rtlch \af0 \ltrch \insrsid12672551\charrsid1781117 .}{\rtlch \af0 \ltrch \cs16\super\insrsid12391429\charrsid1781117 \chftn {\footnote \ltrpar \pard\plain \ltrpar + \s15\ql \li0\ri0\sl360\slmult1\widctlpar\tx360\faauto\adjustright\rin0\lin0\itap0\pararsid1276346 \rtlch \af0\afs20\alang1037 \ltrch \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp0059 {\rtlch \af0 \ltrch \cs16\super\insrsid4342917 \chftn }{\rtlch +diff --git a/sw/qa/extras/layout/data/forcepoint99.html b/sw/qa/extras/layout/data/forcepoint99.html +index 6eb36a616e261f9ee02d55d170d43d6454689576..a964454f640c361b4adce1caceb270d209e9b5b2 100644 +GIT binary patch +delta 222 +ycmcbVdpUQ*Gd)>__q+Ds#FGQ{B_>PjOA=J2MX`$e`l1w@0d(!=0)r$rMlJvwU3vom + +delta 220 +wcmcbddntFrGdPjOA=J2MX`$e`l1w@0d(!=0)r$r01``%$N&HU + +-- +2.37.1 + diff --git a/libreoffice.spec b/libreoffice.spec index ce34bc2..ebde869 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -266,7 +266,8 @@ Patch6: 0001-some-disable-pdfium-fixes.patch Patch7: 0001-turn-off-font-combobox-preview-if-SAL_ABORT_ON_NON_A.patch Patch8: 0001-Arial-Narrow-Liberation-Sans-Narrow.patch Patch9: 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch -Patch10: 0001-debug-missing-font.patch +Patch10: 0001-fix-various-glyph-substitution-asserts-when-using-wi.patch +Patch11: 0001-debug-missing-font.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch