Makefile.fetch | 4 ++ Repository.mk | 2 + download.lst | 4 ++ external/more_fonts/ExternalPackage_karla.mk | 19 ++++++++++ external/more_fonts/ExternalPackage_opendyslexic.mk | 19 ++++++++++ external/more_fonts/Module_more_fonts.mk | 4 ++ external/more_fonts/UnpackedTarball_karla.mk | 14 +++++++ external/more_fonts/UnpackedTarball_opendyslexic.mk | 14 +++++++ filter/source/config/fragments/filters/BroadBand_eBook.xcu | 2 - filter/source/config/fragments/filters/ClarisWorks.xcu | 2 - filter/source/config/fragments/filters/ClarisWorks_Calc.xcu | 2 - filter/source/config/fragments/filters/ClarisWorks_Draw.xcu | 2 - filter/source/config/fragments/filters/ClarisWorks_Impress.xcu | 2 - filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu | 2 - filter/source/config/fragments/filters/CorelDrawDocument.xcu | 2 - filter/source/config/fragments/filters/CorelPresentationExchange.xcu | 2 - filter/source/config/fragments/filters/DIF.xcu | 2 - filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu | 2 - filter/source/config/fragments/filters/DocBook_File.xcu | 2 - filter/source/config/fragments/filters/DosWord.xcu | 2 - filter/source/config/fragments/filters/FictionBook_2.xcu | 2 - filter/source/config/fragments/filters/FreehandDocument.xcu | 2 - filter/source/config/fragments/filters/Lotus.xcu | 2 - filter/source/config/fragments/filters/LotusWordPro.xcu | 2 - filter/source/config/fragments/filters/MacWrite.xcu | 2 - filter/source/config/fragments/filters/Mac_Word.xcu | 2 - filter/source/config/fragments/filters/Mac_Works.xcu | 2 - filter/source/config/fragments/filters/Mac_Works_Calc.xcu | 2 - filter/source/config/fragments/filters/Mariner_Write.xcu | 2 - filter/source/config/fragments/filters/PageMakerDocument.xcu | 2 - filter/source/config/fragments/filters/PalmDoc.xcu | 2 - filter/source/config/fragments/filters/Palm_Text_Document.xcu | 2 - filter/source/config/fragments/filters/Plucker_eBook.xcu | 2 - filter/source/config/fragments/filters/QPro.xcu | 2 - filter/source/config/fragments/filters/QXPDocument.xcu | 2 - filter/source/config/fragments/filters/StarOffice_Drawing.xcu | 2 - filter/source/config/fragments/filters/StarOffice_Presentation.xcu | 2 - filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu | 2 - filter/source/config/fragments/filters/StarOffice_Writer.xcu | 2 - filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu | 2 - filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu | 2 - filter/source/config/fragments/filters/UOF_presentation.xcu | 2 - filter/source/config/fragments/filters/UOF_spreadsheet.xcu | 2 - filter/source/config/fragments/filters/UOF_text.xcu | 2 - filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu | 2 - filter/source/config/fragments/filters/WPS_QPro_Calc.xcu | 2 - filter/source/config/fragments/filters/WordPerfect.xcu | 2 - filter/source/config/fragments/filters/WordPerfectGraphics.xcu | 2 - filter/source/config/fragments/filters/WriteNow.xcu | 2 - filter/source/config/fragments/filters/ZMFDocument.xcu | 2 - officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 - readlicense_oo/license/license.xml | 14 +++++++ solenv/flatpak-manifest.in | 6 +++ 53 files changed, 143 insertions(+), 43 deletions(-)
New commits: commit 505944a120814868b5393a7f406cae7276af827c Author: Andras Timar <[email protected]> AuthorDate: Wed Apr 25 15:30:38 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:36:33 2020 +0200 [cp] StarOffice XML is not exotic, old binary format is exotic Change-Id: Ie435dda390e434e34ef753b5cb2715ac2252e82e Reviewed-on: https://gerrit.libreoffice.org/53450 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu index f820fe0965a3..a367a5bd909a 100644 --- a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Drawing" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Draw.StarOfficeDrawImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Presentation.xcu b/filter/source/config/fragments/filters/StarOffice_Presentation.xcu index 7179379d74d6..ce591c60e126 100644 --- a/filter/source/config/fragments/filters/StarOffice_Presentation.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Presentation.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Presentation" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Impress.StarOfficePresentationImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu b/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu index d6ac85576aca..dda317a24083 100644 --- a/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Spreadsheet" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Calc.StarOfficeCalcImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Writer.xcu b/filter/source/config/fragments/filters/StarOffice_Writer.xcu index 9522d73b0374..f27ee757ecd4 100644 --- a/filter/source/config/fragments/filters/StarOffice_Writer.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Writer.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Writer" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.StarOfficeWriterImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index 344843043b7c..4c33a806fd9d 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="StarOffice XML (Base)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION EXOTIC</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu index ba7db694d6ca..ee3638bc0cc8 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="StarOffice XML (Writer)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION EXOTIC</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> commit bec1bd113d2d73b62d2b1f4ad634a32320d32a86 Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:14:47 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:35:53 2020 +0200 [cp] Display warning at attempted loading of exotic file format Change-Id: I5dbf0545230795806aa3eb28e0a9e6170d916de2 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 88f4a234303e..751876f6a556 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2521,7 +2521,7 @@ </info> </enumeration> </constraints> - <value>2</value> + <value>1</value> </prop> <prop oor:name="EnableExpertConfiguration" oor:type="xs:boolean" oor:nillable="false"> <info> commit 6286792607ed3528fa1f88c6c91d50b87278147a Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:12:32 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:35:31 2020 +0200 [cp] Flag a few more import filters as EXOTIC Change-Id: I171efc7e533039ab61d7ae607673aaf81d88c73d diff --git a/filter/source/config/fragments/filters/BroadBand_eBook.xcu b/filter/source/config/fragments/filters/BroadBand_eBook.xcu index 3a54aed07d92..cb53d790c5dc 100644 --- a/filter/source/config/fragments/filters/BroadBand_eBook.xcu +++ b/filter/source/config/fragments/filters/BroadBand_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="BroadBand eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu b/filter/source/config/fragments/filters/ClarisWorks.xcu index 8288c34ff66f..788bd9bd2f32 100644 --- a/filter/source/config/fragments/filters/ClarisWorks.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu index a6f817dc26ae..4fa8d5e1b8f2 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu index e69354c3ffc2..5fa846dfa188 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu index 9318c5d95376..9e220ba6d815 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Impress" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu index 17b80242229b..b0ffab33d1d8 100644 --- a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu +++ b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Claris_Resolve_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 14b6e2806ca3..8ee043694f84 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Draw Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CDRImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu index 0a402d2ea633..47fdabc06c81 100644 --- a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu +++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Presentation Exchange" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CMXImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DIF.xcu b/filter/source/config/fragments/filters/DIF.xcu index c075ff97797c..ba1a84850889 100644 --- a/filter/source/config/fragments/filters/DIF.xcu +++ b/filter/source/config/fragments/filters/DIF.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DIF" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN EXOTIC</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu index 652ee10e2c58..0059a539f4b0 100644 --- a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu +++ b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DXF - AutoCAD Interchange" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index da278f4c688f..9b37f1eac5e7 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">DocBook</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/DosWord.xcu b/filter/source/config/fragments/filters/DosWord.xcu index 697032c91e4e..d94cb04a9dc8 100644 --- a/filter/source/config/fragments/filters/DosWord.xcu +++ b/filter/source/config/fragments/filters/DosWord.xcu @@ -8,7 +8,7 @@ <node oor:name="DosWord" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER</value> + <value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MSWorksImportFilter</value> diff --git a/filter/source/config/fragments/filters/FictionBook_2.xcu b/filter/source/config/fragments/filters/FictionBook_2.xcu index 68e4c1c34841..bef1d1a0d68c 100644 --- a/filter/source/config/fragments/filters/FictionBook_2.xcu +++ b/filter/source/config/fragments/filters/FictionBook_2.xcu @@ -9,7 +9,7 @@ <node oor:name="FictionBook 2" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/FreehandDocument.xcu b/filter/source/config/fragments/filters/FreehandDocument.xcu index 4502ac0ce697..656b443c0391 100644 --- a/filter/source/config/fragments/filters/FreehandDocument.xcu +++ b/filter/source/config/fragments/filters/FreehandDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="Freehand Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.FreehandImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Lotus.xcu b/filter/source/config/fragments/filters/Lotus.xcu index 44bf3a89c548..c3c9370953ba 100644 --- a/filter/source/config/fragments/filters/Lotus.xcu +++ b/filter/source/config/fragments/filters/Lotus.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Lotus" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/LotusWordPro.xcu b/filter/source/config/fragments/filters/LotusWordPro.xcu index 8b065b0c2fd2..074b6cd88a4b 100644 --- a/filter/source/config/fragments/filters/LotusWordPro.xcu +++ b/filter/source/config/fragments/filters/LotusWordPro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="LotusWordPro" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.LotusWordProImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/MacWrite.xcu b/filter/source/config/fragments/filters/MacWrite.xcu index 79a297f336b2..cfe91f5a3cea 100644 --- a/filter/source/config/fragments/filters/MacWrite.xcu +++ b/filter/source/config/fragments/filters/MacWrite.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacWrite" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Word.xcu b/filter/source/config/fragments/filters/Mac_Word.xcu index 64d2edb2b7ae..f23ad5382311 100644 --- a/filter/source/config/fragments/filters/Mac_Word.xcu +++ b/filter/source/config/fragments/filters/Mac_Word.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Word" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works.xcu b/filter/source/config/fragments/filters/Mac_Works.xcu index beb2eadea3cb..b74b50934b90 100644 --- a/filter/source/config/fragments/filters/Mac_Works.xcu +++ b/filter/source/config/fragments/filters/Mac_Works.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu index ec3b959d227d..a18a7431b41d 100644 --- a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mariner_Write.xcu b/filter/source/config/fragments/filters/Mariner_Write.xcu index df6689ccca4a..5344c28036f2 100644 --- a/filter/source/config/fragments/filters/Mariner_Write.xcu +++ b/filter/source/config/fragments/filters/Mariner_Write.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mariner_Write" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PageMakerDocument.xcu b/filter/source/config/fragments/filters/PageMakerDocument.xcu index ad45de75b559..afcbce65870e 100644 --- a/filter/source/config/fragments/filters/PageMakerDocument.xcu +++ b/filter/source/config/fragments/filters/PageMakerDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="PageMaker Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.PageMakerImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PalmDoc.xcu b/filter/source/config/fragments/filters/PalmDoc.xcu index 8e612f693f01..6466a595fcc7 100644 --- a/filter/source/config/fragments/filters/PalmDoc.xcu +++ b/filter/source/config/fragments/filters/PalmDoc.xcu @@ -9,7 +9,7 @@ <node oor:name="PalmDoc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/Palm_Text_Document.xcu b/filter/source/config/fragments/filters/Palm_Text_Document.xcu index 4747d3588490..5979b131989d 100644 --- a/filter/source/config/fragments/filters/Palm_Text_Document.xcu +++ b/filter/source/config/fragments/filters/Palm_Text_Document.xcu @@ -9,7 +9,7 @@ <node oor:name="Palm_Text_Document" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/Plucker_eBook.xcu b/filter/source/config/fragments/filters/Plucker_eBook.xcu index b5942780db75..e3ac69ce82b4 100644 --- a/filter/source/config/fragments/filters/Plucker_eBook.xcu +++ b/filter/source/config/fragments/filters/Plucker_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="Plucker eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/QPro.xcu b/filter/source/config/fragments/filters/QPro.xcu index e3242644b84e..b9b000c0550b 100644 --- a/filter/source/config/fragments/filters/QPro.xcu +++ b/filter/source/config/fragments/filters/QPro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Quattro Pro 6.0" oor:op="replace" oor:finalized="true" oor:mandatory="true"> - <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/QXPDocument.xcu b/filter/source/config/fragments/filters/QXPDocument.xcu index b0e6450001c5..cd3acfc399de 100644 --- a/filter/source/config/fragments/filters/QXPDocument.xcu +++ b/filter/source/config/fragments/filters/QXPDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="QXP Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.QXPImportFilter</value></prop> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu index 1f8be437ba6d..6a90a00e099c 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format presentation</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu index 91f564307b9c..50ffb3f6ec98 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format spreadsheet</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu index e4241f1753f3..39cb3e2c7e9a 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu +++ b/filter/source/config/fragments/filters/UOF_text.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format text</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu index 1d141826c229..a982c3acd80b 100644 --- a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_Lotus_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu index f32b11820d82..f307ea3db1ef 100644 --- a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_QPro_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfect.xcu b/filter/source/config/fragments/filters/WordPerfect.xcu index d26c30369df2..35ed5cb850cf 100644 --- a/filter/source/config/fragments/filters/WordPerfect.xcu +++ b/filter/source/config/fragments/filters/WordPerfect.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WordPerfectImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu index 54f4f43db7d1..d98fb20114e7 100644 --- a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu +++ b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect Graphics" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.WPGImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WriteNow.xcu b/filter/source/config/fragments/filters/WriteNow.xcu index 600e5d61713c..c649b51a9e1e 100644 --- a/filter/source/config/fragments/filters/WriteNow.xcu +++ b/filter/source/config/fragments/filters/WriteNow.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WriteNow" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ZMFDocument.xcu b/filter/source/config/fragments/filters/ZMFDocument.xcu index b72449df3e1d..f444d54b3770 100644 --- a/filter/source/config/fragments/filters/ZMFDocument.xcu +++ b/filter/source/config/fragments/filters/ZMFDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="ZMF Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.ZMFImportFilter</value></prop> <prop oor:name="UserData"/> commit 9f4873736482f7b5d0b3f50f9cdabe564495d767 Author: Andras Timar <[email protected]> AuthorDate: Wed Sep 18 15:42:30 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:33:48 2020 +0200 [cp] add OpenDyslexic font Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8 Reviewed-on: https://gerrit.libreoffice.org/79099 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/Makefile.fetch b/Makefile.fetch index f4a9436bfb21..02c5f583375c 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -242,6 +242,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_SC_TARBALL) \ $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_TC_TARBALL) \ ,$(call fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item))) + $(foreach item, \ + $(call fetch_Optional,MORE_FONTS,FONT_OPENDYSLEXIC_TARBALL) \ + ,$(call fetch_Download_item,https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10,$(item))) @mkdir -p $(dir $@) && touch $@ @mkdir -p $(dir $@)/Executable diff --git a/Repository.mk b/Repository.mk index 18f4c7342edd..477d0115c3ac 100644 --- a/Repository.mk +++ b/Repository.mk @@ -986,6 +986,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_libertineg \ fonts_libre_hebrew \ fonts_noto \ + fonts_opendyslexic \ fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ diff --git a/download.lst b/download.lst index 2cf6da47db45..a88c2d6024d9 100644 --- a/download.lst +++ b/download.lst @@ -106,6 +106,8 @@ export FONT_REEM_SHA256SUM := f60c6508d209ce4236d2d7324256c2ffddd480be7e3d602377 export FONT_REEM_TARBALL := ReemKufi-0.7.zip export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip +export FONT_OPENDYSLEXIC_SHA256SUM := ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18478f3c2f96ad9d744975f1 +export FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.9.10-beta-2019.09.16.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d diff --git a/external/more_fonts/ExternalPackage_opendyslexic.mk b/external/more_fonts/ExternalPackage_opendyslexic.mk new file mode 100644 index 000000000000..0afaa9bf5be5 --- /dev/null +++ b/external/more_fonts/ExternalPackage_opendyslexic.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opendyslexic,font_opendyslexic)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opendyslexic,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + OpenDyslexic-Bold-Italic.otf \ + OpenDyslexic-Bold.otf \ + OpenDyslexic-Italic.otf \ + OpenDyslexic-Regular.otf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index 526b06998941..92a9f7297fce 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_reem \ ExternalPackage_scheherazade \ ExternalPackage_EmojiOne_Color \ + ExternalPackage_opendyslexic \ UnpackedTarball_alef \ UnpackedTarball_amiri \ UnpackedTarball_caladea \ @@ -50,6 +51,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_reem \ UnpackedTarball_scheherazade \ UnpackedTarball_EmojiOne_Color \ + UnpackedTarball_opendyslexic \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_opendyslexic.mk b/external/more_fonts/UnpackedTarball_opendyslexic.mk new file mode 100644 index 000000000000..6a8f513deab8 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_opendyslexic.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_opendyslexic)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_opendyslexic,$(FONT_OPENDYSLEXIC_TARBALL),0)) + +# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index af64cc1fe822..f3cb6e7c5b15 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2608,6 +2608,12 @@ <p>This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: <a href="http://scripts.sil.org/OFL";>http://scripts.sil.org/OFL</a></p> <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p> + <h2>OpenDyslexic</h2> + <p>Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|[email protected]), + with Reserved Font Name OpenDyslexic.</p> + <p>Copyright (c) 12/2012 - 2019</p> + <p>This Font Software is licensed under the SIL Open Font License, Version 1.1 as shown below.</p> + <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p> <h2>Reem Kufi</h2> <p>The following software may be included in this product: Reem Kufi fonts. Use of any of this software is governed by the terms of the license below:</p> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 386aa67dc57f..2ad63e46fc89 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -578,6 +578,12 @@ "type": "file", "dest-filename": "external/tarballs/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf" } + { + "url": "https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip";, + "sha256": "ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18478f3c2f96ad9d744975f1", + "type": "file", + "dest-filename": "external/tarballs/opendyslexic-0.9.10-beta-2019.09.16.zip" + } ], "buildsystem": "simple", "build-commands": [ commit 15a55a7d589888649a0b37dcb407b6188580e35e Author: Andras Timar <[email protected]> AuthorDate: Sat Nov 30 18:46:00 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:31:03 2020 +0200 [cp] Put Karla font to install packages Change-Id: Ib7defa621096812c3a3199340b2f5977f4de1a07 diff --git a/Repository.mk b/Repository.mk index 27e9c912b9a0..18f4c7342edd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -980,6 +980,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_emojione_color \ fonts_gentium \ $(if $(MPL_SUBSET),,fonts_kacst) \ + fonts_karla \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ commit 348019cd52a12587c90fe91a34ee6e3b4b227b73 Author: Andras Timar <[email protected]> AuthorDate: Sat Mar 30 23:26:16 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:30:43 2020 +0200 [cp] license: Add Karla font Change-Id: Iccf635787265eff7fdb38bcc1e8936f72edf1075 diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 7ad0a91c67f1..af64cc1fe822 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2470,6 +2470,14 @@ <p>KACST holds the copyright of the included Arabic font which is donated under GPL by KACST.</p> <p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p> </div> + <h2>Karla</h2> + <p>The following software may be included in this product: Karla fonts. Use of any of this software is governed + by the terms of the license below:</p> + <p>Copyright (c) 2011, Jonathan Pinhorn ([email protected]), with Reserved Font Names “Karla” and + “Karla Tamil”.</p> + <p>This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, + and is also available with a FAQ at: <a href="http://scripts.sil.org/OFL";>http://scripts.sil.org/OFL</a></p> + <p><a href="#a__SIL_Open_Font_License__version_1_1">Jump to SIL Open Font License, Version 1.1</a></p> <h2>Liberation</h2> <p>The following software may be included in this product: Liberation fonts. Use of any of this software is governed by the terms of the license below:</p> commit b6c95ffdc5ca5a8c5a1f9a3036eb44c2bddd5d03 Author: Andras Timar <[email protected]> AuthorDate: Mon Mar 19 11:31:55 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:30:02 2020 +0200 [cp] Karla font sha256sum Change-Id: I3da50fd5463b532acea3ebd683a79701ccbfcda1 diff --git a/download.lst b/download.lst index 9667c086998b..2cf6da47db45 100644 --- a/download.lst +++ b/download.lst @@ -57,6 +57,7 @@ export FONT_DEJAVU_TARBALL := 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf- export FONT_GENTIUM_SHA256SUM := 2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc export FONT_GENTIUM_TARBALL := 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip export FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip +export FONT_KARLA_SHA256SUM := 0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba export FONT_LIBERATION_NARROW_SHA256SUM := 8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3 export FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz export FONT_LIBERATION_SHA256SUM := c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45 commit 1aa2c02efbc53c3a46a471d1cac2e67f48c03424 Author: Andras Timar <[email protected]> AuthorDate: Fri Sep 18 14:24:51 2015 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 14:29:36 2020 +0200 [cp] Bundle Karla font (cherry picked from commit 21dc27ab7834fe4d5783a9f4bd412c08cacc26b4) Change-Id: I666665c801367ff760b14b9f474952e9894b4791 diff --git a/Makefile.fetch b/Makefile.fetch index e4d1cfdadf4f..f4a9436bfb21 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -174,6 +174,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_KARLA_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ diff --git a/download.lst b/download.lst index cdfa0050959e..9667c086998b 100644 --- a/download.lst +++ b/download.lst @@ -56,6 +56,7 @@ export FONT_DEJAVU_SHA256SUM := 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a export FONT_DEJAVU_TARBALL := 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip export FONT_GENTIUM_SHA256SUM := 2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc export FONT_GENTIUM_TARBALL := 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip +export FONT_KARLA_TARBALL := 506757f768adb2331881d5186f7286bd-karla.zip export FONT_LIBERATION_NARROW_SHA256SUM := 8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3 export FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz export FONT_LIBERATION_SHA256SUM := c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45 diff --git a/external/more_fonts/ExternalPackage_karla.mk b/external/more_fonts/ExternalPackage_karla.mk new file mode 100644 index 000000000000..580777e50a0c --- /dev/null +++ b/external/more_fonts/ExternalPackage_karla.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_karla,font_karla)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_karla,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Karla-Italic.ttf \ + Karla-Regular.ttf \ + Karla-BoldItalic.ttf \ + Karla-Bold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index c6e56c5b90b7..526b06998941 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_dejavu \ ExternalPackage_gentium \ $(if $(MPL_SUBSET),,ExternalPackage_kacst) \ + ExternalPackage_karla \ ExternalPackage_liberation \ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ @@ -37,6 +38,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_dejavu \ UnpackedTarball_gentium \ $(if $(MPL_SUBSET),,UnpackedTarball_kacst) \ + UnpackedTarball_karla \ UnpackedTarball_liberation \ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ diff --git a/external/more_fonts/UnpackedTarball_karla.mk b/external/more_fonts/UnpackedTarball_karla.mk new file mode 100644 index 000000000000..a65c5bb36801 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_karla.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_karla)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_karla,$(FONT_KARLA_TARBALL))) + +# vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
