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

Accepting request 1070229 from LibreOffice:7.5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1070229
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1065
This commit is contained in:
Danilo Spinella 2023-03-09 10:11:10 +00:00 committed by Git OBS Bridge
parent f494bae237
commit fe8f4b6036
25 changed files with 172 additions and 2643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Remove_dependency_on_BitArray_h.patch
View File

@ -1,62 +0,0 @@
From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
From: "Brett T. Warden" <brett.t.warden@intel.com>
Date: Fri, 30 Dec 2022 08:43:25 +0100
Subject: Remove dependency on BitArray.h from zxing-1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In zxing-1.4.0, numerous headers are no longer public. Rework the
ConvertToSVGFormat method so it uses bitmatrix.get instead of
bitmatrix.getRow, similar to the ToSVG method in zxing itself.
See https://github.com/zxing-cpp/zxing-cpp/issues/361
Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
cui/source/dialogs/QrCodeGenDialog.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'cui/source/dialogs/QrCodeGenDialog.cxx')
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index f8cbac1d758d..817be7f21ede 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -27,7 +27,6 @@
#endif
#include <BarcodeFormat.h>
-#include <BitArray.h>
#include <BitMatrix.h>
#include <MultiFormatWriter.h>
#include <TextUtfEncoding.h>
@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
OStringBuffer sb;
const int width = bitmatrix.width();
const int height = bitmatrix.height();
- ZXing::BitArray row(width);
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 "
+ OString::number(width) + " " + OString::number(height)
@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
"<path d=\"");
for (int i = 0; i < height; ++i)
{
- bitmatrix.getRow(i, row);
for (int j = 0; j < width; ++j)
{
- if (row.get(j))
+ if (bitmatrix.get(j, i))
{
sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z");
}
--
cgit v1.2.1

41
boost-181.patch
View File

@ -1,41 +0,0 @@
From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 27 Nov 2022 18:59:24 +0700
Subject: [PATCH] i18n: fix build with Boost 1.81.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
Switch our resource manager accordingly.
1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
Reviewed-by: Heiko Becker <heirecka@exherbo.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
unotools/source/i18n/resmgr.cxx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index ddedf5b9e8a2f..3a71163500624 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -127,8 +127,13 @@ namespace Translate
if (aFind != aCache.end())
return aFind->second;
boost::locale::generator gen;
+#if BOOST_VERSION < 108100
gen.characters(boost::locale::char_facet);
gen.categories(boost::locale::message_facet | boost::locale::information_facet);
+#else
+ gen.characters(boost::locale::char_facet_t::char_f);
+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
+#endif
#if defined(ANDROID)
OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
#else

17
bsc1204825.patch
View File

@ -1,17 +0,0 @@
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1dd4eb3..8fefc18 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -662,6 +662,12 @@
const sal_Int32 aFillColor = static_cast<sal_Int32>(
pProperties.maFillProperties.maFillColor.getColor( rGraphicHelper ).GetRGBColor() );
xSet->setPropertyValue( UNO_NAME_FILLCOLOR, uno::Any( aFillColor ) );
+
+ if (pProperties.maFillProperties.maFillColor.hasTransparency())
+ {
+ const sal_Int16 aTransparence = pProperties.maFillProperties.maFillColor.getTransparency();
+ xSet->setPropertyValue(UNO_NAME_FILL_TRANSPARENCE, uno::Any(aTransparence));
+ }
}
else
{

135
bsc1205866.patch
View File

@ -1,135 +0,0 @@
From 379866dd23be2cd3eb9952fbc6b106daaec0cdea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20Sz=C5=B1cs?= <attila.szucs@collabora.com>
Date: Mon, 16 Jan 2023 04:13:07 +0100
Subject: tdf#153036 PPTX import resized connector broken
Fixed the EdgeLine1Delta calculation in case of bentConnector2.
(when L shape imported as a special Z shape)
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: I08c92e63adc744322061e4e433bfdc512745eda1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145548
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 17c68fad2aef917adfdd3d4d651da786e620699c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145766
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
oox/source/ppt/slidepersist.cxx | 72 +++++++++++++++------
.../data/pptx/tdf153036_resizedConnectorL.pptx | Bin 0 -> 33042 bytes
sd/qa/unit/import-tests.cxx | 17 +++++
3 files changed, 69 insertions(+), 20 deletions(-)
create mode 100644 sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 657703fff239..dc068b0b699e 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -342,6 +342,36 @@ void SlidePersist::hideShapesAsMasterShapes()
}
}
+// This angle determines in the direction of the line
+static sal_Int32 lcl_GetAngle(uno::Reference<drawing::XShape>& rXShape, awt::Point& rPt)
+{
+ SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape);
+ tools::Rectangle aR(pObj->GetSnapRect());
+ sal_Int32 nLeftX = rPt.X - aR.Left();
+ sal_Int32 nTopY = rPt.Y - aR.Top();
+ sal_Int32 nRightX = aR.Right() - rPt.X;
+ sal_Int32 nBottomY = aR.Bottom() - rPt.Y;
+ sal_Int32 nX = std::min(nLeftX, nRightX);
+ sal_Int32 nY = std::min(nTopY, nBottomY);
+
+ sal_Int32 nAngle;
+ if (nX < nY)
+ {
+ if (nLeftX < nRightX)
+ nAngle = 180; // Left
+ else
+ nAngle = 0; // Right
+ }
+ else
+ {
+ if (nTopY < nBottomY)
+ nAngle = 270; // Top
+ else
+ nAngle = 90; // Bottom
+ }
+ return nAngle;
+}
+
Reference<XAnimationNode> SlidePersist::getAnimationNode(const OUString& sId) const
{
const auto& pIter = maAnimNodesMap.find(sId);
@@ -373,6 +403,8 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector,
SdrObject* pEndObj = xEndSp.is() ? SdrObject::getSdrObjectFromXShape(xEndSp) : nullptr;
sal_Int32 nStartSpLineW = 0;
+ sal_Int32 nStartA = -1;
+ sal_Int32 nEndA = -1;
if (pStartObj)
{
aStartRect = pStartObj->GetSnapRect();
@@ -380,6 +412,7 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector,
xPropxStartSp->getPropertyValue("LineWidth") >>= nStartSpLineW;
if (nStartSpLineW)
nStartSpLineW = nStartSpLineW / 2;
+ nStartA = lcl_GetAngle(xStartSp, aStartPt);
}
sal_Int32 nEndSpLineW = 0;
if (pEndObj)
@@ -389,6 +422,7 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector,
xPropxEndSp->getPropertyValue("LineWidth") >>= nEndSpLineW;
if (nEndSpLineW)
nEndSpLineW = nEndSpLineW / 2;
+ nEndA = lcl_GetAngle(xEndSp, aEndPt);
}
const OUString sConnectorName = rShapePtr->getConnectorName();
@@ -397,27 +431,25 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector,
awt::Size aConnSize = rXConnector->getSize();
if (xStartSp.is() || xEndSp.is())
{
- if (aConnSize.Height < aConnSize.Width)
+ if (nStartA >= 0)
{
- if (xStartSp.is())
- nEdge = (aStartPt.Y > aEndPt.Y)
- ? (nStartSpLineW - (aStartRect.Top() - aEndPt.Y))
- : ((aEndPt.Y - aStartRect.Bottom()) - nStartSpLineW);
- else
- nEdge = (aStartPt.Y > aEndPt.Y)
- ? ((aStartPt.Y - aEndRect.Bottom()) - nEndSpLineW)
- : (nEndSpLineW - (aEndRect.Top() - aStartPt.Y));
- }
- else
- {
- if (xStartSp.is())
- nEdge = (aStartPt.X > aEndPt.X)
- ? (nStartSpLineW - (aStartRect.Left() - aEndPt.X))
- : ((aEndPt.X - aStartRect.Right()) - nStartSpLineW);
- else
- nEdge = (aStartPt.X > aEndPt.X)
- ? ((aStartPt.X - aEndRect.Right()) - nEndSpLineW)
- : (nEndSpLineW - (aEndRect.Left() - aStartPt.X));
+ switch (nStartA)
+ {
+ case 0: nEdge = aEndPt.X - aStartRect.Right(); break;
+ case 180: nEdge = aEndPt.X - aStartRect.Left(); break;
+ case 90: nEdge = aEndPt.Y - aStartRect.Bottom(); break;
+ case 270: nEdge = aEndPt.Y - aStartRect.Top(); break;
+ }
+ nEdge += nStartSpLineW * (nStartA >= 180 ? +1 : -1);
+ } else {
+ switch (nEndA)
+ {
+ case 0: nEdge = aStartPt.X - aEndRect.Right(); break;
+ case 180: nEdge = aStartPt.X - aEndRect.Left(); break;
+ case 90: nEdge = aStartPt.Y - aEndRect.Bottom(); break;
+ case 270: nEdge = aStartPt.Y - aEndRect.Top(); break;
+ }
+ nEdge += nEndSpLineW * (nEndA >= 180 ? +1 : -1);
}
}
else

