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

Accepting request 824590 from LibreOffice:Factory

Browse Source 
- Update to 7.0.0.3:
  * Final stable release for 7.0.0 version

- Update to 7.0.0.2:
  * RC2 7.0 series update

- Update to 7.0.0.1:
  * RC1 7.0 series containing many additional fixes
- Remove merged patches:
  * libreoffice-clipped-sidebar-paragraph-widget.patch
  * libreoffice-select-correct-item-in-gallery.patch
  * libreoffice-stuck-widgets-in-sidebar.patch
  * pyuno-nopwd.patch
  * poppler-0.86.patch
- Also contains fixes for bsc#1155141 and bsc#1136234

OBS-URL: https://build.opensuse.org/request/show/824590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=210
This commit is contained in:
Dominique Leuenberger 2020-08-13 08:13:54 +00:00 committed by Git OBS Bridge
commit 1e4f79f5b0
19 changed files with 84 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice-7.0.0.0.beta2.tar.xz
View File

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

16
libreoffice-7.0.0.0.beta2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p4zgACgkQ9DSh76/u
rqN0Mw/8D7Q4JV0P79abZ2zt52iax9Z5VPTv+FXeoMmOkzS+RHQQTMLMC7BlQ/vf
yeRgqxw5LDeRdrGNNmj9kUvOL947+u+ajuhrRSvlEUztKowgKhE3kDYipT1eluoV
Bv4uFykVdD12w/+7TwuGpZqSYm28yODEcfTZRVdV7/6hz40TZd4pmb9/4iC0o8+e
X31V7gnn0xJt6AaKDLGR5xl+LA+lL8araBZrcaaBtuU1hnzOHSCmWqe3bEDj6GwV
pJ9Go5eSb6FpCTMZjgAxE04Bo6ygseC2yB6q+Xln/yzrTCrNYfCPZrKhD8rC+NJc
/kC9FEKXikG7VjFCeZ2xX6U6/MIcSOwzj3dTml6XaE1w86Nz5t/k41qNxatONh46
0M8EoNbK3pk9F4QBcyT1U8Kp18uhP6GVxzuj/XBiLHXvpBG+4sWTCnS4qE+bevaq
BVNa5EYFk2kvZH4Lwq8V4JKqLDbW8+NWGESfAFyEoe8ZbKh2zvKTFf3v44yZnFWP
+J8Y2wxDz6et2vUZb7yOxexBm5DHRRFZCwsDr2T9jSOKLiUy5yEwG6p/CIV8D84k
+qN2Kvg9uwEjfXgk2MNrMfkRxWKJ6FGia8PCgMA4MHFzannG2ArIP10D6ZCmJDgR
OlKL9Low3Nw1LIKKK8GNbHy+lFJye+Q2+DJVPnj7ah9ikkbbYbk=
=iI6i
-----END PGP SIGNATURE-----

3
libreoffice-7.0.0.3.tar.xz Normal file
View File

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

16
libreoffice-7.0.0.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl8h1McACgkQ9DSh76/u
rqOESA/+LkIUhYYH9D0oLjvwly3fX7h1rdkyuHeiqoVS+DAapjTtXx+USwY2Ny6r
KgpE2BCIZKB69KH23EVH35DvXiKalpVOYleZ44Z/BepX1/8iD7Bp51pJiQynX1FL
6kCh1fn9OSTigVn0J8u4rWdy3YA+rvUU9cDo3lc+ii7JY7/+nXovEn8aVN4mXS0x
ycPNgN6oHFIGnUHymr6R27b0XPHeNyNF/SHUbnSqeAGxWXPtLjDHIpPFrJNk5its
pDZYo9Ou/uAhdGBcEGsMLw/WN0Gv1/2c4gpn45iB+Ox1mpaM3XKiRXpXzsEbYNBs
uAaPplVGilFslPUs/GALaWoL2qMjU/RFxjBGuRcs+thIDDbMRHDZf4s8RrH/U0VM
mLbIoKiaRHT9k1pbqArddkIgGLadNqY0sBDAbYHDzuEfZfnKKLie76cF4+T8+efb
MReVdS/GduEceCpnDujfCcMmunTRbvMKxqKgPnPdbQT8l5rGUWuG7OeXinu+K5Yb
A4CxqctUwFYma4kf61E9+tOxe9mXQZR+T/AYd3hViljotcxAJjLFgbCXGWqKw4Eh
LEloaRNlpzIqi/RQcPKi8ngzbxCTaHYmxEmm+SV1uF/bsAAjsoyGlrq+t1Qn+3vn
C5M3gLzybjW9scYUho6DpGLMm/RWOsKcV+tbj415P7P2mII/0Fg=
=G7IH
-----END PGP SIGNATURE-----

