pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 498632 from LibreOffice:Unstable

Browse Source 
- Version update to 5.4.0.0.beta1:
  * Feature release 5.4 first beta
- Refresh patch disable-flaky-hsqldb-test.patch
- Drop merged patches:
  * bnc959926-Implement-text-rotation-for-Impress-table.patch
  * gi-annotation-syntax.patch

OBS-URL: https://build.opensuse.org/request/show/498632
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=494
This commit is contained in:
Tomáš Chvátal 2017-05-27 11:25:22 +00:00 committed by Git OBS Bridge
parent 9d4fc7319d
commit feb6572b1e
14 changed files with 65 additions and 1887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
size 1794694

1788
bnc959926-Implement-text-rotation-for-Impress-table.patch
View File

File diff suppressed because it is too large Load Diff

12
disable-flaky-hsqldb-test.patch
View File

@ -1,8 +1,8 @@
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 200dea0..66860f0 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -45,16 +45,8 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
Index: libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
===================================================================
--- libreoffice-5.4.0.0.alpha1.orig/dbaccess/Module_dbaccess.mk
+++ libreoffice-5.4.0.0.alpha1/dbaccess/Module_dbaccess.mk
@@ -45,16 +45,8 @@ $(eval $(call gb_Module_add_check_target
CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
@ -16,6 +16,6 @@ index 200dea0..66860f0 100644
-))
-endif
-
# This runs a suite of peformance tests on embedded firebird and HSQLDB.
# This runs a suite of performance tests on embedded firebird and HSQLDB.
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)

64
gi-annotation-syntax.patch
View File