49
fix-sdk-idl.patch Normal file
View File

@ -0,0 +1,49 @@
Index: libreoffice-7.5.1.2/bin/distro-install-sdk
===================================================================
--- libreoffice-7.5.1.2.orig/bin/distro-install-sdk
+++ libreoffice-7.5.1.2/bin/distro-install-sdk
@@ -17,14 +17,12 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; the
# relative paths to $DESTDIR$INSTALLDIR/sdk/setting and it does not work via
# a symlink
mkdir -p $DESTDIR$PREFIXDIR/include
- mkdir -p $DESTDIR$DATADIR/idl
mkdir -p $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk
mkdir -p $DESTDIR$DOCDIR/sdk
mv $DESTDIR$INSTALLDIR/sdk/include $DESTDIR$PREFIXDIR/include/$INSTALLDIRNAME
if [ -d $DESTDIR$INSTALLDIR/sdk/classes ]; then
mv $DESTDIR$INSTALLDIR/sdk/classes $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk/classes
fi
- mv $DESTDIR$INSTALLDIR/sdk/idl $DESTDIR$DATADIR/idl/$INSTALLDIRNAME
mv $DESTDIR$INSTALLDIR/sdk/docs $DESTDIR$DOCDIR/sdk
mv $DESTDIR$INSTALLDIR/sdk/share/readme $DESTDIR$DOCDIR/sdk/readme
mv $DESTDIR$INSTALLDIR/sdk/index.html $DESTDIR$DOCDIR/sdk
@@ -32,7 +30,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; the
# compat symlinks
ln -sf $PREFIXDIR/include/$INSTALLDIRNAME $DESTDIR$INSTALLDIR/sdk/include
ln -sf $DATADIR/$INSTALLDIRNAME/sdk/classes $DESTDIR$INSTALLDIR/sdk/classes
- ln -sf $DATADIR/idl/$INSTALLDIRNAME $DESTDIR$INSTALLDIR/sdk/idl
ln -sf $DOCDIR/sdk/docs $DESTDIR$INSTALLDIR/sdk/
ln -sf $DOCDIR/sdk/index.html $DESTDIR$INSTALLDIR/sdk/index.html
ln -sf $INSTALLDIR/sdk/examples $DESTDIR$DOCDIR/sdk/examples
@@ -40,7 +37,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; the
# fix file list
sed -e "s|^\(%dir \)\?$INSTALLDIR/sdk/include|\1$PREFIXDIR/include/$INSTALLDIRNAME|" \
-e "s|^\(%dir \)\?$INSTALLDIR/sdk/classes|\1$DATADIR/$INSTALLDIRNAME/sdk/classes|" \
- -e "s|^\(%dir \)\?$INSTALLDIR/sdk/idl|\1$DATADIR/idl/$INSTALLDIRNAME|" \
-e "s|^\(%dir \)\?$INSTALLDIR/sdk/docs|\1$DOCDIR/sdk/docs|" \
-e "s|^\(%dir \)\?$INSTALLDIR/sdk/share/readme|\1$DOCDIR/sdk/readme|" \
-e "s|^$INSTALLDIR/sdk/index.html$|$DOCDIR/sdk/index.html|" \
@@ -53,13 +49,11 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; the
#
echo "%dir $DATADIR/$INSTALLDIRNAME/sdk" >>$DESTDIR/gid_Module_Root_SDK
echo "%dir $DATADIR/$INSTALLDIRNAME" >>$DESTDIR/gid_Module_Root_SDK
- echo "%dir $DATADIR/idl" >>$DESTDIR/gid_Module_Root_SDK
echo "%dir $DOCDIR/sdk/docs" >>$DESTDIR/gid_Module_Root_SDK
echo "%dir $DOCDIR/sdk" >>$DESTDIR/gid_Module_Root_SDK
echo "%dir $DOCDIR" >>$DESTDIR/gid_Module_Root_SDK
echo "$INSTALLDIR/sdk/include" >>$DESTDIR/gid_Module_Root_SDK
echo "$INSTALLDIR/sdk/classes" >>$DESTDIR/gid_Module_Root_SDK
- echo "$INSTALLDIR/sdk/idl" >>$DESTDIR/gid_Module_Root_SDK
echo "$INSTALLDIR/sdk/docs" >>$DESTDIR/gid_Module_Root_SDK
echo "$INSTALLDIR/sdk/index.html" >>$DESTDIR/gid_Module_Root_SDK
echo "$DOCDIR/sdk/examples" >>$DESTDIR/gid_Module_Root_SDK

