Resolves: rhbz#2001452 upgrade to 7.1.6
This commit is contained in:
Caolán McNamara
parent
cb334a5350
commit
c420128551
@ -1,36 +0,0 @@
|
||||
From a344462ccb324b14dbf17391146f78d84307cbec Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 22 Jun 2021 14:14:34 +0200
|
||||
Subject: [PATCH] Remove unused DOCTYPE from odk/examples xcu file
|
||||
|
||||
The declared entities have apparently never been referenced ever since the
|
||||
file's introduction in 9fa09d43d0dc0ec0ac71bad31b85ce7fc302ee90 "INTEGRATION:
|
||||
CWS sdkinspector2". (And at least xmlreader skips and ignores the content of
|
||||
such document type declarations anyway.)
|
||||
|
||||
Change-Id: I8263200f52bb5f1692090995574619f9c0ec478f
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117658
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
---
|
||||
odk/examples/java/Inspector/ObjectInspector.xcu | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu
|
||||
index b7696086629c..d6fb08a0f8ce 100644
|
||||
--- a/odk/examples/java/Inspector/ObjectInspector.xcu
|
||||
+++ b/odk/examples/java/Inspector/ObjectInspector.xcu
|
||||
@@ -16,10 +16,6 @@
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
-->
|
||||
-<!DOCTYPE local [
|
||||
- <!ENTITY ProductName "Object Inspector">
|
||||
- <!ENTITY ProductVersion "0.8">
|
||||
-]>
|
||||
<oor:component-data
|
||||
xmlns:oor="http://openoffice.org/2001/registry"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
From 5d56e9f13b9c6ccad080efaea9cbc7f065b56bac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 12 Aug 2021 12:55:30 +0100
|
||||
Subject: [PATCH] Resolves: tdf#132739 two style tags where there should be
|
||||
just one
|
||||
|
||||
Change-Id: Id9c8c8cc8c5ffdd21ba79ff39a6279cf2ddc8025
|
||||
---
|
||||
sw/source/filter/html/css1atr.cxx | 4 +++-
|
||||
sw/source/filter/html/htmltabw.cxx | 9 ++++++---
|
||||
sw/source/filter/html/wrthtml.hxx | 2 +-
|
||||
3 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
|
||||
index 7b1a5cc19be3..c401d95a788f 100644
|
||||
--- a/sw/source/filter/html/css1atr.cxx
|
||||
+++ b/sw/source/filter/html/css1atr.cxx
|
||||
@@ -2113,10 +2113,12 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF
|
||||
Strm().WriteChar( '\"' );
|
||||
}
|
||||
|
||||
-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
|
||||
+void SwHTMLWriter::OutCSS1_TableCellBordersAndBG(SwFrameFormat const& rFrameFormat, const SvxBrushItem *pBrushItem)
|
||||
{
|
||||
SwCSS1OutMode const aMode( *this,
|
||||
CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX, nullptr );
|
||||
+ if (pBrushItem)
|
||||
+ OutCSS1_SvxBrush(*this, *pBrushItem, Css1Background::Table, nullptr);
|
||||
OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
|
||||
if (!m_bFirstCSS1Property)
|
||||
{
|
||||
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
|
||||
index 4c83319747b7..63812a9b3ef6 100644
|
||||
--- a/sw/source/filter/html/htmltabw.cxx
|
||||
+++ b/sw/source/filter/html/htmltabw.cxx
|
||||
@@ -424,11 +424,14 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
|
||||
// Avoid non-CSS version in the ReqIF case.
|
||||
rWrt.OutBackground( pBrushItem, false );
|
||||
|
||||
- if( rWrt.m_bCfgOutStyles )
|
||||
- OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
|
||||
+ if (!rWrt.m_bCfgOutStyles)
|
||||
+ pBrushItem = nullptr;
|
||||
}
|
||||
|
||||
- rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
|
||||
+ // tdf#132739 with rWrt.m_bCfgOutStyles of true bundle the brush item css
|
||||
+ // properties into the same "style" tag as the borders so there is only one
|
||||
+ // style tag
|
||||
+ rWrt.OutCSS1_TableCellBordersAndBG(*pBox->GetFrameFormat(), pBrushItem);
|
||||
|
||||
sal_uInt32 nNumFormat = 0;
|
||||
double nValue = 0.0;
|
||||
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
|
||||
index ab282ba652ff..f82325ee50ae 100644
|
||||
--- a/sw/source/filter/html/wrthtml.hxx
|
||||
+++ b/sw/source/filter/html/wrthtml.hxx
|
||||
@@ -484,7 +484,7 @@ public:
|
||||
void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, HtmlFrmOpts nFrameOpts);
|
||||
|
||||
void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat );
|
||||
- void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat);
|
||||
+ void OutCSS1_TableCellBordersAndBG(const SwFrameFormat& rFrameFormat, const SvxBrushItem *pBrushItem);
|
||||
void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol );
|
||||
void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, HtmlFrmOpts nFrameOpts,
|
||||
const SdrObject *pSdrObj=nullptr,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
1262
0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Normal file
1262
0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
# download path contains version without the last (fourth) digit
|
||||
%global libo_version 7.1.5
|
||||
%global libo_version 7.1.6
|
||||
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
||||
# pre-RC) version. The pre-release string is part of tarball file names,
|
||||
# so we need a way to define it easily at one place.
|
||||
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.2
|
||||
Release: 5%{?libo_prerelease}%{?dist}
|
||||
Release: 2%{?libo_prerelease}%{?dist}
|
||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
|
||||
URL: http://www.libreoffice.org/
|
||||
|
||||
@ -254,11 +254,10 @@ Patch5: 0001-Get-rid-of-apache-commons-logging.patch
|
||||
Patch6: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch
|
||||
Patch7: 0001-Replace-inet_ntoa-with-inet_ntop.patch
|
||||
Patch8: 0001-Simplify-construction-of-a-hardcoded-IPv4-address.patch
|
||||
Patch9: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
|
||||
Patch10: 0001-math.desktop-include-Spreadsheet-category.patch
|
||||
Patch11: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
|
||||
Patch12: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
|
||||
Patch13: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch
|
||||
Patch9: 0001-math.desktop-include-Spreadsheet-category.patch
|
||||
Patch10: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
|
||||
Patch11: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
|
||||
Patch12: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
|
||||
|
||||
# not upstreamed
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
@ -1498,7 +1497,7 @@ install -m 0755 -d %{buildroot}%{_javadir}/%{name}
|
||||
for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
|
||||
j=`basename $jar`
|
||||
case ${j%.jar} in
|
||||
juh|jurt|ridl|unoloader|unoil|officebean)
|
||||
juh|jurt|libreoffice|ridl|unoloader|unoil|officebean)
|
||||
mv $jar %{buildroot}%{_javadir}/%{name}
|
||||
ln -sr %{buildroot}%{_javadir}/%{name}/$j $jar
|
||||
;;
|
||||
@ -2134,6 +2133,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
||||
%dir %{_javadir}/%{name}
|
||||
%{_javadir}/%{name}/juh.jar
|
||||
%{_javadir}/%{name}/jurt.jar
|
||||
%{_javadir}/%{name}/libreoffice.jar
|
||||
%{_javadir}/%{name}/ridl.jar
|
||||
%{_javadir}/%{name}/unoloader.jar
|
||||
%license instdir/LICENSE
|
||||
@ -2244,6 +2244,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Mon Oct 11 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.6.2-2
|
||||
- Resolves: rhbz#2001452 upgrade to 7.1.6
|
||||
|
||||
* Thu Aug 12 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.5.2-5
|
||||
- replace use of ucpp with gcc cpp
|
||||
- Resolves: tdf#132739 two html style tags where there should be just one
|
||||
|
||||
12
sources
12
sources
@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d
|
||||
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
|
||||
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
|
||||
SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
|
||||
SHA512 (libreoffice-7.1.5.2.tar.xz) = dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
|
||||
SHA512 (libreoffice-7.1.5.2.tar.xz.asc) = e29e66ef185a1404f60b153629c54676a5dbc2a8b028ee48b80984425e582293100145d5468231b27c96ca0c8d030cda2ad2b02f4d60a9c977fedfab6cc7f8f4
|
||||
SHA512 (libreoffice-help-7.1.5.2.tar.xz) = c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
|
||||
SHA512 (libreoffice-help-7.1.5.2.tar.xz.asc) = d1717cc6871684ba00347247242b8b9d4ae2b54e23f08a874db026ff478c31ffe8f60b8260267bb7b39e54eafa42e64965ebf6e9e667bafb42350e12dfcb2260
|
||||
SHA512 (libreoffice-translations-7.1.5.2.tar.xz.asc) = 16c78d49e1a770e9daa631888eeb951dc7dd308585dcd23165c75e09c256d5b526630149c48add7885b7de2d20041105bcd6faece2cf753efc630514a4bf1bc6
|
||||
SHA512 (libreoffice-translations-7.1.5.2.tar.xz) = 0c1fc68930131568e561ed7e5456ce38415c7dd516acff3060a81513ae34361979a4348f7d14796445afff9eae934c7e817e2b506c7971b4fbd2c03468717344
|
||||
SHA512 (libreoffice-7.1.6.2.tar.xz) = 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
|
||||
SHA512 (libreoffice-7.1.6.2.tar.xz.asc) = 0440990844bd4aba4c5aef768692fbda9060fa4b229807b2b2fceab7ea1b14abf017a5bca281c4f80e68a9e746dd9367ad17101e7497a0e08f60881144b56d07
|
||||
SHA512 (libreoffice-help-7.1.6.2.tar.xz) = 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
|
||||
SHA512 (libreoffice-help-7.1.6.2.tar.xz.asc) = 02d2bd820ed446f7e18044fe0e1efd29078334a99ab241b5aa3da6a24066adf6c8caa21898ce18bfbdbe19d80d8dad59c45185460ccd92edc6579772ea5a78ac
|
||||
SHA512 (libreoffice-translations-7.1.6.2.tar.xz) = 0e9bc25acc6ff1f35ac2acff8bf17e66a0188ca9b7d46c1da44e92e3a5a025477f877dc14499b74c71ddd43423fb097fbe2b69a69e11b30d0771cfe5bfb88626
|
||||
SHA512 (libreoffice-translations-7.1.6.2.tar.xz.asc) = 22c8f2f57db0a138108dfa437e85583227b12274228b970d0150b2843bc945de1af1c15d1a0c4397ba00f3a2e08d226d46a278a0307eb45ca711970aaeac86f8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user