diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index 810c2bb8e2..343dc0f311 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -56,7 +56,6 @@ def setup(): --with-system-curl \ --with-system-expat \ --with-system-graphite \ - --with-system-glew \ --with-system-glm \ --with-system-harfbuzz \ --with-system-hunspell \ @@ -104,7 +103,7 @@ def setup(): --with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \ --with-parallelism=%s' % (get.makeJOBS().replace("-j",""))) - +#--with-system-glew \ def build(): autotools.make("build-nocheck") diff --git a/office/libreoffice/libreoffice/files/disable_libe-book.patch b/office/libreoffice/libreoffice/files/disable_libe-book.patch index 3e043d4820..291f2c1e5d 100644 --- a/office/libreoffice/libreoffice/files/disable_libe-book.patch +++ b/office/libreoffice/libreoffice/files/disable_libe-book.patch @@ -1,7 +1,24 @@ -diff -Nuar libreoffice-5.3.0.3/configure.ac libreoffice/configure.ac ---- libreoffice-5.3.0.3/configure.ac 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/configure.ac 2017-03-03 11:25:53.765271189 +0300 -@@ -7875,9 +7875,6 @@ +From d5a09cb1c8f61e2cfc60d8a1dfe57c1ed0a45cdc Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 21 Aug 2014 16:10:51 +0200 +Subject: [PATCH] disable libe-book support + +Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4 +--- + configure.ac | 6 ------ + external/Module_external.mk | 1 - + filter/Configuration_filter.mk | 8 -------- + writerperfect/Library_wpftwriter.mk | 2 -- + writerperfect/qa/unit/WpftImportTestBase.hxx | 3 --- + writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- + writerperfect/source/writer/wpftwriter.component | 5 ----- + 7 files changed, 30 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5ec9ae6..7aed2ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7796,9 +7796,6 @@ AS_IF([test "$COM" = "MSC"], libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) @@ -11,21 +28,23 @@ diff -Nuar libreoffice-5.3.0.3/configure.ac libreoffice/configure.ac libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) -diff -Nuar libreoffice-5.3.0.3/external/Module_external.mk libreoffice/external/Module_external.mk ---- libreoffice-5.3.0.3/external/Module_external.mk 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/external/Module_external.mk 2017-03-03 11:26:43.746274226 +0300 -@@ -36,7 +36,6 @@ +diff --git a/external/Module_external.mk b/external/Module_external.mk +index 55fce1f..2f53503 100644 +--- a/external/Module_external.mk ++++ b/external/Module_external.mk +@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CPPUNIT,cppunit) \ $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CURL,curl) \ - $(call gb_Helper_optional,EBOOK,libebook) \ $(call gb_Helper_optional,EPM,epm) \ + $(call gb_Helper_optional,EPOXY,epoxy) \ $(call gb_Helper_optional,ETONYEK,libetonyek) \ - $(call gb_Helper_optional,EXPAT,expat) \ -diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter/Configuration_filter.mk ---- libreoffice-5.3.0.3/filter/Configuration_filter.mk 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/filter/Configuration_filter.mk 2017-03-03 11:28:16.996279891 +0300 -@@ -345,10 +345,6 @@ +diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk +index 5dd20f7..d3dc749 100644 +--- a/filter/Configuration_filter.mk ++++ b/filter/Configuration_filter.mk +@@ -345,10 +345,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu writer_OOXML \ writer_OOXML_Template \ writer_layout_dump_xml \ @@ -36,7 +55,7 @@ diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter writer_ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ -@@ -391,10 +387,6 @@ +@@ -390,10 +386,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters OOXML_Text \ OOXML_Text_Template \ writer_layout_dump \ @@ -47,10 +66,11 @@ diff -Nuar libreoffice-5.3.0.3/filter/Configuration_filter.mk libreoffice/filter ApplePages \ MWAW_Text_Document \ Palm_Text_Document \ -diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/writerperfect/Library_wpftwriter.mk ---- libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/writerperfect/Library_wpftwriter.mk 2017-03-03 11:30:32.317288112 +0300 -@@ -49,7 +49,6 @@ +diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk +index 9ec43c4..48cbd52 100644 +--- a/writerperfect/Library_wpftwriter.mk ++++ b/writerperfect/Library_wpftwriter.mk +@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\ abw \ boost_headers \ @@ -58,7 +78,7 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/w etonyek \ icu_headers \ icui18n \ -@@ -67,7 +66,6 @@ +@@ -65,7 +64,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ writerperfect/source/writer/AbiWordImportFilter \ @@ -66,9 +86,10 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/Library_wpftwriter.mk libreoffice/w writerperfect/source/writer/MSWorksImportFilter \ writerperfect/source/writer/MWAWImportFilter \ writerperfect/source/writer/PagesImportFilter \ -diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx ---- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/writerperfect/qa/unit/WpftImportTestBase.hxx 2017-03-03 11:31:44.484292497 +0300 +diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx +index ce70172..d73d435 100644 +--- a/writerperfect/qa/unit/WpftFilterFixture.hxx ++++ b/writerperfect/qa/unit/WpftFilterFixture.hxx @@ -29,9 +29,6 @@ ((minor) > (req_minor) \ || ((minor) == (req_minor) && ((micro) >= (req_micro))))) @@ -79,10 +100,11 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftImportTestBase.hxx libr #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) -diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx ---- libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/writerperfect/qa/unit/WpftWriterFilterTest.cxx 2017-03-03 11:33:22.738298466 +0300 -@@ -31,10 +31,6 @@ +diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx +index 99a6ab1..7de2c18 100644 +--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx ++++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx +@@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() void WpftWriterFilterTest::test() { @@ -93,7 +115,7 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx li const writerperfect::test::WpftOptionalMap_t aEtonyekOptional { {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, -@@ -58,7 +54,6 @@ +@@ -52,7 +48,6 @@ void WpftWriterFilterTest::test() }; doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); @@ -101,9 +123,10 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/qa/unit/WpftWriterFilterTest.cxx li doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional); doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional); -diff -Nuar libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component libreoffice/writerperfect/source/writer/wpftwriter.component ---- libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component 2017-01-27 01:22:46.000000000 +0300 -+++ libreoffice/writerperfect/source/writer/wpftwriter.component 2017-03-03 11:34:21.210302018 +0300 +diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component +index 4c5f37f..d815802 100644 +--- a/writerperfect/source/writer/wpftwriter.component ++++ b/writerperfect/source/writer/wpftwriter.component @@ -38,11 +38,6 @@ @@ -116,3 +139,5 @@ diff -Nuar libreoffice-5.3.0.3/writerperfect/source/writer/wpftwriter.component +-- +2.9.3 diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index c690f8f225..fb59d6bc3e 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,57 +13,69 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-5.3.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-dictionaries-5.3.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-help-5.3.2.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-translations-5.3.2.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-5.4.0.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-dictionaries-5.4.0.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-help-5.4.0.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.4.0/libreoffice-translations-5.4.0.3.tar.xz - http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz - http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz - http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2 - http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 - http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2 - http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2 - http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz - http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip - http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz - http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 - http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz - http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 - http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2 - http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2 - http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2 - http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz - http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz - http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar - http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz + http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz + http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + http://dev-www.libreoffice.org/src/language-subtag-registry-2015-08-04.tar.bz2 + http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 + http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2 + http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2 + http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz + http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip + http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz + http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 + http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz + http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 + http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2 + http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2 + http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2 + http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz + http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz + + http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2 + http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz + http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz + http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2 + http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz + http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz + http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2 + http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2 + http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2 + + + http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar + http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - You_make_ME_sandwich.patch + - 0001-right-click-to-insert-image.patch + 0001-installation-fix.patch - 0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch + 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch - 0001-Related-rhbz-1422353-make-writer-behave-like-calc-an.patch + disable_libe-book.patch @@ -148,6 +160,7 @@ mesa nspr zlib + bzip2 cairo expat glib2 @@ -155,12 +168,14 @@ lcms2 boost libSM + libXt pango libICE python3 libXext libxml2 libxslt + openssl poppler freetype harfbuzz @@ -195,7 +210,7 @@ libcdr libmspub libpagemaker - raptor2 + rasqal redland @@ -3202,10 +3217,17 @@ + + 2017-08-01 + 5.4.0.3 + Version Bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + - 2017-06-20 + 2017-04-10 5.3.2.2 - Release Bump. + Release Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org