4
fix_math_desktop_file.patch
View File

@ -6,8 +6,8 @@ index 5a8192a..d2391be 100644
NoDisplay=false
Icon=math
Type=Application
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
+Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;
+Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;;
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
Name=%PRODUCTNAME Math

126
libreoffice-7.4.1.2-grep.patch
View File

@ -1,126 +0,0 @@
From fd42cea5f301a10cdeaa29959f04b111de534132 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Wed, 7 Sep 2022 21:34:42 +0200
Subject: [PATCH] replace egrep/fgrep calls with grep -E/grep -F
as egrep/fgrep is deprecated since long amd grep 3.8+ now actually warns
(e.g. "egrep: warning: egrep is obsolescent; using grep -E")
Change-Id: I5b10f05dffdd09081deb05cef974e3cdb2907315
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139614
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
.git-hooks/commit-msg | 4 ++--
android/source/gradlew | 4 ++--
bin/find-german-comments | 2 +-
configure.ac | 6 +++---
odk/config/configure.pl | 4 ++--
slideshow/qa/debug/nodetree.sh | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
index eebca62cb6f7a..950a6b709d9a8 100755
--- a/.git-hooks/commit-msg
+++ b/.git-hooks/commit-msg
@@ -49,8 +49,8 @@ if [ "$len" -gt 79 ] ; then
fi
fdo_regex='fdo#[0-9]+'
-if egrep -q "$fdo_regex" $1; then
- for bugid in `head -n 1 $1 |egrep -o "$fdo_regex" |sed 's/fdo#//'`
+if grep -E -q "$fdo_regex" $1; then
+ for bugid in `head -n 1 $1 | grep -E -o "$fdo_regex" |sed 's/fdo#//'`
do
if [ "`echo $bugid |sed 's/fdo#//'`" -gt 88775 ]; then
abort "$1" "The first line contains a suspicious fdo# rereference: 'fdo#$bugid', did you mean tdf#?"
diff --git a/android/source/gradlew b/android/source/gradlew
index 91a7e269e19df..b7029853b09f2 100755
--- a/android/source/gradlew
+++ b/android/source/gradlew
@@ -130,8 +130,8 @@ if $cygwin ; then
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+ CHECK=`echo "$arg"|grep -E -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|grep -E -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
diff --git a/bin/find-german-comments b/bin/find-german-comments
index a38b435ce8708..175af6f22420d 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -235,7 +235,7 @@ class Parser:
# Change into the given dir, so "git ls-tree" does work.
os.chdir(directory)
- sock = os.popen(r"git ls-tree -r HEAD --name-only |egrep '\.(c|cc|cpp|cxx|h|hxx|mm)$'")
+ sock = os.popen(r"git ls-tree -r HEAD --name-only | grep -E '\.(c|cc|cpp|cxx|h|hxx|mm)$'")
lines = sock.readlines()
sock.close()
diff --git a/configure.ac b/configure.ac
index 7b03df8ee0aae..7c82578933cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2945,7 +2945,7 @@ AC_SUBST(GNUPARALLEL)
AC_MSG_CHECKING([for GNU or BSD tar])
for a in $GNUTAR gtar gnutar tar bsdtar /usr/sfw/bin/gtar; do
- $a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null
+ $a --version 2> /dev/null | grep -E "GNU|bsdtar" 2>&1 > /dev/null
if test $? -eq 0; then
GNUTAR=$a
break
@@ -2958,11 +2958,11 @@ fi
AC_SUBST(GNUTAR)
AC_MSG_CHECKING([for tar's option to strip components])
-$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null
+$GNUTAR --help 2> /dev/null | grep -E "bsdtar|strip-components" 2>&1 >/dev/null
if test $? -eq 0; then
STRIP_COMPONENTS="--strip-components"
else
- $GNUTAR --help 2> /dev/null | egrep "strip-path" 2>&1 >/dev/null
+ $GNUTAR --help 2> /dev/null | grep -E "strip-path" 2>&1 >/dev/null
if test $? -eq 0; then
STRIP_COMPONENTS="--strip-path"
else
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index f3d0e08b3440f..756db5a3c76b5 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -242,7 +242,7 @@
} else
{
#check version
- my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | egrep Zip | head -n 1`;
+ my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | grep -E Zip | head -n 1`;
$testVersion =~ s#Zip ([\d.]+) .*#$1#go;
if ( $testVersion eq "")
{
@@ -414,7 +414,7 @@
} else
{
#check version
- my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | egrep "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`;
+ my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1 | grep -E "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e 's#".*##'`;
$testVersion =~ s#([^\n]+)\n#$1#go;
$main::correctVersion = testVersion($main::javaVersion, $testVersion, "$main::OO_SDK_JAVA_HOME/bin/java", 1);
diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh
index 7105ff181d818..78546cb8ce0b2 100644
--- a/slideshow/qa/debug/nodetree.sh
+++ b/slideshow/qa/debug/nodetree.sh
@@ -34,7 +34,7 @@
#
###################################################
-egrep "Node connection|Node state" $1 | \
+grep -E "Node connection|Node state" $1 | \
sed -e '/Node state/ s/.*Node state.*: \(.*\)/\1/' \
-e '/Node connection/ s/.*Node connection.*: \(n.*\)/\1/' | \
\