189
libreoffice-clipped-sidebar-paragraph-widget.patch
View File

@ -1,189 +0,0 @@
From f8e8b0d1747e16394d43eec7a1ef2b33b5678619 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 30 Jun 2020 17:13:24 +0100
Subject: [PATCH] tdf#134357 we can reduce the min toolbar sidebar width
since,
commit 754bea8c6a17889f9d4d23bf98847b6b67253220
Date: Wed Apr 29 15:06:42 2020 +0100
remove the padding around the dropdown button of GtkMenuToolButtons
the GtkMenuToolButton aren't as wide anymore so we don't need a min of 5
GtkToolButtons widths for tdf#130197, now the max of either 4 GtkToolButtons or
that of 1 GtkToolButtons + 2 GtkMenuToolButton is sufficient
Change-Id: I7296805b4b3c0d86ce3d08cadc8c2659104af619
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97502
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index f63196c..75f9319 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1446,9 +1446,11 @@
// use the, filled-in by dispatcher, width of measurewidth as the width
// of a "standard" column in a two column panel
std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&rToolbar, "svx/ui/measurewidthbar.ui"));
- std::unique_ptr<weld::Toolbar> xToolbar(xBuilder->weld_toolbar("measurewidth"));
- std::unique_ptr<ToolbarUnoDispatcher> xDispatcher(new ToolbarUnoDispatcher(*xToolbar, *xBuilder, rFrame));
- nColumnWidth = xToolbar->get_preferred_size().Width();
+ std::unique_ptr<weld::Toolbar> xToolbar1(xBuilder->weld_toolbar("measurewidth1"));
+ std::unique_ptr<ToolbarUnoDispatcher> xDispatcher1(new ToolbarUnoDispatcher(*xToolbar1, *xBuilder, rFrame));
+ std::unique_ptr<weld::Toolbar> xToolbar2(xBuilder->weld_toolbar("measurewidth2"));
+ std::unique_ptr<ToolbarUnoDispatcher> xDispatcher2(new ToolbarUnoDispatcher(*xToolbar2, *xBuilder, rFrame));
+ nColumnWidth = std::max(xToolbar1->get_preferred_size().Width(), xToolbar2->get_preferred_size().Width());
eSize = rToolbar.get_icon_size();
}
rToolbar.set_size_request(nColumnWidth, -1);
diff --git a/svx/uiconfig/ui/measurewidthbar.ui b/svx/uiconfig/ui/measurewidthbar.ui
index ad96cc7..b901963 100644
--- a/svx/uiconfig/ui/measurewidthbar.ui
+++ b/svx/uiconfig/ui/measurewidthbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox">
@@ -7,65 +7,43 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkToolbar" id="measurewidth">
+ <object class="GtkToolbar" id="measurewidth1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">2</property>
<child>
- <object class="GtkToolButton" id=".uno:MergeCells">
+ <object class="GtkMenuToolButton" id=".uno:TableCellBackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id=".uno:SplitCell">
+ <object class="GtkMenuToolButton" id=".uno:SetBorderStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id=".uno:SplitTable">
+ <object class="GtkToolButton" id=".uno:InsertFormula">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id=".uno:DeleteColumns">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id=".uno:DeleteTable">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -75,5 +53,63 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolbar" id="measurewidth2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">2</property>
+ <child>
+ <object class="GtkToolButton" id=".uno:InsertRowsBefore">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id=".uno:InsertRowsAfter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id=".uno:InsertColumnsBefore">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id=".uno:InsertColumnsAfter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</interface>