@ -1,64 +0,0 @@
From b0b5c92a77788e451cda8e78d7d9f3362d7b119a Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Fri, 10 Mar 2017 17:34:27 -0600
Subject: [PATCH] tdf#102511: Fix gobject-introspection annotation syntax
---
include/LibreOfficeKit/LibreOfficeKitGtk.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index a2312d6..dd35505 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -42,7 +42,7 @@ GType lok_doc_view_get_type (void) G_GNUC
/**
* lok_doc_view_new:
- * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default
+ * @pPath: (nullable) (allow-none): LibreOffice install path. Pass null to set it to default
* path which in most cases would be $libdir/libreoffice/program
* @cancellable: The cancellable object that you can use to cancel this
* operation.
@@ -56,9 +56,9 @@ GtkWidget* lok_doc_view_new (const gchar*
/**
* lok_doc_view_new_from_user_profile:
- * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default
+ * @pPath: (nullable) (allow-none): LibreOffice install path. Pass null to set it to default
* path which in most cases would be $libdir/libreoffice/program
- * @pUserProfile: (nullable): (allow-none): User profile URL. Must be either a file URL or a
+ * @pUserProfile: (nullable) (allow-none): User profile URL. Must be either a file URL or a
* special vnd.sun.star.pathname URL. Pass non-null to be able to use this
* widget and LibreOffice itself in parallel.
* @cancellable: The cancellable object that you can use to cancel this
@@ -75,7 +75,7 @@ GtkWidget* lok_doc_view_new_from_user_profile (const gchar*
/**
* lok_doc_view_new_from_widget:
* @pDocView: The #LOKDocView instance
- * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments.
+ * @pRenderingArguments: (nullable) (allow-none): lok::Document::initializeForRendering() arguments.
*
* Returns: (transfer none): The #LOKDocView widget instance.
*/
@@ -86,7 +86,7 @@ GtkWidget* lok_doc_view_new_from_widget (LOKDocView*
* lok_doc_view_open_document:
* @pDocView: The #LOKDocView instance
* @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open
- * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments.
+ * @pRenderingArguments: (nullable) (allow-none): lok::Document::initializeForRendering() arguments.
* @cancellable:
* @callback:
* @userdata:
@@ -309,7 +309,7 @@ gboolean lok_doc_view_paste (LOKDocView*
* lok_doc_view_set_document_password:
* @pDocView: The #LOKDocView instance
* @pUrl: the URL of the document to set password for, as sent with signal `password-required`
- * @pPassword: (nullable): (allow-none): the password, NULL for no password
+ * @pPassword: (nullable) (allow-none): the password, NULL for no password
*
* Set the password for password protected documents
*/
--
2.6.6

3
libreoffice-5.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a
size 190216268

3
libreoffice-5.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6052462a2d801d6afa7ba41a16fce061813e62f39bdf83a95f538e1fb9e7abf6
size 192850988

3
libreoffice-help-5.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7
size 2127200

3
libreoffice-help-5.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82d107012d2bb89b148dd03f592b430effaa485fec2d562bd9a8904a8620098f
size 2318580

3
libreoffice-translations-5.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f2d8da74b744bf7749602207b41c92225527ac34a2170601dd4fb9065bba6af
size 140945080

3
libreoffice-translations-5.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8b07aaddcad9251c4cbab9ba7b6330c36c57ee3bf733be53103be632fe613d4
size 135996096

10
libreoffice.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat May 27 11:22:18 UTC 2017 - tchvatal@suse.com
- Version update to 5.4.0.0.beta1:
* Feature release 5.4 first beta
- Refresh patch disable-flaky-hsqldb-test.patch
- Drop merged patches:
* bnc959926-Implement-text-rotation-for-Impress-table.patch
* gi-annotation-syntax.patch
-------------------------------------------------------------------
Mon May 15 15:30:38 UTC 2017 - tchvatal@suse.com

51
libreoffice.spec
View File

@ -22,7 +22,8 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.3
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.3
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# Wether to enable the kde integration
%if 0%{?is_opensuse}
%bcond_without kdeintegration
@ -35,7 +36,7 @@
%bcond_with firebird
%endif
Name: libreoffice
Version: 5.3.3.2
Version: 5.4.0.0.beta1
Release: 0
Summary: A Free Office Suite (Framework)
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@ -54,7 +55,7 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t
Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
# Internal bundled stuff we can't remove
# XMLSec is patched over and over in here
Source2000: %{external_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
Source2000: %{external_url}/xmlsec1-1.2.24.tar.gz
# To build this we would pull cygwin; not worth it
Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
# hsqldb simply does not work with new system version, but luckily we migrate to firebird
@ -67,6 +68,8 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
# Needed for integration tests
Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-3064.tar.bz2
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
Patch0: disable-flaky-hsqldb-test.patch
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
@ -78,10 +81,6 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
# PATCH-FIX-UPSTREAM: merged in 5.4
Patch17: gi-annotation-syntax.patch
# LO-L3: Text not rotated properly in LO Impress tables
Patch18: bnc959926-Implement-text-rotation-for-Impress-table.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -109,14 +108,19 @@ BuildRequires: flex
BuildRequires: flute
BuildRequires: gcc-c++
BuildRequires: glm-devel
# Needed for tests
BuildRequires: dejavu-fonts
# Needed for tests
BuildRequires: google-carlito-fonts
BuildRequires: gperf
BuildRequires: libgpgmepp-devel
BuildRequires: hyphen-devel
# genbrk binary is requires
# genbrk binary is required
BuildRequires: icu
BuildRequires: java-devel >= 1.6
BuildRequires: junit4
BuildRequires: libbase
BuildRequires: libcppunit-devel
BuildRequires: libcppunit-devel >= 1.14.0
%if 0%{?suse_version} >= 1330
BuildRequires: liberation2-fonts
%else
@ -166,9 +170,9 @@ BuildRequires: perl(Archive::Zip)
BuildRequires: perl(Digest::MD5)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(epoxy) >= 1.2
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glew) >= 1.10.0
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(graphite2) >= 0.9.3
@ -187,23 +191,24 @@ BuildRequires: pkgconfig(libcdr-0.1) >= 0.1
BuildRequires: pkgconfig(libclucene-core)
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
BuildRequires: pkgconfig(libeot) >= 0.01
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.4
BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(libgltf-0.0)
BuildRequires: pkgconfig(libgltf-0.1) >= 0.1.0
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.5
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.11
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.12)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libstaroffice-0.0)
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.3
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
BuildRequires: pkgconfig(libwpg-0.3)
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.2
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.6
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libzmf-0.0)
@ -224,6 +229,7 @@ Requires: libreoffice-l10n-en = %{version}
Requires: python3
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
Recommends: dejavu-fonts
Recommends: google-carlito-fonts
%if 0%{?suse_version} >= 1330
Recommends: liberation2-fonts
@ -947,8 +953,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch4
%patch5
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch990 -p1
# Do not generate doxygen timestamp
@ -1009,6 +1013,7 @@ export NOCONFIGURE=yes
./autogen.sh
%configure \
$PARALLEL_BUILD \
--enable-eot \
--enable-mergelibs \
--docdir=%{_docdir}/%{name} \
--with-compat-oowrappers \
@ -1038,7 +1043,6 @@ export NOCONFIGURE=yes
--enable-split-app-modules \
--enable-split-opt-features \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
--enable-python=system \
--enable-randr \
@ -1052,6 +1056,7 @@ export NOCONFIGURE=yes
--with-external-thes-dir=%{_datadir}/mythes \
--without-helppack-integration \
--without-help \
--without-export-validation \
--enable-odk \
%if %{with kdeintegration}
--enable-kde4 \
@ -1082,7 +1087,17 @@ export NOCONFIGURE=yes
# just call make here as we added the jobs in configure
# The check phase is run here too if it is split with nocheck
# install of jars get broken sometimes
make verbose=true build-nocheck
%check
make
unset WITH_LANG
# work around flawed accessibility check
export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
#timeout -k 2m 2h make smoketest.subsequentcheck
# we don't need this anymore
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%install
make DESTDIR=%{buildroot} distro-pack-install
@ -1223,6 +1238,7 @@ for appdata in base calc draw impress writer; do
%endif
rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml
done
echo "%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml" >>file-lists/kde4_list.txt
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
@ -1448,6 +1464,7 @@ exit 0
%files -f file-lists/sdk_list.txt sdk
%defattr(-,root,root)
%dir %{_libdir}/libreoffice/sdk/lib
%files -f file-lists/sdk_doc_list.txt sdk-doc
%defattr(-,root,root)

3
pdfium-3064.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883
size 5515914

3
xmlsec1-1.2.24.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
size 1835762