3
libreoffice-7.4.4.2.tar.xz
View File

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

16
libreoffice-7.4.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmOsHbgACgkQ9DSh76/u
rqNCphAAu+x4eG2zAikuIPlozMfvhfcun41eVlzKTl35TRZNxAhZp/NkywRusEK2
9OHlquT/0aPkj79LQocQTONAFJ5rVBJiQzYN5OzX0RPEWohFXNYLRRmK9UqIqO+b
DKPTO85aT+88HFisIcBhA5mO3yk96hDuhwLsxT/FcTOrdRyxKu6uqq8105uS/pB5
nrW0GOr3+e+jxGv+B8bMQInhroLSDil1ttFCUPzPexTQXSBSxDNQg5daJl/8S4cG
TbcUcD3bqd8okhA/OAK4XI4NoKKHkv6L3pPCLGuuceArpTr/WIq8X7RO7PaY+ciB
WbNYecMI6rND8tLiAU/nZ9oa1ApQXXm3IOK+4vsvcF8neHYL8fCREYEa5Sskfea0
dkqgpxGYlzQmsz0Cd2BknwecLm4aQCB7UlcGyQDiJPuUv/iB7zvNGVhK/aMwaiNq
JcXAGehuxRfMF9aMkObdF8t7zkpMWtowSHIBYnFivdWowI4yEyvg/GJjk8fonmcO
yvhIVvfgz5yAhB5mBZa4fbFswOKyIzaErkQclYDPz0yuJNLF9S1x7N0CHtZvgtU4
S1CnbA5IVgO3oKoKe91363zLMLmQ0sxXXL5WX137LRqao/oaj8K/BIFxrPwVZNRQ
fiek1GKuB0nouYDOQ4v5Yi5KMzgipUCt51jfAXUFGIIFMcU9sDc=
=zVrX
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmP2dlEACgkQ9DSh76/u
rqP3mQ/9Fm5wf1iyADBKpK9wuq40nTsFIZR0QkC9UNv9uWdjJO46WgpbuA0xFtaM
23ZMyl24npMfTPlV2JwiCIj93SakxnkMRlsyzYukIVvrW2m7ktGPGBNABhmO6h2t
rR2Ilum1pcTfrDL3w3mhAr6c3HV4RpaNnANSZecN57E38XPHeYkXfadkE1SNXO/W
91IM4X7uAKG9LLKsZ1fki95GV2wVuFw93OPDNuUoJAMl59HfpOA6wnqEpTsXHrqj
Om3WKAJ5aPUl8sD3GV+sKITMu55v8FXoPLB0K4jPvanKaWOe9Dhy7FdQF4Wldgmd
lW/ZyLD6kk9suF+31Hu6faN9OtCG68ibzFWeIY8cbsUT/QupYmZfiepajpp2yMdE
3T0PmjbQXCKg2rGRpTKV/7EKIRK7YXkkEbIjXC5VFU00cWZe3TwcIJxC0EvDdcHs
htREmAbI/3ah7J3f/2LADTeOheQTVmrZTRIndeDMOcxc4jYMiT5F/V+IJSPwTVPY
SO8wetM0Z26BNK1sON5hEWeFXaRxJdIXiaXMieqOlHl60iDeWO9ON4qh/L/4vxmX
LlmkGZmmRuejHrPCpYdDAfZJLnqZ7OQJrxALIux1YoW6T87VCqUpZERPvlGCHSpA
oRVxNXjnZao+58fd/KIMWAgF3We+710F0DuM80WX28kWTPnY2Eo=
=TiyZ
-----END PGP SIGNATURE-----

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

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

