From 600acffd6d1279d627ff1e79c073937c082adc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 1 Apr 2023 21:37:24 +0100 Subject: [PATCH] latest version --- .gitignore | 12 +- 0001-don-t-crash-with-disable-pdfium.patch | 28 ----- ...53895-basicide-Set-bg-color-for-bord.patch | 103 ------------------ libreoffice.spec | 19 ++-- sources | 12 +- 5 files changed, 22 insertions(+), 152 deletions(-) delete mode 100644 0001-don-t-crash-with-disable-pdfium.patch delete mode 100644 0001-tdf-152073-tdf-153895-basicide-Set-bg-color-for-bord.patch diff --git a/.gitignore b/.gitignore index 215adfb..9f9160b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz /dragonbox-1.1.3.tar.gz -/libreoffice-7.5.1.2.tar.xz -/libreoffice-7.5.1.2.tar.xz.asc -/libreoffice-help-7.5.1.2.tar.xz -/libreoffice-help-7.5.1.2.tar.xz.asc -/libreoffice-translations-7.5.1.2.tar.xz -/libreoffice-translations-7.5.1.2.tar.xz.asc +/libreoffice-7.5.2.2.tar.xz +/libreoffice-7.5.2.2.tar.xz.asc +/libreoffice-help-7.5.2.2.tar.xz +/libreoffice-help-7.5.2.2.tar.xz.asc +/libreoffice-translations-7.5.2.2.tar.xz +/libreoffice-translations-7.5.2.2.tar.xz.asc diff --git a/0001-don-t-crash-with-disable-pdfium.patch b/0001-don-t-crash-with-disable-pdfium.patch deleted file mode 100644 index 881a110..0000000 --- a/0001-don-t-crash-with-disable-pdfium.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4fdafc02cc58762eb89e80f3031df7535fac4caa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 3 Mar 2023 12:29:02 +0000 -Subject: [PATCH] don't crash with --disable-pdfium - -Change-Id: I8a02e9c5367a5fc73674963d31c48a6114e92299 ---- - sw/qa/core/text/text.cxx | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx -index 9ffae51f175f..0ddc9a0885d8 100644 ---- a/sw/qa/core/text/text.cxx -+++ b/sw/qa/core/text/text.cxx -@@ -681,6 +681,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPDF) - - CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPlaceholderPDF) - { -+ std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get(); -+ if (!pPDFium) -+ return; -+ - // Given a file with a content control, in placeholder mode: - createSwDoc(); - SwDoc* pDoc = getSwDoc(); --- -2.39.1 - diff --git a/0001-tdf-152073-tdf-153895-basicide-Set-bg-color-for-bord.patch b/0001-tdf-152073-tdf-153895-basicide-Set-bg-color-for-bord.patch deleted file mode 100644 index 2de8b98..0000000 --- a/0001-tdf-152073-tdf-153895-basicide-Set-bg-color-for-bord.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 41570cf09b171a6ee1f04d39dd72399e2726d381 Mon Sep 17 00:00:00 2001 -From: Michael Weghorn -Date: Thu, 2 Mar 2023 12:56:13 +0100 -Subject: [PATCH] tdf#152073 tdf#153895 basicide: Set bg color for border win - -As described in the original commit to address tdf#152073 -("Glitch rendering line numbers in Basic IDE editor (kf5 only)"), -the fact that the KDE Breeze style's frame border is partly -transparent was causing artifacts in the Basic IDE: - - commit 6f4b8b7cfe2907b7da46eec6951a0e09b836a6de - Author: Michael Weghorn - Date: Tue Jan 31 16:08:53 2023 +0100 - - tdf#152073 qt: Draw background when drawing frame - - For native drawing of a frame (border), use - the window background color as default color. - - As mentioned in commit f39f21d92ec83c3a5062f29dd26214fc83012c06 - ("tdf#138010 (IV) VclScrolledWindow: Use actual border width"), - the Qt/KDE Breeze style uses a frame width of 2, with the - actual 1 pixel border being surrounded by a 1 pixel - padding/margin. - - Transparent background did not ensure that the 1 pixel - padding/margin is repainted and could thus result - in artifacts from what was painted to that location - previously (s. the Basic IDE editor example from - tdf#152073). - - [...] - -However, there are cases when a transparent background -is actually wanted, like in the print dialog (tdf#153895). - -Therefore, revert the original commit mentioned above -and explicitly set a background color for the border windows -of the involved windows in the Basic IDE instead, which is -in line with the alternative already mentioned in the above commit -("An alternative might be to explicitly draw the -background further up the call stack, [...]."), but enables -transparency in the qt5/qt6/kf5-specific drawing for -the frame again. - -Change-Id: Ifb4deb80c6ae245ec630a4fdc23f675e5587836c -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148117 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn -(cherry picked from commit 699a1745f30cc0e89d59c6fc6ea742da5ff0ccea) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148098 -Reviewed-by: Adolfo Jayme Barrientos ---- - basctl/source/basicide/baside2b.cxx | 4 +++- - basctl/source/basicide/linenumberwindow.cxx | 4 +++- - vcl/qt5/QtGraphics_Controls.cxx | 1 - - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx -index b5deee9b6a9e..5947c2208b16 100644 ---- a/basctl/source/basicide/baside2b.cxx -+++ b/basctl/source/basicide/baside2b.cxx -@@ -252,7 +252,9 @@ EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : - pCodeCompleteWnd(VclPtr::Create(this)) - { - set_id("EditorWindow"); -- SetBackground(Wallpaper(rModulWindow.GetLayout().GetSyntaxBackgroundColor())); -+ const Wallpaper aBackground(rModulWindow.GetLayout().GetSyntaxBackgroundColor()); -+ SetBackground(aBackground); -+ GetWindow(GetWindowType::Border)->SetBackground(aBackground); - SetPointer( PointerStyle::Text ); - SetHelpId( HID_BASICIDE_EDITORWINDOW ); - -diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx -index 74ead4923863..24ee232c7c28 100644 ---- a/basctl/source/basicide/linenumberwindow.cxx -+++ b/basctl/source/basicide/linenumberwindow.cxx -@@ -21,7 +21,9 @@ LineNumberWindow::LineNumberWindow(vcl::Window* pParent, ModulWindow* pModulWind - , m_pModulWindow(pModulWindow) - , m_nCurYOffset(0) - { -- SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetWindowColor())); -+ const Wallpaper aBackground(GetSettings().GetStyleSettings().GetWindowColor()); -+ SetBackground(aBackground); -+ GetWindow(GetWindowType::Border)->SetBackground(aBackground); - m_FontColor = GetSettings().GetStyleSettings().GetWindowTextColor(); - m_nBaseWidth = GetTextWidth("8"); - m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; -diff --git a/vcl/qt5/QtGraphics_Controls.cxx b/vcl/qt5/QtGraphics_Controls.cxx -index 71386a6bd5ea..c647152606e8 100644 ---- a/vcl/qt5/QtGraphics_Controls.cxx -+++ b/vcl/qt5/QtGraphics_Controls.cxx -@@ -287,7 +287,6 @@ bool QtGraphics_Controls::drawNativeControl(ControlType type, ControlPart part, - break; - } - [[fallthrough]]; // QPalette::Window -- case ControlType::Frame: - case ControlType::Menubar: - case ControlType::WindowBackground: - m_image->fill(QApplication::palette().color(QPalette::Window).rgb()); --- -2.39.2 - diff --git a/libreoffice.spec b/libreoffice.spec index aee0fb9..dd7d926 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.5.1 +%global libo_version 7.5.2 # 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. @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 4%{?libo_prerelease}%{?dist} +Release: 1%{?libo_prerelease}%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 # nlpsolver is: LGPLv3 @@ -265,14 +265,12 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch -Patch4: 0001-don-t-crash-with-disable-pdfium.patch -Patch5: 0001-tdf-152073-tdf-153895-basicide-Set-bg-color-for-bord.patch -Patch6: 0001-Use-sifr-and-sifr_dark-for-gnome.patch -Patch7: 0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch -Patch8: 0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch +Patch4: 0001-Use-sifr-and-sifr_dark-for-gnome.patch +Patch5: 0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch +Patch6: 0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch # TODO investigate these -Patch9: 0001-aarch64-failing-here.patch -Patch10: 0001-include-filename-if-the-test-fails.patch +Patch7: 0001-aarch64-failing-here.patch +Patch8: 0001-include-filename-if-the-test-fails.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2251,6 +2249,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Fri Mar 31 2023 Caolán McNamara - 1:7.5.2.2-1 +- latest version + * Wed Mar 22 2023 Stephan Bergmann - 1:7.5.1.2-4 - Resolves: rhbz#2171265 Failure to start with junk in program/services/ diff --git a/sources b/sources index 53af25a..b800956 100644 --- a/sources +++ b/sources @@ -5,9 +5,9 @@ SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__ SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dragonbox-1.1.3.tar.gz) = 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.5.1.2.tar.xz) = 7fadf392186c8eb5801395d89c78fdac4fb47756e1a71cd758d232686a457353b2e5e7a96e0854b7cdcfbb3da8cb78155c6d3c1e50ea701341dae1e811e7806f -SHA512 (libreoffice-7.5.1.2.tar.xz.asc) = 3b2620eaff1872287071f6c0ef311a7ac7b38ba97334ceccaf9c77dac2b542a4823a6db12abd766a468d9302aad885625b1415807a239a047fbe772c37e900bc -SHA512 (libreoffice-help-7.5.1.2.tar.xz) = b866f4814e1fed0c976f3f5c577563939ec2127d1846403bb0e8a30734ac174f3b427ec393f2e49273b497b7c827dfcbae611c08d151bc45bb3547f3f2327499 -SHA512 (libreoffice-help-7.5.1.2.tar.xz.asc) = 3de713543ad673d59816e4564d99b3be2e1052942542cd8421f8ecfaa86d24042e67987775c3a04c015e51e4fa5f19fb5244b7b6b69151731e1b869a5bbaa279 -SHA512 (libreoffice-translations-7.5.1.2.tar.xz) = c61e6bd2e608eb17eb86a2afdb666895f8c40775dded3564c10e17208ef3b0e5fb483dfce6d45b1b61b88e7cbe88bbdf843cafe01df9480dfef97d86bee158eb -SHA512 (libreoffice-translations-7.5.1.2.tar.xz.asc) = 054ed7ebd13b3d3d62f8b3f24145d89cd4d9093e3fde5bca9745295e918dffa73cecd533656c564d16582c80459031e27b31422742b61e6e308744865ae16766 +SHA512 (libreoffice-7.5.2.2.tar.xz) = 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6 +SHA512 (libreoffice-7.5.2.2.tar.xz.asc) = 2cbae7535bf94d949ce3aa7824e9b8aed65f98b24807152140b98292a2ca2258eb553e7c317487a3265bf29939708304b69aa268035a9714c6eaf90b8ba7ffd1 +SHA512 (libreoffice-help-7.5.2.2.tar.xz) = 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0 +SHA512 (libreoffice-help-7.5.2.2.tar.xz.asc) = 98366d28ec26f8407554651f2388132b579aea03e5963689767cf36559f823b3e0e13fc96b9174c0a87353eadb9672d029da94734f786fe0de87a784d10d524d +SHA512 (libreoffice-translations-7.5.2.2.tar.xz) = 684d38f3fb43f7b1b6302d81fbc1dd87b43f32782802fbd26146ba87198bd34e64e8f83ad74ceaaed69a8e016dacc0781954234a2edbc624d61b28c526e71853 +SHA512 (libreoffice-translations-7.5.2.2.tar.xz.asc) = 36db25a8f7d5755bc6ada771eb19b0c4e57cdf613d517addf5272dc1ad0fd8358bf1eaa1e2abcb26008835e997d5f5c848fdc6782208890223b0156604341404