3
libreoffice-help-7.0.0.0.beta2.tar.xz
View File

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

16
libreoffice-help-7.0.0.0.beta2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p4z0ACgkQ9DSh76/u
rqMuShAAu5/V50JxuJCNoLFDokIW0UDSqYjt/04JiWyuTbxvFhq5my3ufkfTXaVe
rwq8o9N3agmrgb2uyQB4FFN5aJgyg3gnsZCKOyDoSRm+jK366nXT45p3Hm1vassI
P3RwNe54lNNo1o8Ou5varAy7jMyn59pTt4FJSWVE3FnzrnuwDGtCRR/HotOWe3Od
LfagH2ljMDzxamvmcx3CXOfvujMnhu7DAaENh/ACD1bqLYQmWA4OdwucmTnT6awj
bUTn9NkBJxx0a/dwNltLuTY2oPV5hmfPvXXixYxa8M/nrB6KVVh68IwrPIdK5NQX
YSuBNL8Kc0V4w13giYD1Pd54FE/+u/jvu4u/esf4rxGsykZz8vaE9tOjYPxwYJ+9
gMZhwym6IGWgcBNz4uXQXQyTYSGlDt/7ww8TXkwk9Iy+WFj5ABGJuw+cCkmNY5bT
KpEqK3YXrBQ4j7QA9z2gJCSnVjwzjnUaA6oIfwjwsBDsAkc9Hmc8ayFH7GmJxKLX
DjFWvd1nhIYNrjasj9MLjKZTWn21hCYZWOixrqr02Td09Kb4Mi/q0UT3V2FvW1Ml
SREATHliqOzPk/aAGTyanrnQxvKeNwRSwZ9fLWuix5Jzzlu4XJHq68MWT2qDEaPo
OaM87UPLNPUDk4HFSXxY8uakes6M422XU503CFJ8sGv/wPaqWvU=
=VAdW
-----END PGP SIGNATURE-----

3
libreoffice-help-7.0.0.3.tar.xz Normal file
View File

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

16
libreoffice-help-7.0.0.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl8h1M0ACgkQ9DSh76/u
rqPjlhAAifd0iqcekKG4rdklybSs7bOUdQpzeDuZuD/5RHUhuwhLYrJTQMY/MlnI
ob+5bYs7pDjE3CmEWNdThAQoVYND6EsauWnvBESDnye/dBBWiNq5e3Illf8cZwGF
PmGiJihpZGwtCwMGIAHOWeoh/dkC9+nqpy6NBAt8NrSQBqs6c1BdvXaKKAAe9M6b
P/P8VOP8VhD/ARNyVGSHv8ysC15Jzplea1Rzx4ovO16CWz5odKQGcEu2ylsqw4+i
ZALzQfcIm7qezOsmJQtioOoSitRP5JvGGDYatAKyoghUHguVl8/rGbaELIiabd3C
4T57NRCV5mz/QmOUSyojSA45VOCIGrnxKzbYeq+Nas0ajFHbLIrhEsNnPBv1Gs2d
HMCW1CchTIOTvPpAx+5dYf1hepaMQnPCWNkK94njeoW1haXgMO3uYS43+SmiwPcT
zfflH3iAQDbxpvRlGX+UfCCWh3fnMgQ9azERg5IdJwqNRmO1EiKA6fmJ3pcUmbzv
Anu+l16eaOCOtPolB7SrOXnGevEQadY3Gwt1np8RCbL4uHK8tZ4bsrwuOAUl7V+p
nDFEjFuyH745uhqU6heckHHPB+OWmWQXhaPCILvF9tYJCTgCwZkWiAkimcJWcJNM
28RzZPDlNdvSllFfmGpA39YFl2Du5QjFH4YGCgZkx4Qh5w2nr/Q=
=+iGT
-----END PGP SIGNATURE-----