16
libreoffice-help-7.4.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmOsHboACgkQ9DSh76/u
rqNZeg/+Lt89hB4Ryscv29djTwZdKOXnCvdKv3Vx2Oc8T7Abw1xaUUBkUnlw9i2C
6sC66ey8YHy8pzHH3/V1emKJrduC2876D5AFZQNxZCBNl3EncyOYmo0uDMf+8hDi
uVMV8UeSay6/nVnM6a6My2XTWmcR9UbQx77K4QDAAyMrhPr/QO921IFbWMYrxXY/
2s7tuZEuBREROZ/2hQ3s48JR0zxsrRwNl+6Xx2rqXSqrCxOyXnQogvS6x1lcJgSz
KRe1pLY9sxAOGYHiOuOaELGPaasJ+BBWG3ADN+7XsczKg3QenxQ7AElqnA7U2Pq3
XERFn9CooDMQ2K9zmULXoBoPSXg3spaE6easrFTQA1Yyv2S+lafZ3ChklpFtT1Cg
40JiBIqHqv0UixzxnYo1DKMBtf6rN11+ZJDVTcJYXMfFsIi4DXIYeDATu2X2VrA1
CyNn6BzETcW8hBsGkrchTCo1Wu7fsKbvMz979E1up8IPeBnpe9zgaZomeS5588pX
J8LyzY7pCbO02PJyx30cRnzTAYL7mOpZ0tSJnmuaLGOE3pv3KClYx2LuXHSPYrq1
4gsOjtWO22EjGQ/l5HGdMAIO9vTQPsEWDkxjVZWaaSW5i+JaSIocEWDrrJhdhMei
vovqXC4oj+T/ISDxTSgFWO/oqfe7VukLzVMTHDAGKsMyaV9I/9c=
=Stxu
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmP2dlcACgkQ9DSh76/u
rqOOpA//eaaCAETWKHOVL3vgK68pzuMgrI4j+5b6RZTf4z0bjT1jkez2TqxUKI/M
DlT9JL5rkmA3H+WBBJgHBlFrqvXhml1YU8OU4yADI6S0gz22beU/Zqqcmkd476tq
w8eYMRD6Cr6u7OSIpeAMXaxYaQMEBckg9gZ85RDSNlqHHUzNIudWuglU9n7vKsRd
dABgVrLXxW4jBXrZtHo/bRzaBHugywceBTp31pz8aiCEH9vaz8J3Qb+SyPxrmu9V
Do35s/fkKClptb319CUjIpL/pTtSrClIUAst/+By9itfK99bC2aJWAd1o1OwKKtT
Fz3DE1WgZPCIceERpcp6Mz9SniE32BJdYluUK/LPBbcF4SLYzvCtVxT3/Ss/Fp20
+upIWCVXtM0fvPr3iPE5C39dPX88EnFmX+be4F3B3MWSFw2HfiU6Omf8GFvZIJh1
t1adfE5fD2vhC3U/Y8Hw1j0UBdcvPS5bJjvjvyFkm/CVbeAiuiT9CBkFSH1UxNn0
jfGYyOlkfRIh14J9g6jwWZU+Snamb5lnDrJL5P4O3D5PVKXylPr1NdDufQ7y8PN7
9QaBbCnaiO46bTsiEPhJqrVhAYljNeffMYs1wrkJhHhN/7VgwtR98Gzqxo4MPEGI
ePSDwqYsipoUrGbN7yf0KXE6Qw94DXpo9K6BjsDm96HRQ5MKOXw=
=YYBY
-----END PGP SIGNATURE-----

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

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

