SHA256
1
0
forked from pool/libreoffice

Accepting request 504708 from LibreOffice:Factory

- Cleanup the License string

- Add patch to fix bsc#1028504:
  * 0001-undo-clone.patch
- Add patch to fix test failure on 32bit:
  * 0001-watermark.patch

- Run tests only on intel 32/64bit

- Version update to 5.4.0.0.beta2:
  * Ton of fixes over beta1
  * Oxygen theme is gone

- Install libreofficekit headers

- Artistic was dropped with vigra

- Switch to normal mirror location

- 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

- Use nss to avoid issues with mixing openssl and nss

OBS-URL: https://build.opensuse.org/request/show/504708
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2017-06-20 09:01:45 +00:00 committed by Git OBS Bridge
commit 1958654808
16 changed files with 294 additions and 1949 deletions

90
0001-undo-clone.patch Normal file
View File

@ -0,0 +1,90 @@
From cd38a25d41e1ce2acad25b1b5b2a5e77239e36ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= <tamas.zolnai@collabora.com>
Date: Mon, 12 Jun 2017 14:34:59 +0200
Subject: tdf#108480: Undo from clone formating does not remove vertical
alignment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In the related change:
d36aa2ba3132ce62a370b7260ca620642cbf7dbf
wrong method was used to set cell properties, which does
not handle undo actions, so use the proper function.
Other issue was related to undo handling of vertical text
alignment in general. In some cases undo actions were lost
after user clicked out of the cell. It is because vertical
alignment is not affecting the outliner and so the related
undo actions were just dropped in EndTextEdit() method.
Change-Id: I3a6a95fac711056a658a3dee616733939cd13330
Reviewed-on: https://gerrit.libreoffice.org/38699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42)
Reviewed-on: https://gerrit.libreoffice.org/38724
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ff71c07..ea521d7 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2228,9 +2228,8 @@ void SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rForma
if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
{
auto pTable = static_cast<const sdr::table::SdrTableObj*>(pObj);
- if (pTable->getActiveCell().is()) {
- SfxItemSet const & rSet = pTable->GetActiveCellItemSet();
- rFormatSet->Put(rSet);
+ if (mxSelectionController.is() && pTable->getActiveCell().is()) {
+ mxSelectionController->GetAttributes(*rFormatSet, false);
}
}
}
@@ -2378,8 +2377,8 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
if( pObj && (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
{
auto pTable = static_cast<sdr::table::SdrTableObj*>(pObj);
- if (pTable->getActiveCell().is()) {
- pTable->SetMergedItemSetAndBroadcastOnActiveCell(rFormatSet);
+ if (pTable->getActiveCell().is() && mxSelectionController.is()) {
+ mxSelectionController->SetAttributes(rFormatSet, false);
}
}
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 4c51d41..ef58d32 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1768,18 +1768,19 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
{
- if(rOutl.IsModified())
+
+ if (GetModel() && GetModel()->IsUndoEnabled() && !mpImpl->maUndos.empty())
{
- if( GetModel() && GetModel()->IsUndoEnabled() )
- {
- // These actions should be on the undo stack after text edit.
- for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
- GetModel()->AddUndo(pAction.release());
- mpImpl->maUndos.clear();
+ // These actions should be on the undo stack after text edit.
+ for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
+ GetModel()->AddUndo(pAction.release());
+ mpImpl->maUndos.clear();
- GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) );
- }
+ GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this));
+ }
+ if(rOutl.IsModified())
+ {
OutlinerParaObject* pNewText = nullptr;
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
sal_Int32 nParaAnz = rOutl.GetParagraphCount();
--
cgit v0.10.2

77
0001-watermark.patch Normal file
View File

@ -0,0 +1,77 @@
From 42353b95629322f51e059337ab06579ffb1c6934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20K=C5=82os?= <szymon.klos@collabora.com>
Date: Fri, 9 Jun 2017 11:10:28 +0200
Subject: Watermark: fix rotation calculation
* when angle > 180 was used calculated value was 0
* values are rounded
Change-Id: I0cade407883a60d8d802b487668882e95f42ddce
Reviewed-on: https://gerrit.libreoffice.org/38597
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 8d6965c..94c066e9 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -266,6 +266,29 @@ void SwEditShell::SetClassification(const OUString& rName, SfxClassificationPoli
}
}
+sal_Int16 lcl_GetAngle(const drawing::HomogenMatrix3& rMatrix)
+{
+ basegfx::B2DHomMatrix aTransformation;
+ basegfx::B2DTuple aScale;
+ basegfx::B2DTuple aTranslate;
+ double fRotate = 0;
+ double fShear = 0;
+
+ aTransformation.set(0, 0, rMatrix.Line1.Column1);
+ aTransformation.set(0, 1, rMatrix.Line1.Column2);
+ aTransformation.set(0, 2, rMatrix.Line1.Column3);
+ aTransformation.set(1, 0, rMatrix.Line2.Column1);
+ aTransformation.set(1, 1, rMatrix.Line2.Column2);
+ aTransformation.set(1, 2, rMatrix.Line2.Column3);
+ aTransformation.set(2, 0, rMatrix.Line3.Column1);
+ aTransformation.set(2, 1, rMatrix.Line3.Column2);
+ aTransformation.set(2, 2, rMatrix.Line3.Column3);
+
+ aTransformation.decompose(aScale, aTranslate, fRotate, fShear);
+ sal_Int16 nDeg = round(basegfx::rad2deg(fRotate));
+ return nDeg < 0 ? round(nDeg) * -1 : round(360.0 - nDeg);
+}
+
SfxWatermarkItem SwEditShell::GetWatermark()
{
SwDocShell* pDocShell = GetDoc()->GetDocShell();
@@ -311,13 +334,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
if (xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor)
aItem.SetColor(nColor);
if (xPropertySet->getPropertyValue("Transformation") >>= aMatrix)
- {
- double y = aMatrix.Line2.Column1;
- double x = aMatrix.Line1.Column1;
- double nRad = atan2(y, x) * -1;
- double nDeg = nRad * 180.0 / F_PI;
- aItem.SetAngle(nDeg);
- }
+ aItem.SetAngle(lcl_GetAngle(aMatrix));
if (xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency)
aItem.SetTransparency(nTransparency);
@@ -374,10 +391,7 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark)
xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor;
xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency;
xPropertySet->getPropertyValue("Transformation") >>= aMatrix;
- double y = aMatrix.Line2.Column1;
- double x = aMatrix.Line1.Column1;
- double nRad = atan2(y, x) * -1;
- nAngle = nRad * 180.0 / F_PI;
+ nAngle = lcl_GetAngle(aMatrix);
// If the header already contains a watermark, see if it its text is up to date.
uno::Reference<text::XTextRange> xTextRange(xWatermark, uno::UNO_QUERY);
--
cgit v0.10.2