25
libreoffice-select-correct-item-in-gallery.patch
View File

@ -1,25 +0,0 @@
From 8753cc269a350cc468e4f54f961f304a35144467 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 25 Jun 2020 21:05:26 +0100
Subject: [PATCH] tdf#134285 select the item before dragging it
so we don't get the previously selected item
Change-Id: Ifd6e46d97f1de0de86403b9c237ee8d2cd3a6cd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97137
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 6604eee..47ef1757 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -400,6 +400,7 @@
bool GalleryIconView::StartDrag()
{
+ Select();
return mpParent->StartDrag();
}

135
libreoffice-stuck-widgets-in-sidebar.patch
View File

@ -1,135 +0,0 @@
From a76fcd9f9718b269c0c84534a75114433369bf92 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 29 Jun 2020 20:02:26 +0100
Subject: [PATCH] tdf#134360 some sidebar widgets getting stuck in a disabled state
Change-Id: I655525679dd2471e9d0c1a5af246901594b188ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97387
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 324a2e5..12a9eba 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -254,7 +254,12 @@
break;
}
- if( pState && eState >= SfxItemState::DEFAULT )
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ mxLeftIndent->set_sensitive(!bDisabled);
+ mxRightIndent->set_sensitive(!bDisabled);
+ mxFLineIndent->set_sensitive(!bDisabled);
+
+ if (pState && eState >= SfxItemState::DEFAULT)
{
const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
maTxtLeft = pSpace->GetTextLeft();
@@ -314,13 +319,7 @@
nfVal = static_cast<long>(mxFLineIndent->normalize( nfVal ));
mxFLineIndent->set_value( nfVal, FieldUnit::MM_100TH );
}
- else if( eState == SfxItemState::DISABLED )
- {
- mxLeftIndent->set_sensitive(false);
- mxRightIndent->set_sensitive(false);
- mxFLineIndent->set_sensitive(false);
- }
- else
+ else if (eState != SfxItemState::DISABLED )
{
mxLeftIndent->set_text("");
mxRightIndent->set_text("");
@@ -335,6 +334,10 @@
mxTopDist->set_max( mxTopDist->normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
mxBottomDist->set_max( mxBottomDist->normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ mxTopDist->set_sensitive(!bDisabled);
+ mxBottomDist->set_sensitive(!bDisabled);
+
if( pState && eState >= SfxItemState::DEFAULT )
{
const SvxULSpaceItem* pOldItem = static_cast<const SvxULSpaceItem*>(pState);
@@ -355,12 +358,7 @@
nVal = mxBottomDist->normalize( nVal );
mxBottomDist->set_value( nVal, FieldUnit::MM_100TH );
}
- else if(eState == SfxItemState::DISABLED )
- {
- mxTopDist->set_sensitive(false);
- mxBottomDist->set_sensitive(false);
- }
- else
+ else if (eState != SfxItemState::DISABLED )
{
mxTopDist->set_text("");
mxBottomDist->set_text("");
From c4eb732bc38156d2d6c373c6ce3520eecf323d32 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 30 Jun 2020 20:05:30 +0100
Subject: [PATCH] Related: tdf#134360 table row/height widgets can get stuck insensitive
Change-Id: I1be53f33f60c510757c67f1da8f863539ecbffdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97573
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 4d76cc0..46f75cd 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -45,6 +45,9 @@
{
case SID_ATTR_TABLE_ROW_HEIGHT:
{
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ m_xRowHeightEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
@@ -55,18 +58,16 @@
m_xRowHeightEdit->set_value(nNewHeight, FieldUnit::TWIP);
}
}
- else if (eState == SfxItemState::DISABLED)
- {
- m_xRowHeightEdit->set_sensitive(false);
- }
- else
- {
+ else if (eState != SfxItemState::DISABLED)
m_xRowHeightEdit->set_text("");
- }
+
break;
}
case SID_ATTR_TABLE_COLUMN_WIDTH:
{
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ m_xColumnWidthEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
@@ -77,14 +78,9 @@
m_xColumnWidthEdit->set_value(nNewWidth, FieldUnit::TWIP);
}
}
- else if (eState == SfxItemState::DISABLED)
- {
- m_xColumnWidthEdit->set_sensitive(false);
- }
- else
- {
+ else if (eState != SfxItemState::DISABLED)
m_xColumnWidthEdit->set_text("");
- }
+
break;
}
}