16
libreoffice-translations-7.4.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmOsHboACgkQ9DSh76/u
rqMbKg/7B7SquKi95Tf9FH5TAnoAw9rtN+U3jmLjrBPzYvE7khL//yuNcvaAN1x4
wDXmp7QtF6xGX4v1TySbkIBdzedEtiNDz81TG08TsMUcYcsVwMZ3SzMbAiamk0Qn
ndigQoCiIet/xz3wBAV962wuEHKAnMabOg7ijj39XVf1qqji3NCE0ckPiwR/NpuY
Ngk3uqIh4SPZqxyak8eBo3BmknPMbf37oaGayz2qjgmR6HNzhE4kpCnmwHNd5kMb
h5vkgfgqsAsPq1H4gHDLK6Hk4yG3WF07TFDqPbWu5ClJFiyWt5KyrQQBjiRu+hXd
kzd4pbQFk91igtV2e9tZp1+0dR0DjWekQXe7tT+cFxUghSes/dP4ciQ6c7ONFu8P
Tbrf2+kqBLFjCaZwhRhZFswECX4LO9ibXDHDCyQUvmCDf9H+CISxPg9AWnX4SzWP
e8cv9xmTWgFqh0xeSoYjNlkK8JO8UPB88/q8vTtag1dwuTU8pCnvmEpiJpOR2XEc
sq179mKjIC8O2hL1oGGqgPQRvvAK8X7EQ8ng5TBprH/RBXYDBqcmBsnX2t3n71tx
mJruCosnqsTjKR7D2rfBP+agjkXQFUpVwRUxTo8E0Me3lLqjtpJ+dqhIXbIgLaB8
FcOEabf2miLdUdOa18QGIYX7od2YP9/wFNkJORPkN875I4vV0yQ=
=oVEH
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmP2dlcACgkQ9DSh76/u
rqN38g//YqKtnimOT2+0Fs1224JXrLkMEUmMOqvDM81RUFEEB/8/VASKd58bhyFP
OUbig46HPZcPwcrNq+a0Tl0LlOLFRyb06Ycy6lHrB9oJ56MzKCSB8XJcgp8mJsej
umlofh/4eGH8vN6NbeB9nz3blkEEIBYUdxTQfI+LOGsplSxNlvXdZf6e550jq3EI
IRePMKFMTxCo4MHoazB72ZomMlFycObVdfgnWXupbiuqn3zLhnDDrrJWkRxbeii7
qB7d1dNIv5k+ys02GuYSqip+03FJPTSte73R8XPGv7lo02xcEdJs0EwUOWWutFt6
wwIu+8uOh6rO5G1uxl1R0McKzmgneqWEnG1BGAS8eSn8c+bSOWs5GsJon9XQbXMq
NTglk+CZPC2nz4pPnBiwZAHHrJ1GPD0pWNWv0V1vf0BjZZIcbsGCBYypSMQ69xCE
zd6tVe/0G8EjEd7oDfY8W/wAb7RBw7IvhDa6IkuYbrxB9HnLG1DnVOvBFNrEJFT+
sjF18wrgLn+XSN8k7SwUwJZr4WxSwrfYDaugjr9EK9lulPUm/bv8T4hedHeMOXUF
mCVByJJZr7jJ4FCiaGuf1TvFke+ETtyxnfw4KDxLYSdvgyhh9dlh4V/qa9VsUKzQ
KaSiIgDlcsIkvJiQTwKq8kzvIvpOkV13fg7ibiZi42SHnB+oSp4=
=LEw/
-----END PGP SIGNATURE-----

