Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2021-06-19 23:02:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Sat Jun 19 23:02:02 2021 rev:230 rq:900708 version:7.1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2021-06-13
23:06:01.043654929 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.2625/libreoffice.changes
2021-06-19 23:02:05.651600390 +0200
@@ -1,0 +2,17 @@
+Thu Jun 17 19:38:40 UTC 2021 - Andras Timar <andras.ti...@collabora.com>
+
+- Fix tdf#142839: a regression caused by "Multi column textbox in editengine"
+ * tdf142839.patch
+
+-------------------------------------------------------------------
+Tue Jun 15 12:28:58 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Use asimdrdm CPU flag for aarch64 to select only powerful buildhosts
+
+-------------------------------------------------------------------
+Mon Jun 14 14:46:36 UTC 2021 - Andras Timar <andras.ti...@collabora.com>
+
+- Fix bsc#1182969: LO-L3: PPTX: one column becomes two within one text frame
(two occurrences)
+ * bsc1182969.patch
+
+-------------------------------------------------------------------
New:
----
bsc1182969.patch
tdf142839.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.NqchI4/_old 2021-06-19 23:02:08.691604277 +0200
+++ /var/tmp/diff_new_pack.NqchI4/_new 2021-06-19 23:02:08.695604282 +0200
@@ -107,6 +107,10 @@
Patch7: bsc1185505.patch
# bsc#1185797 Searching in PPTX document makes LibreOffice crash
Patch8: bsc1185797.patch
+# bsc#1182969 Multi column textbox in editengine
+Patch9: bsc1182969.patch
+# tdf#142839 Fix a regression caused by "Multi column textbox in editengine"
+Patch10: tdf142839.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@@ -981,6 +985,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.NqchI4/_old 2021-06-19 23:02:08.775604384 +0200
+++ /var/tmp/diff_new_pack.NqchI4/_new 2021-06-19 23:02:08.775604384 +0200
@@ -11,4 +11,14 @@
<size unit="M">1200</size>
</memoryperjob>
</hardware>
+ <overwrite>
+ <conditions>
+ <arch>aarch64</arch>
+ </conditions>
+ <hardware>
+ <cpu>
+ <flag>asimdrdm</flag>
+ </cpu>
+ </hardware>
+ </overwrite>
</constraints>
++++++ bsc1182969.patch ++++++
++++ 6228 lines (skipped)
++++++ tdf142839.patch ++++++
>From 4a2894a2b9c973b275788190220d205e41eb92db Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kagan...@collabora.com>
Date: Thu, 17 Jun 2021 17:22:36 +0300
Subject: [PATCH] tdf#142839: do not forget to initialize *pHeightNTP
Regression after commit d0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5
Change-Id: Iaa8f67e0c7e3d99b057294717d24ffac4ad3534c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117389
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 59611f7b6acbf643bde0e0121ee51e2df53e7d50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117305
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
---
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 4980c57..ff080b1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3437,6 +3437,8 @@
tools::Long ImpEditEngine::Calc1ColumnTextHeight(tools::Long* pHeightNTP)
{
tools::Long nHeight = 0;
+ if (pHeightNTP)
+ *pHeightNTP = 0;
// Pretend that we have ~infinite height to get total height
comphelper::ValueRestorationGuard aGuard(nCurTextHeight,
std::numeric_limits<tools::Long>::max());
@@ -3467,6 +3469,8 @@
tools::Long nTentativeColHeight = mnMinColumnWrapHeight;
tools::Long nWantedIncrease = 0;
tools::Long nCurrentTextHeight;
+ if (pHeightNTP)
+ *pHeightNTP = 0;
// This does the necessary column balancing for the case when the text
does not fit min height.
// When the height of column (taken from nCurTextHeight) is too small, the
last column will