3
libreoffice-translations-7.0.0.0.beta2.tar.xz
View File

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

16
libreoffice-translations-7.0.0.0.beta2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p4z8ACgkQ9DSh76/u
rqMytBAAyfNPyf+iWEr2nAUbS5sg4IFZXPPncE32TkJwGrTNWFFmFoxJwsk/duWX
VDAc+P0RjUEFapFrCm9UMqtzz3p6cVc4RGC3O/dSn9hcKJ6y+1vEBIMPe0/5U3bR
iH0WDVW6AlFbOvcPr7mWZDBzyQIlb81ba1zXSvMMWzB9NgjgGkn9VkG536HUQ44O
fWvt8st6kfi3aEeQFnYBWxhh/nff1s+rmUdcmw4vsyLqoqVnKK+K2KwhcXXdwbVG
p7zyya1Y6IBinnndSqRoR69DfWEw4bubqaEyWuNjJVuChYziuykl235vggJA5B0x
5MZ9/2vDezoHbvlej6ucs0ZJmy7/5PxaL1P1/ZX0GTLddR/3v8QvmwoEsHFBAkxr
t5uPCSffcQ4cEP22xcZ+xIjpkv8QPHxrJ9aSF7JjfXCtXUsn1oC1EtCrEmtNkE0t
7JjLT2NFbKLkDAiE2X/YPQ3O0ynTyJ9U3FAmPFJe8pnWAjlR4+Y9bslPFTKj9wnF
DAuWkgNuXH2ma1chjDUOi/f1KKSiHNgxmwO5M8ijWhmMOKSb6OaoT5WcwWsHW6MW
zygJHQNYude+LJpGb6+1HFzISGuZzAGYKu091gid/syUky3ZMv7xO2HBE4JGJuXT
OCkYF5sIDvpdl6Nsg0ZTkSBaVz78e+DFjWXPoFaICKy4Wnxe5dI=
=LaTh
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.0.0.3.tar.xz Normal file
View File

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

16
libreoffice-translations-7.0.0.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl8h1M4ACgkQ9DSh76/u
rqNx8A//QTWC3gO05W7KwsXSuDWfuqO4fD5pR4ldEc00fUlNEHElDDClIegS6s0i
0aSanUhNtav9ewhoQlEHddRTwMKTyh5U9vx+UGag0Oi4eu1Sl1PeQFtRF2JIBZbC
qPY//NTnrY+t1d/tuvf+jxQLJQQgpCFxrlzyxo8BbdnSWBVq9cjnVV3xH2Bx/Ibw
JlIQ0rnCOACDyXz6ETVm3J3RkY+ainBiwSXO3975cdCQna2MqX9CcxMQSFOSLJ7S
ESNxx5C/OCtJ5sC5pY5c1pvvytvo7g5VeH5SbtH48AEwzIU19/o5bqD1WekOlE+O
/6XCmABczNDHQQ7IlRU9h3wEhLtwXutM7va72NmTJSEc0PYEp30W+XL4qjk4NoBE
lXyZfUSA4QFkurrnkdBppSpiJqgsa7Nm6uAK43NWyZGIMAzIQ/PMhrBARJFkIqdc
dS5hAEjSXcT0KGcJPJLQOUj7Una9cfn3JJCZZTBNhZ0CAkM7dx4NSYgDQxs7C2ER
GiIG2rhk7k/kw6cgdg4eOYRM5xJt5Qg40d4Dz61UJ/B0hj2yuNqGfyEfJG5FL3PE
h6Rt7Lte2/4n5ZHKj8XVdErelCQHJ5rRP32SEsFt+yr/P9CR+cwEXxpwxxB1JGBZ
iQYa7Z3ufaOs1OEZSdDWm3VdNcpf21KgW1U9Vuawom+w8Im5u3s=
=1y2h
-----END PGP SIGNATURE-----