24
libreoffice.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Wed Mar 1 10:44:06 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.5.1.2:
https://wiki.documentfoundation.org/ReleaseNotes/7.5
https://wiki.documentfoundation.org/Releases/7.5.1/RC2
https://wiki.documentfoundation.org/Releases/7.5.1/RC1
https://wiki.documentfoundation.org/Releases/7.5.0/RC3
https://wiki.documentfoundation.org/Releases/7.5.0/RC2
https://wiki.documentfoundation.org/Releases/7.5.0/RC1
- Add fix-sdk-idl.patch
- Update bundled dependencies:
* pdfium-5058.tar.bz2 -> pdfium-5408.tar.bz2
- Refreshed patches:
* fix_math_desktop_file.patch
* use-fixmath-shared-library.patch
- Removed patches:
* Remove_dependency_on_BitArray_h.patch
* boost-181.patch
* bsc1204825.patch
* bsc1205866.patch
* libreoffice-7.4.1.2-grep.patch
* riscv64-support.patch
-------------------------------------------------------------------
Mon Feb 6 08:55:57 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

28
libreoffice.spec
View File

@ -49,7 +49,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.4.4.2
Version: 7.5.1.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -90,7 +90,7 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-5058.tar.bz2
Source2008: %{external_url}/pdfium-5408.tar.bz2
# Single C file with patches from LO
Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way
@ -105,29 +105,20 @@ Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
Patch7: boost-181.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
Patch11: fix_webp_on_sle12_sp5.patch
Patch12: fix_harfbuzz_on_sle12_sp5.patch
# PATCH-FIX-UPSTREAM remove egrep/fgrep calls
Patch13: libreoffice-7.4.1.2-grep.patch
# PATCH-FIX-SUSE use fixmath shared library
Patch14: use-fixmath-shared-library.patch
# LO-L3: PPTX: text box shows that does not show in PowerPoint
Patch15: bsc1204825.patch
# LO-L3: Connector lines from PPTX "break"/bend too often
Patch16: bsc1205866.patch
# PATCH-FIX-UPSTREAM Remove_dependency_on_BitArray_h.patch -- Remove dependency on BitArray.h from zxing-1.2.0
Patch17: Remove_dependency_on_BitArray_h.patch
# PATCH-FIX-SUSE Fix make distro-pack-install
Patch15: fix-sdk-idl.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.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
Patch991: libreoffice-no-destdircheck.patch
# PATCH-FIX-UPSTREAM Add riscv64 support (backport of commit bc9487f745be)
Patch1000: riscv64-support.patch
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
@ -932,7 +923,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%langpack -l da -n Danish -X -m da_DK -T
%langpack -l de -n German -X -M -T
%langpack -l dgo -n Dogri -X
%langpack -l dsb -n Lower_Sorbian -X
%langpack -l dsb -n Lower_Sorbian -T -X
%langpack -l dz -n Dzongkha -s ctl -T -X
%langpack -l el -n Greek -m el_GR -T -X
%langpack -l en -n English -L en-US -X -M -g en_US -T -j en_US
@ -955,7 +946,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%langpack -l he -n Hebrew -s ctl -m he_IL -T -X
%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T -X
%langpack -l hr -n Croatian -m hr_HR -X -T
%langpack -l hsb -n Upper_Sorbian -X
%langpack -l hsb -n Upper_Sorbian -T -X
%langpack -l hu -n Hungarian -X -m hu_HU -T
%langpack -l it -n Italian -X -m it_IT -T
%langpack -l id -n Indonesian -T -M -X
@ -1039,7 +1030,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch2
%patch3
%patch6 -p1
%patch7 -p1
%patch9 -p1
%if 0%{?suse_version} < 1500
%patch10 -p1
@ -1047,14 +1037,10 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch12 -p1
%patch101 -p1
%endif
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch990 -p1
#%patch990 -p1
%patch991 -p1
%patch1000 -p1
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330