View File

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

File diff suppressed because it is too large Load Diff

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)

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Mon Jun 19 13:20:00 UTC 2017 - tchvatal@suse.com
- Cleanup the License string
-------------------------------------------------------------------
Tue Jun 13 13:46:31 UTC 2017 - tchvatal@suse.com
- Add patch to fix bsc#1028504:
* 0001-undo-clone.patch
- Add patch to fix test failure on 32bit:
* 0001-watermark.patch
-------------------------------------------------------------------
Thu Jun 8 14:04:07 UTC 2017 - tchvatal@suse.com
- Run tests only on intel 32/64bit
-------------------------------------------------------------------
Wed Jun 7 08:39:03 UTC 2017 - tchvatal@suse.com
- Version update to 5.4.0.0.beta2:
* Ton of fixes over beta1
* Oxygen theme is gone
-------------------------------------------------------------------
Thu Jun 1 12:15:36 UTC 2017 - tchvatal@suse.com
- Install libreofficekit headers
-------------------------------------------------------------------
Thu Jun 1 12:03:32 UTC 2017 - tchvatal@suse.com
- Artistic was dropped with vigra
-------------------------------------------------------------------
Thu Jun 1 10:05:24 UTC 2017 - tchvatal@suse.com
- Switch to normal mirror location
-------------------------------------------------------------------
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
- Use nss to avoid issues with mixing openssl and nss
-------------------------------------------------------------------
Thu May 11 11:52:17 UTC 2017 - tchvatal@suse.com

View File

