From a48e55a8ebe06785b95ed8a8c424ec2c03e88c82 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 6 Mar 2017 11:53:20 +0300 Subject: [PATCH] libreoffice:v.bump to 5.3.1.1 --- office/libreoffice/libreoffice/actions.py | 61 +++++++-- .../libreoffice/files/disable_libe-book.patch | 118 ++++++++++++++++++ office/libreoffice/libreoffice/pspec.xml | 85 +++++++++++-- 3 files changed, 241 insertions(+), 23 deletions(-) create mode 100644 office/libreoffice/libreoffice/files/disable_libe-book.patch diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index e4b00fff27..23e26a51e8 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -21,7 +21,7 @@ if get.buildTYPE() == "i686": shelltools.system('sed -i -e /CppunitTest_sd_import_tests/d sd/Module_sd.mk') def setup(): - shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') + #shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir) shelltools.export("LO_PREFIX", "/usr") shelltools.export("PYTHON", "python3.6") @@ -29,49 +29,84 @@ def setup(): shelltools.touch("autogen.lastrun") shelltools.system('sed -e "/distro-install-file-lists/d" -i Makefile.in') - #shelltools.system('sed -e "/ustrbuf/a #include " \ - ###-i svl/source/misc/gridprinter.cxx') - shelltools.system('./autogen.sh \ - --prefix=/usr \ + shelltools.system('./autogen.sh \ + --prefix=/usr \ --sysconfdir=/etc \ --with-vendor="Pisi Linux" \ - --with-lang="ALL" \ - --enable-gtk3 \ - --with-help \ - --with-myspell-dicts \ - --with-alloc=system \ + --with-lang="ALL" \ + --enable-gtk3 \ + --with-help \ + --with-myspell-dicts \ + --with-alloc=system \ --with-java \ --without-system-dicts \ + --without-fonts \ --disable-postgresql-sdbc \ + --disable-firebird-sdbc \ + --disable-coinmp \ + --disable-systray \ + --without-system-hsqldb \ --enable-release-build=yes \ --enable-python=system \ + --with-system-apr \ --with-system-boost \ - --with-system-curl \ --with-system-cairo \ + --with-system-clucene \ + --with-system-cppunit \ + --with-system-curl \ --with-system-expat \ + --with-system-graphite \ + --with-system-glew \ + --with-system-glm \ --with-system-harfbuzz \ + --with-system-hunspell \ --with-system-icu \ --with-system-jpeg \ --with-system-lcms2 \ + --with-system-libcdr \ + --without-system-libcmis \ + --with-system-libetonyek \ + --with-system-libmspub \ + --with-system-libodfgen \ + --with-system-libpagemaker \ --with-system-libpng \ + --with-system-librevenge \ + --with-system-libvisio \ + --with-system-libwpd \ + --with-system-libwpg \ + --with-system-libwps \ --with-system-libxml \ + --with-system-mdds \ + --with-system-liblangtag \ + --without-system-libstaroffice \ + --without-system-libzmf \ + --with-system-neon \ --with-system-nss \ + --with-system-odbc \ + --with-system-openldap \ --with-system-openssl \ + --without-system-orcus \ --with-system-poppler \ + --with-system-postgresql \ + --with-system-redland \ + --with-system-serf \ + --without-system-ucpp \ --with-system-zlib \ + --with-system-libetonyek \ --enable-scripting-beanshell \ --enable-scripting-javascript \ --disable-odk \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ - --disable-firebird-sdbc \ --with-jdk-home=/usr/lib/jvm/java-7-openjdk \ + --with-external-tar=external/tarballs \ --with-gdrive-client-id=413772536636.apps.googleusercontent.com \ --with-gdrive-client-secret=0ZChLK6AxeA3Isu96MkwqDR4 \ --with-parallelism=%s' % (get.makeJOBS().replace("-j",""))) + def build(): - autotools.make("build-nocheck") + autotools.make("verbose=true build-nocheck") def install(): autotools.rawInstall("DESTDIR=%s distro-pack-install" % get.installDIR()) diff --git a/office/libreoffice/libreoffice/files/disable_libe-book.patch b/office/libreoffice/libreoffice/files/disable_libe-book.patch new file mode 100644 index 0000000000..3e043d4820 --- /dev/null +++ b/office/libreoffice/libreoffice/files/disable_libe-book.patch @@ -0,0 +1,118 @@ +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 @@ + + libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) + +-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) +-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) +- + 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 @@ + $(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,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 @@ + writer_OOXML \ + writer_OOXML_Template \ + writer_layout_dump_xml \ +- writer_BroadBand_eBook \ +- writer_FictionBook_2 \ +- writer_PalmDoc \ +- writer_Plucker_eBook \ + writer_ApplePages \ + MWAW_Text_Document \ + Palm_Text_Document \ +@@ -391,10 +387,6 @@ + OOXML_Text \ + OOXML_Text_Template \ + writer_layout_dump \ +- BroadBand_eBook \ +- FictionBook_2 \ +- PalmDoc \ +- Plucker_eBook \ + 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 @@ + $(eval $(call gb_Library_use_externals,wpftwriter,\ + abw \ + boost_headers \ +- ebook \ + etonyek \ + icu_headers \ + icui18n \ +@@ -67,7 +66,6 @@ + + $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ + writerperfect/source/writer/AbiWordImportFilter \ +- writerperfect/source/writer/EBookImportFilter \ + 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 +@@ -29,9 +29,6 @@ + ((minor) > (req_minor) \ + || ((minor) == (req_minor) && ((micro) >= (req_micro))))) + +-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ +- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro) +- + #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 @@ + + void WpftWriterFilterTest::test() + { +- const writerperfect::test::WpftOptionalMap_t aEBookOptional +- { +- {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)}, +- }; + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional + { + {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, +@@ -58,7 +54,6 @@ + }; + + doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); +- doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); + 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 +@@ -38,11 +38,6 @@ + + + +- +- +- +- + + diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 2670559dd9..26cdaaead1 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,19 +13,58 @@ 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.0/libreoffice-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.0.3.tar.xz - http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.0.3.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-help-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-dictionaries-5.3.1.1.tar.xz + http://download.documentfoundation.org/libreoffice/src/5.3.0/libreoffice-translations-5.3.1.1.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 + You_make_ME_sandwich.patch 0001-right-click-to-insert-image.patch - 0001-gtk3-implement-opengl-support-for-slideshow.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 ant @@ -35,7 +74,7 @@ curl-devel glew-devel libXt-devel - lcms2-devel + lcms2-devel boost-devel libSM-devel jdk7-openjdk @@ -61,12 +100,38 @@ gtk2-devel libatomic_ops-devel librsvg-devel - unixODBC-devel - serf-devel + unixODBC-devel + serf-devel gobject-introspection-devel graphite2-devel librevenge-devel mesa-devel + neon-devel + clucene-devel + apr-devel + mesa-glu-devel + icu4c-devel + gnutls-devel + postgresql-lib + libetonyek-devel + libvisio-devel + doxygen + liblangtag-devel + mdds-devel + glew-devel + glm + cppunit-devel + hunspell-devel + libcdr-devel + libmspub-devel + libodfgen-devel + libpagemaker-devel + libwpd-devel + libwpg-devel + libwps-devel + raptor2-devel + rasqal-devel + redland-devel @@ -3122,8 +3187,8 @@ - 2017-02-22 - 5.3.0.3 + 2017-03-05 + 5.3.1.1 Release Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org