3
pdfium-5058.tar.bz2
View File

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

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

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

2175
riscv64-support.patch
View File

File diff suppressed because it is too large Load Diff

34
use-fixmath-shared-library.patch
View File

@ -1,8 +1,8 @@
Index: libreoffice-7.4.3.2/configure.ac
Index: libreoffice-7.5.0.2/configure.ac
===================================================================
--- libreoffice-7.4.3.2.orig/configure.ac
+++ libreoffice-7.4.3.2/configure.ac
@@ -10594,7 +10594,7 @@ if test "$with_system_libfixmath" = "yes
--- libreoffice-7.5.0.2.orig/configure.ac
+++ libreoffice-7.5.0.2/configure.ac
@@ -10559,7 +10559,7 @@ if test "$with_system_libfixmath" = "yes
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([libfixmath/fix16.hpp], [],
[AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], [])
@ -11,3 +11,29 @@ Index: libreoffice-7.4.3.2/configure.ac
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
Index: libreoffice-7.5.0.2/tools/Library_tl.mk
===================================================================
--- libreoffice-7.5.0.2.orig/tools/Library_tl.mk
+++ libreoffice-7.5.0.2/tools/Library_tl.mk
@@ -115,7 +115,7 @@ endif
ifeq ($(SYSTEM_LIBFIXMATH),TRUE)
$(eval $(call gb_Library_add_libs,tl,\
- -llibfixmath \
+ -lfixmath \
))
endif
Index: libreoffice-7.5.0.2/vcl/Library_vcl.mk
===================================================================
--- libreoffice-7.5.0.2.orig/vcl/Library_vcl.mk
+++ libreoffice-7.5.0.2/vcl/Library_vcl.mk
@@ -572,7 +572,7 @@ vcl_headless_freetype_code=\
ifeq ($(SYSTEM_LIBFIXMATH),TRUE)
$(eval $(call gb_Library_add_libs,vcl,\
- -llibfixmath \
+ -lfixmath \
))
endif