@ -22,7 +22,7 @@
%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.4.0
# Wether to enable the kde integration
%if 0%{?is_opensuse}
%bcond_without kdeintegration
@ -35,10 +35,10 @@
%bcond_with firebird
%endif
Name: libreoffice
Version: 5.3.3.2
Version: 5.4.0.0.beta2
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
License: LGPL-3.0+ and MPL-2.0+
Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
@ -54,7 +54,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 +67,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 +80,9 @@ 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
# PATCH-FIX-UPSTREAM taken from git will be in next release
Patch17: 0001-undo-clone.patch
Patch18: 0001-watermark.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -109,14 +110,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: hyphen-devel
# genbrk binary is requires
BuildRequires: libgpgmepp-devel
# 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 +172,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 +193,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 +231,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
@ -246,6 +254,8 @@ Provides: %{name}-ure = %{version}
Obsoletes: %{name}-ure < %{version}
Provides: %{name}-icon-theme-crystal = %{version}
Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x
%if %{with kdeintegration}
@ -284,7 +294,6 @@ example:
%package branding-upstream
Summary: Original Branding for LibreOffice
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
Group: Productivity/Office/Suite
Supplements: packageand(libreoffice:branding-upstream)
Conflicts: otherproviders(libreoffice-branding)
@ -298,7 +307,6 @@ This package includes the original branding for the LibreOffice office suite.
%package icon-theme-breeze
Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default)
License: LGPL-2.1
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
@ -314,7 +322,6 @@ Frameworks by default.
%package icon-theme-galaxy
Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default)
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
@ -328,7 +335,6 @@ This package provides Galaxy LibreOffice icon theme. It is used in the original
%package icon-theme-hicontrast
Summary: Hicontrast LibreOffice Icon Theme
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
@ -341,24 +347,8 @@ BuildArch: noarch
%description icon-theme-hicontrast
This package provides Hicontrast LibreOffice icon theme.
%package icon-theme-oxygen
Summary: Oxygen LibreOffice Icon Theme (KDE4 default)
License: LGPL-3.0 or CC-BY-SA-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:kdebase4-workspace)
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
BuildArch: noarch
%description icon-theme-oxygen
This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by default.
%package icon-theme-sifr
Summary: Sifr LibreOffice Icon Theme
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-breeze
Requires: %{name}-icon-theme-galaxy
@ -374,7 +364,6 @@ This package provides Sifr LibreOffice icon theme.
%package icon-theme-tango
Summary: Tango LibreOffice Icon Theme (GNOME default)
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
@ -390,7 +379,6 @@ and obsoleted the old Industrial theme.
%package glade
Summary: Support for creating LibreOffice dialogs in glade
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
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
BuildArch: noarch
@ -401,7 +389,6 @@ glade and ui-previewer tool to check the visual appearance of dialogs.
%package gdb-pretty-printers
Summary: Additional support for debugging with gdb
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
Group: Productivity/Office/Suite
Requires: gdb
Requires: libreoffice = %{version}
@ -414,7 +401,6 @@ This package provides gdb pretty printers for package %{name}.
%package base
Summary: LibreOffice Base
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
@ -433,7 +419,6 @@ suite.
%package calc
Summary: LibreOffice Calc
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -444,7 +429,6 @@ manage lists in spreadsheets by using LibreOffice office suite.
%package draw
Summary: LibreOffice Draw
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -455,7 +439,6 @@ logos by using LibreOffice office suite.
%package math
Summary: LibreOffice Math
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -466,7 +449,6 @@ equations by using LibreOffice office suite.
%package impress
Summary: LibreOffice Impress
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -477,7 +459,6 @@ meeting and Web pages by using LibreOffice office suite.
%package writer
Summary: LibreOffice Writer and Web
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -488,7 +469,6 @@ reports, documents and Web pages by using LibreOffice office suite.
%package base-drivers-postgresql
Summary: PostgreSQL Database Driver for LibreOffice
License: LGPL-2.1+
Group: Productivity/Office/Suite
Requires: postgresql
@ -497,7 +477,6 @@ This package allows to access PostgreSQL databases from LibreOffice Base.
%package base-drivers-firebird
Summary: Firebird Database Driver for LibreOffice
License: LGPL-2.1+
Group: Productivity/Office/Suite
Requires: firebird
@ -506,7 +485,6 @@ This package allows to access Firebird databeses from LibreOffice Base.
%package filters-optional
Summary: Additional Import and Export Filters for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-calc = %{version}
Requires: %{name}-draw = %{version}
@ -526,7 +504,6 @@ LibreOffice:
%package mailmerge
Summary: Mail Merge Functionality for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-pyuno = %{version}
Supplements: %{name}
@ -537,7 +514,6 @@ to many recipients using LibreOffice office suite.
%package pyuno
Summary: Python UNO Bridge for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Supplements: %{name}
@ -556,7 +532,6 @@ http://udk.openoffice.org/python/python-bridge.html
%package gnome
Summary: GNOME Extensions for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
@ -565,7 +540,6 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice.
%package gtk3
Summary: Gtk3 interface for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version}
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
@ -577,7 +551,6 @@ This package contains Gtk3 interface rendering option for LibreOffice.
%package kde4
Summary: KDE4 Extensions for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
@ -586,7 +559,6 @@ This package contains some KDE4 extensions for LibreOffice.
%package sdk
Summary: LibreOffice SDK
License: LGPL-3.0
Group: Documentation/HTML
Requires: %{name} = %{version}
Requires: gcc-c++
@ -606,7 +578,6 @@ The documentation is in the package libreoffice-sdk-doc
%package sdk-doc
Summary: LibreOffice SDK Documentation
License: LGPL-3.0
Group: Development/Libraries/Other
Suggests: %{name}-sdk = %{version}
Enhances: %{name}-sdk = %{version}
@ -619,7 +590,6 @@ Software Development Kit (SDK).
%package officebean
Summary: OfficeBean Java Bean component for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
%ifarch %arm %ix86 ppc
@ -649,7 +619,6 @@ appearance and behavior.
Summary: MySQL Database Driver for LibreOffice
# This mysql thing is just dlopened
# WARNING: the soname might change!
License: GPL-2.0 and LGPL-3.0
Group: Productivity/Office/Suite
Requires: libmysqlclient_r18
Requires: libreoffice-base = %{version}
@ -661,7 +630,6 @@ This package allows to access MySQL databases from LibreOffice Base.
%package calc-extensions
Summary: LibreOffice Calc Extensions
License: LGPL-2.1+ and LGPL-3.0
Group: Productivity/Office/Suite
Requires: libreoffice-calc = %{version}
# pyuno is needed for the numbertext extension
@ -684,7 +652,6 @@ This package provides extensions for LibreOffice Calc:
%package writer-extensions
Summary: LibreOffice Writer Extensions
License: Apache-2.0 and LGPL-3.0 and CDDL-1.0
Group: Productivity/Office/Suite
Requires: libreoffice-writer = %{version}
Requires(pre): libreoffice = %{version}
@ -703,7 +670,6 @@ This package provides extensions for LibreOffice Writer:
%package -n libreofficekit
Summary: A library providing access to LibreOffice functionality
License: MPL-2.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
@ -713,7 +679,6 @@ through C/C++, without any need to use UNO.
%package -n libreofficekit-devel
Summary: Development files for libreofficekit
License: MPL-2.0
Group: Productivity/Office/Suite
Requires: libreofficekit = %{version}
@ -955,15 +920,6 @@ Provides additional %{langname} translations and resources for %{project}. \
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
# bypass test failure tracked by upstream bug
# https://bugs.documentfoundation.org/show_bug.cgi?id=105519
%ifarch aarch64 ppc64 ppc64le
for xx in forecast.ets.add forecast.ets.mult linest logest minverse rate
do
rm sc/qa/unit/data/functions/fods/$xx.fods
done
%endif
%build
# Parallel build settings ...
lo_jobs="%{?jobs:%{jobs}}"
@ -1009,6 +965,7 @@ export NOCONFIGURE=yes
./autogen.sh
%configure \
$PARALLEL_BUILD \
--enable-eot \
--enable-mergelibs \
--docdir=%{_docdir}/%{name} \
--with-compat-oowrappers \
@ -1019,7 +976,8 @@ export NOCONFIGURE=yes
--with-system-dicts \
--with-vendor=SUSE \
--with-alloc=system \
--with-tls=openssl \
--with-tls=nss \
--disable-openssl \
--with-lang='%{langpack_langs}' \
--disable-fetch-external \
--with-external-tar="$RPM_SOURCE_DIR" \
@ -1037,7 +995,6 @@ export NOCONFIGURE=yes
--enable-split-app-modules \
--enable-split-opt-features \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
--enable-python=system \
--enable-randr \
@ -1051,6 +1008,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 \
@ -1081,7 +1039,20 @@ 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
# Run tests only on 32/64b intel as they are resource hogs
%ifarch %ix86 x86_64
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
%endif
%install
make DESTDIR=%{buildroot} distro-pack-install
@ -1222,6 +1193,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/
@ -1279,6 +1251,10 @@ export DESTDIR=%{buildroot}
export SRCDIR="./"
./solenv/bin/install-gdb-printers -a %{_datadir}/gdb/auto-load%{_libdir}/%{name} -c -i %{_libdir}/%{name} -p %{_datadir}/libreoffice/gdb
# Libreofficekit headers
mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/
# We have ton of duped files so run over it
%fdupes %{buildroot}%{_prefix}
@ -1340,7 +1316,6 @@ exit 0
%_link_noarch_files icon-theme-breeze
%_link_noarch_files icon-theme-galaxy
%_link_noarch_files icon-theme-hicontrast
%_link_noarch_files icon-theme-oxygen
%_link_noarch_files icon-theme-sifr
%_link_noarch_files icon-theme-tango
@ -1379,6 +1354,8 @@ exit 0
%defattr(-,root,root)
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/LOKDocView-0.1.gir
%dir %{_includedir}/LibreOfficeKit
%{_includedir}/LibreOfficeKit/*.h
%files glade
%defattr(-,root,root)
@ -1447,6 +1424,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)
@ -1487,19 +1465,13 @@ exit 0
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_hicontrast.zip
%files icon-theme-oxygen
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_oxygen.zip
%files icon-theme-sifr
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_sifr.zip
%{_datadir}/%{name}/share/config/images_sifr_dark.zip
%files icon-theme-tango
%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