From e3b40914072a0d5c2433f9a5f432ba43ea0d5357 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Fri, 16 Aug 2019 09:44:23 +0300 Subject: [PATCH] libreoffice:v.bump to 6.2.6.2 --- office/libreoffice/libreoffice/actions.py | 2 +- .../files/0001-don-t-suppress-crashes.patch | 35 +++++++++++++++++++ office/libreoffice/libreoffice/pspec.xml | 29 +++++++++------ 3 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 office/libreoffice/libreoffice/files/0001-don-t-suppress-crashes.patch diff --git a/office/libreoffice/libreoffice/actions.py b/office/libreoffice/libreoffice/actions.py index 3f2d6e4084..90e5413490 100644 --- a/office/libreoffice/libreoffice/actions.py +++ b/office/libreoffice/libreoffice/actions.py @@ -101,7 +101,7 @@ def setup(): --disable-odk \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ - --with-jdk-home=/usr/lib/jvm/java-7-openjdk \ + --with-jdk-home=/usr/lib/jvm/java-8-openjdk \ --with-external-tar=external/tarballs \ --with-gdrive-client-id=457862564325.apps.googleusercontent.com \ --with-gdrive-client-secret=GYWrDtzyZQZ0_g5YoBCC6F0I \ diff --git a/office/libreoffice/libreoffice/files/0001-don-t-suppress-crashes.patch b/office/libreoffice/libreoffice/files/0001-don-t-suppress-crashes.patch new file mode 100644 index 0000000000..fcd1f1df21 --- /dev/null +++ b/office/libreoffice/libreoffice/files/0001-don-t-suppress-crashes.patch @@ -0,0 +1,35 @@ +From a0e6d2abeed9d64fe7862a7664ba80a6178bf3f2 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 8 Nov 2016 11:50:06 +0100 +Subject: [PATCH] don't suppress crashes + +An automatic restart after a crash makes the crash invisible to abrt. + +Change-Id: I3854e619356049b144b08575879d289a3c12e4c9 +--- + desktop/source/app/app.cxx | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx +index 53365f4..3a3bac8 100644 +--- a/desktop/source/app/app.cxx ++++ b/desktop/source/app/app.cxx +@@ -1312,14 +1312,12 @@ void Desktop::Exception(ExceptionCategory nCategory) + if( bRestart ) + { + RequestHandler::Disable(); +- if( pSignalHandler ) +- osl_removeSignalHandler( pSignalHandler ); + + restartOnMac(false); + if ( m_rSplashScreen.is() ) + m_rSplashScreen->reset(); + +- _exit( EXITHELPER_CRASH_WITH_RESTART ); ++ return; + } + else + { +-- +2.9.3 + diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 5e8c5e2c69..688f134721 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,13 +13,12 @@ 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/6.2.3/libreoffice-6.2.3.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.3/libreoffice-dictionaries-6.2.3.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.3/libreoffice-help-6.2.3.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.3/libreoffice-translations-6.2.3.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.6/libreoffice-6.2.6.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.6/libreoffice-dictionaries-6.2.6.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.6/libreoffice-help-6.2.6.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.6/libreoffice-translations-6.2.6.2.tar.xz - - http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz + http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.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 @@ -73,6 +72,7 @@ make-pyuno-work-with-system-wide-module-install.diff + 0001-don-t-suppress-crashes.patch xz-devel @@ -85,7 +85,7 @@ libXt-devel lcms2-devel libSM-devel - jdk7-openjdk + jdk8-openjdk libX11-devel libICE-devel libxslt-devel @@ -180,7 +180,7 @@ libXinerama libjpeg-turbo gstreamer - jre7-openjdk-headless + jre8-openjdk-headless gtk3 libX11 libgcc @@ -3421,21 +3421,28 @@ - + + 2019-08-15 + 6.2.6.2 + Version Bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + 2019-04-23 6.2.3.2 Version Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org - + 2019-03-26 6.2.2.2 Version Bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org - + 2019-03-12 6.2.1.2 Version Bump to stable version