25
libreoffice.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu Aug 6 05:24:29 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 7.0.0.3:
* Final stable release for 7.0.0 version
-------------------------------------------------------------------
Tue Jul 21 07:00:42 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 7.0.0.2:
* RC2 7.0 series update
-------------------------------------------------------------------
Fri Jul 3 07:42:49 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 7.0.0.1:
* RC1 7.0 series containing many additional fixes
- Remove merged patches:
* libreoffice-clipped-sidebar-paragraph-widget.patch
* libreoffice-select-correct-item-in-gallery.patch
* libreoffice-stuck-widgets-in-sidebar.patch
* pyuno-nopwd.patch
* poppler-0.86.patch
- Also contains fixes for bsc#1155141 and bsc#1136234
-------------------------------------------------------------------
Wed Jul 1 20:15:15 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

13
libreoffice.spec
View File

@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 7.0.0.0.beta2
Version: 7.0.0.3
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -102,11 +102,6 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch4: poppler-0.86.patch
Patch5: pyuno-nopwd.patch
Patch6: libreoffice-stuck-widgets-in-sidebar.patch
Patch7: libreoffice-select-correct-item-in-gallery.patch
Patch8: libreoffice-clipped-sidebar-paragraph-widget.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@ -853,6 +848,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%langpack -l bs -n Bosnian -T -X
%langpack -l ca -n Catalan -M -X -T
%langpack -l ca_valencia -n Valencian -m ca_ES_valencia -T -L ca-valencia -g ca@valencia -j ca_valencia -X
%langpack -l ckb -n Central_Kurdish
%langpack -l cs -n Czech -X -m cs_CZ -T
%langpack -l cy -n Welsh -X
%langpack -l da -n Danish -X -m da_DK -T
@ -964,11 +960,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch990 -p1
%patch991 -p1

23
poppler-0.86.patch
View File

@ -1,23 +0,0 @@
From c1adc0a7559340213d754db950fd68bfe9e5a651 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <foss@martin-whitaker.me.uk>
Date: Sun, 15 Mar 2020 13:14:34 +0000
Subject: [PATCH] Fix build with poppler 0.86.0.
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
if (!(pAction && pAction->getKind() == actionURI))
return;
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
#else
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
--
2.21.1

50
pyuno-nopwd.patch
View File

@ -1,50 +0,0 @@
From 844af02198cace3c8f7776602810d8433d0b71d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 19 Jun 2020 11:32:00 +0100
Subject: [PATCH] tdf#121384 don't leave a bare trailing : in PYTHONPATH
Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603
---
pyuno/source/loader/pyuno_loader.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 8556dfdde11f..ebb0b7ce5c8d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -140,6 +140,7 @@ static void setPythonHome ( const OUString & pythonHome )
static void prependPythonPath( const OUString & pythonPathBootstrap )
{
OUStringBuffer bufPYTHONPATH( 256 );
+ bool bAppendSep = false;
sal_Int32 nIndex = 0;
while( true )
{
@@ -153,17 +154,23 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
{
fileUrl = pythonPathBootstrap.copy(nIndex, nNew - nIndex);
}
+ if (bAppendSep)
+ bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
OUString systemPath;
osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
bufPYTHONPATH.append( systemPath );
- bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
+ bAppendSep = true;
if( nNew == -1 )
break;
nIndex = nNew + 1;
}
const char * oldEnv = getenv( "PYTHONPATH");
if( oldEnv )
+ {
+ if (bAppendSep)
+ bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
+ }
OUString envVar("PYTHONPATH");
OUString envValue(bufPYTHONPATH.makeStringAndClear());
--
2.27.0